From 1e65865707d090ca3dfd5a5fab5191447787a05c Mon Sep 17 00:00:00 2001 From: Rafael Benevides Date: Mon, 7 Sep 2015 13:23:39 -0400 Subject: [PATCH] Fix formatting and removed trailing spaces --- app-client/client-simple/pom.xml | 2 +- .../appclient/acc/client/Main.java | 5 +- .../resources/META-INF/application-client.xml | 4 +- app-client/ejb/pom.xml | 8 +- .../server/ejb/StatelessSession.java | 1 + .../server/ejb/StatelessSessionBean.java | 2 +- app-client/pom.xml | 4 +- batch-processing/pom.xml | 44 +- .../quickstarts/batch/controller/JobData.java | 2 +- .../batch/job/listener/JobListener.java | 2 +- .../META-INF/batch-jobs/import-file.xml | 2 +- .../main/resources/META-INF/persistence.xml | 2 +- .../WEB-INF/jboss-batch-processing-ds.xml | 8 +- bean-validation-custom-constraint/pom.xml | 8 +- .../AddressValidator.java | 1 + .../Person.java | 4 +- .../PersonAddress.java | 14 +- .../src/test/resources/META-INF/beans.xml | 6 +- .../resources/META-INF/test-persistence.xml | 6 +- .../src/test/resources/test-ds.xml | 12 +- bean-validation/pom.xml | 2 +- .../src/main/java/META-INF/beans.xml | 6 +- .../bean_validation/model/Member.java | 2 +- .../test/MemberValidationTest.java | 20 +- .../resources/META-INF/test-persistence.xml | 6 +- .../src/test/resources/test-ds.xml | 12 +- bmt/pom.xml | 4 +- .../main/resources/META-INF/persistence.xml | 2 +- bmt/src/main/webapp/WEB-INF/beans.xml | 2 +- .../main/webapp/WEB-INF/bmt-quickstart-ds.xml | 12 +- cdi-alternative/pom.xml | 16 +- .../src/main/webapp/WEB-INF/beans.xml | 50 +- cdi-decorator/pom.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- cdi-injection/pom.xml | 8 +- .../cdi/injection/qualifier/English.java | 2 +- .../cdi/injection/qualifier/Spanish.java | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- cdi-interceptors/pom.xml | 4 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- .../main/webapp/WEB-INF/cdi-quickstart-ds.xml | 12 +- .../test/InterceptorsDisabledTest.java | 12 +- .../test/InterceptorsEnabledTest.java | 12 +- .../resources/META-INF/test-persistence.xml | 6 +- cdi-interceptors/src/test/resources/beans.xml | 2 +- .../src/test/resources/test-ds.xml | 12 +- cdi-portable-extension/pom.xml | 6 +- .../cdi/extension/model/CreatureType.java | 3 +- .../src/main/resources/creatures.xml | 2 +- .../extension/test/CreatureExtensionTest.java | 8 +- cdi-stereotype/pom.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- .../WEB-INF/stereotype-quickstart-ds.xml | 10 +- cdi-veto/pom.xml | 6 +- .../as/quickstart/cdi/veto/model/Car.java | 3 +- .../webapp/WEB-INF/cdi-veto-quickstart-ds.xml | 6 +- ...ectionWithVetoExtensionAndManagerTest.java | 16 +- ...onWithVetoExtensionWithoutManagerTest.java | 16 +- ...onWithoutVetoExtensionWithManagerTest.java | 14 +- cluster-ha-singleton/pom.xml | 4 +- cluster-ha-singleton/service/pom.xml | 10 +- .../service/ejb/HATimerService.java | 6 +- .../service/ejb/HATimerServiceActivator.java | 31 +- .../service/ejb/SchedulerBean.java | 1 - cmt/pom.xml | 24 +- .../cmt/ejb/InvoiceManagerEJB.java | 2 +- .../as/quickstarts/cmt/mdb/HelloWorldMDB.java | 6 +- cmt/src/main/webapp/WEB-INF/beans.xml | 2 +- cmt/src/main/webapp/WEB-INF/faces-config.xml | 4 +- .../as/quickstarts/contacts/test/Contact.java | 18 +- .../test/ContactsMobileBasicTest.java | 3 - .../quickstarts/contacts/test/RESTTest.java | 12 +- contacts-jquerymobile/pom.xml | 24 +- .../contact/ContactRESTService.java | 5 +- .../contact/ContactRepository.java | 4 +- .../quickstarts/contact/ContactService.java | 4 +- .../main/resources/META-INF/persistence.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 4 +- .../webapp/WEB-INF/contacts-quickstart-ds.xml | 8 +- .../contact/test/ContactRegistrationTest.java | 108 +-- .../src/test/resources/arquillian-ds.xml | 8 +- contributor-settings.xml | 14 +- dist/license.txt | 4 +- dist/pom.xml | 2 +- ejb-asynchronous/client/pom.xml | 6 +- .../client/AsynchronousClient.java | 3 +- ejb-asynchronous/ejb/pom.xml | 4 +- .../ejb/asynchronous/ParallelAccessBean.java | 1 - ejb-asynchronous/pom.xml | 8 +- ejb-in-ear/ear/pom.xml | 6 +- ejb-in-ear/ejb/pom.xml | 2 +- .../ejb/src/main/java/META-INF/beans.xml | 2 +- ejb-in-ear/pom.xml | 12 +- ejb-in-ear/web/pom.xml | 2 +- .../web/src/main/webapp/WEB-INF/beans.xml | 2 +- ejb-in-war/pom.xml | 36 +- ejb-in-war/src/main/webapp/WEB-INF/beans.xml | 2 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- .../ejbinwar/test/GreeterEJBTest.java | 2 +- .../ejbinwar/test/GreeterTest.java | 2 +- ejb-multi-server/app-main/ear/pom.xml | 2 +- .../application/META-INF/jboss-ejb-client.xml | 2 +- ejb-multi-server/app-main/ejb/pom.xml | 2 +- .../ejb/multi/server/app/MainApp.java | 12 +- .../ejb/multi/server/app/MainAppBean.java | 58 +- .../multi/server/app/MainAppSContextBean.java | 92 +- ejb-multi-server/app-main/web/pom.xml | 4 +- .../ejb/multi/server/app/JsfController.java | 50 +- .../web/src/main/webapp/WEB-INF/beans.xml | 2 +- ejb-multi-server/app-one/ear/pom.xml | 4 +- ejb-multi-server/app-one/ejb/pom.xml | 2 +- .../ejb/multi/server/app/AppOne.java | 30 +- ejb-multi-server/app-two/ear/pom.xml | 4 +- ejb-multi-server/app-two/ejb/pom.xml | 2 +- .../ejb/multi/server/app/AppTwo.java | 30 +- .../ejb/multi/server/app/AppTwoBean.java | 3 +- ejb-multi-server/app-web/pom.xml | 2 +- .../quickstarts/ejb/multi/server/Client.java | 4 +- ejb-multi-server/pom.xml | 8 +- ejb-remote/client/pom.xml | 16 +- .../ejb/remote/client/RemoteEJBClient.java | 10 +- ejb-remote/pom.xml | 4 +- ejb-remote/server-side/pom.xml | 14 +- ejb-security-interceptors/pom.xml | 2 +- .../ServerSecurityInterceptor.java | 4 +- .../src/main/resources/META-INF/beans.xml | 6 +- .../META-INF/jboss-deployment-structure.xml | 4 +- .../resources/META-INF/jboss-ejb-client.xml | 2 +- .../main/resources/META-INF/jboss-ejb3.xml | 6 +- ejb-security/pom.xml | 10 +- .../src/main/webapp/WEB-INF/beans.xml | 6 +- ejb-security/src/main/webapp/WEB-INF/web.xml | 2 +- ejb-throws-exception/ear/pom.xml | 234 ++--- ejb-throws-exception/ejb/pom.xml | 204 ++-- .../as/quickstarts/ear/ejb/GreeterEJB.java | 2 +- .../ejb/src/main/resources/META-INF/beans.xml | 2 +- ejb-throws-exception/pom.xml | 28 +- ejb-throws-exception/web/pom.xml | 200 ++-- .../ear/controller/GreeterBean.java | 8 +- .../web/src/main/webapp/WEB-INF/beans.xml | 4 +- ejb-timer/pom.xml | 12 +- ejb-timer/src/main/java/META-INF/beans.xml | 6 +- .../quickstarts/ejbTimer/ScheduleExample.java | 7 +- .../quickstarts/ejbTimer/TimeoutExample.java | 5 +- greeter/pom.xml | 16 +- .../as/quickstarts/greeter/domain/User.java | 2 +- .../main/resources/META-INF/persistence.xml | 4 +- greeter/src/main/webapp/WEB-INF/beans.xml | 4 +- .../webapp/WEB-INF/greeter-quickstart-ds.xml | 12 +- helloworld-html5/README.md | 6 +- helloworld-html5/pom.xml | 12 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- helloworld-jms/pom.xml | 4 +- .../quickstarts/jms/HelloWorldJMSClient.java | 1 - .../helloworld-mbean-service/pom.xml | 122 +-- .../src/main/resources/META-INF/beans.xml | 6 +- .../main/resources/META-INF/jboss-service.xml | 44 +- .../helloworld-mbean-webapp/pom.xml | 122 +-- .../mbean/IAnnotatedHelloWorldMBean.java | 1 + .../mbean/IHelloWorldMXBean.java | 1 + .../main/webapp/META-INF/jboss-service.xml | 48 +- .../src/main/webapp/WEB-INF/beans.xml | 46 +- .../AnnotatedComponentHelloWorldTest.java | 24 +- .../mbean/MXPojoHelloWorldTest.java | 24 +- helloworld-mbean/pom.xml | 22 +- helloworld-mdb-propertysubstitution/pom.xml | 30 +- .../quickstarts/mdb/HelloWorldQueueMDB.java | 6 +- .../servlet/HelloWorldMDBServletClient.java | 26 +- helloworld-mdb/pom.xml | 32 +- .../quickstarts/mdb/HelloWorldQueueMDB.java | 6 +- .../servlet/HelloWorldMDBServletClient.java | 26 +- helloworld-rs/pom.xml | 12 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- helloworld-singleton/pom.xml | 18 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- helloworld-ws/pom.xml | 48 +- .../wshelloworld/HelloWorldServiceImpl.java | 3 +- .../src/main/webapp/WEB-INF/beans.xml | 4 +- helloworld/pom.xml | 10 +- helloworld/src/main/webapp/WEB-INF/beans.xml | 2 +- hibernate5/pom.xml | 36 +- .../controller/MemberController.java | 4 +- .../main/resources/META-INF/persistence.xml | 2 +- hibernate5/src/main/webapp/WEB-INF/beans.xml | 4 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- .../WEB-INF/hibernate5-quickstart-ds.xml | 12 +- inter-app/appA/pom.xml | 12 +- .../appA/src/main/webapp/WEB-INF/beans.xml | 2 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- inter-app/appB/pom.xml | 12 +- .../as/quickstarts/interapp/appB/Imports.java | 2 +- .../appB/src/main/webapp/WEB-INF/beans.xml | 2 +- inter-app/pom.xml | 10 +- inter-app/shared/pom.xml | 4 +- jaxws-addressing/client/pom.xml | 6 +- .../jaxws/samples/wsa/AddressingTestCase.java | 2 +- jaxws-addressing/pom.xml | 6 +- .../ws/jaxws/samples/wsa/ServiceIface.java | 8 +- .../ws/jaxws/samples/wsa/ServiceImpl.java | 16 +- jaxws-ejb/client/pom.xml | 16 +- .../jboss/quickstarts/ws/client/Client.java | 4 +- jaxws-ejb/pom.xml | 4 +- jaxws-ejb/service/pom.xml | 4 +- .../jaxws/samples/jsr181pojo/EJB3Bean01.java | 1 - jaxws-pojo/README.md | 2 +- .../jboss/quickstarts/ws/client/Client.java | 2 +- .../jaxws/samples/jsr181pojo/JSEBean01.java | 5 +- .../samples/jsr181pojo/JSEBean01Service.java | 12 +- jaxws-pojo/pom.xml | 4 +- jaxws-retail/README.md | 2 +- jaxws-retail/client/pom.xml | 4 +- .../jboss/quickstarts/ws/client/Client.java | 2 +- jaxws-retail/pom.xml | 2 +- jaxws-retail/service/pom.xml | 2 +- .../retail/profile/ProfileMgmtBean.java | 11 +- jsonp/pom.xml | 42 +- .../as/quickstarts/jsonp/JsonController.java | 14 +- jta-crash-rec/pom.xml | 22 +- .../jboss/as/quickstarts/xa/DbUpdaterMDB.java | 6 +- .../jboss/as/quickstarts/xa/XAService.java | 2 +- .../jboss/as/quickstarts/xa/XAServlet.java | 74 +- .../main/resources/META-INF/persistence.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- .../WEB-INF/jta-crash-rec-quickstart-ds.xml | 8 +- jts/application-component-1/pom.xml | 4 +- .../cmt/controller/CustomerManager.java | 2 +- .../main/resources/META-INF/persistence.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- .../main/webapp/WEB-INF/jts-quickstart-ds.xml | 8 +- jts/application-component-2/pom.xml | 2 +- .../cmt/jts/ejb/InvoiceManagerEJBImpl.java | 18 +- .../cmt/jts/mdb/HelloWorldMDB.java | 40 +- .../src/main/resources/META-INF/beans.xml | 4 +- jts/pom.xml | 22 +- kitchensink-ear/ear/pom.xml | 12 +- .../kitchensink-ear-quickstart-ds.xml | 12 +- kitchensink-ear/ejb/pom.xml | 18 +- .../ejb/src/main/resources/META-INF/beans.xml | 2 +- .../main/resources/META-INF/persistence.xml | 2 +- .../test/MemberRegistrationTest.java | 10 +- .../resources/META-INF/test-persistence.xml | 6 +- .../ejb/src/test/resources/test-ds.xml | 12 +- kitchensink-ear/pom.xml | 26 +- kitchensink-ear/web/pom.xml | 2 +- .../controller/MemberController.java | 2 +- .../web/src/main/webapp/WEB-INF/beans.xml | 4 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- kitchensink-html5-mobile/.cheatsheet.xml | 92 +- kitchensink-html5-mobile/README.md | 4 +- kitchensink-html5-mobile/pom.xml | 2 +- .../html5_mobile/util/JSONPRequestFilter.java | 2 +- .../main/resources/META-INF/persistence.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- .../WEB-INF/kitchensink-quickstart-ds.xml | 8 +- .../test/MemberRegistrationTest.java | 16 +- .../resources/META-INF/test-persistence.xml | 2 +- .../src/test/resources/arquillian-ds.xml | 8 +- kitchensink-jsp/pom.xml | 52 +- .../main/resources/META-INF/persistence.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 4 +- .../WEB-INF/kitchensink-quickstart-ds.xml | 12 +- .../test/MemberRegistrationTest.java | 6 +- .../resources/META-INF/test-persistence.xml | 6 +- .../src/test/resources/test-ds.xml | 12 +- kitchensink-ml-ear/ear/pom.xml | 12 +- .../kitchensink-ear-quickstart-ds.xml | 12 +- kitchensink-ml-ear/ejb/pom.xml | 16 +- .../ejb/src/main/resources/META-INF/beans.xml | 2 +- .../main/resources/META-INF/persistence.xml | 2 +- .../test/MemberRegistrationTest.java | 10 +- .../resources/META-INF/test-persistence.xml | 6 +- .../ejb/src/test/resources/test-ds.xml | 12 +- kitchensink-ml-ear/pom.xml | 26 +- kitchensink-ml-ear/web/pom.xml | 4 +- .../controller/MemberController.java | 4 +- .../kitchensink_ear/util/WebResources.java | 2 +- .../web/src/main/webapp/WEB-INF/beans.xml | 4 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- kitchensink-ml/pom.xml | 52 +- .../controller/MemberController.java | 4 +- .../kitchensink/util/KitchensinkMessages.java | 2 +- .../main/resources/META-INF/persistence.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 4 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- .../WEB-INF/kitchensink-quickstart-ds.xml | 12 +- .../test/MemberRegistrationTest.java | 10 +- .../resources/META-INF/test-persistence.xml | 6 +- kitchensink-ml/src/test/resources/test-ds.xml | 12 +- kitchensink/.cheatsheet.xml | 118 +-- kitchensink/pom.xml | 56 +- .../main/resources/META-INF/persistence.xml | 2 +- kitchensink/src/main/webapp/WEB-INF/beans.xml | 4 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- .../WEB-INF/kitchensink-quickstart-ds.xml | 12 +- .../test/MemberRegistrationTest.java | 10 +- .../resources/META-INF/test-persistence.xml | 6 +- kitchensink/src/test/resources/test-ds.xml | 12 +- log4j/pom.xml | 20 +- log4j/src/main/webapp/WEB-INF/beans.xml | 2 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- .../WEB-INF/jboss-deployment-structure.xml | 2 +- logging-tools/pom.xml | 14 +- .../loggingToolsQS/DateService.java | 2 +- logging/pom.xml | 20 +- mail/pom.xml | 12 +- mail/src/main/webapp/WEB-INF/beans.xml | 2 +- mail/src/main/webapp/WEB-INF/faces-config.xml | 2 +- managedexecutorservice/pom.xml | 48 +- .../main/resources/META-INF/persistence.xml | 2 +- .../jboss-managedexecutorservice-ds.xml | 8 +- numberguess/pom.xml | 16 +- numberguess/src/main/webapp/WEB-INF/beans.xml | 2 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- payment-cdi-event/pom.xml | 24 +- .../payment/events/PaymentTypeEnum.java | 3 +- .../payment/qualifiers/Credit.java | 2 +- .../quickstarts/payment/qualifiers/Debit.java | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- picketlink-sts/pom.xml | 8 +- .../picketlink/WSTrustClientExample.java | 2 +- .../app/sts/PicketLinkSTService.java | 3 +- .../src/main/webapp/WEB-INF/jboss-web.xml | 4 +- pom.xml | 6 +- resteasy-jaxrs-client/pom.xml | 10 +- .../jaxrsclient/JaxRsClientTest.java | 6 +- servlet-async/pom.xml | 12 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- servlet-filterlistener/pom.xml | 12 +- .../ParameterDumpingRequestListener.java | 2 +- .../filterlistener/VowelRemoverFilter.java | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- servlet-security/pom.xml | 14 +- .../main/resources/META-INF/persistence.xml | 4 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- .../src/main/webapp/WEB-INF/jboss-web.xml | 4 +- .../servlet-security-quickstart-ds.xml | 10 +- settings.xml | 224 ++--- shopping-cart/client/pom.xml | 8 +- .../jboss/as/quickstarts/client/Client.java | 2 +- shopping-cart/pom.xml | 16 +- shopping-cart/server/pom.xml | 4 +- shrinkwrap-resolver/README.md | 4 +- shrinkwrap-resolver/pom.xml | 44 +- .../main/resources/META-INF/persistence.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- .../jboss-as-shrinkwrap-resolver-ds.xml | 8 +- ...olveGAPCVCustomRepoWithoutCentralTest.java | 8 +- .../resources/META-INF/test-persistence.xml | 6 +- .../src/test/resources/test-ds.xml | 8 +- spring-greeter/pom.xml | 10 +- .../greeter_spring/domain/UserDaoImpl.java | 2 +- .../greeter_spring/web/CreateController.java | 5 +- .../greeter_spring/web/GreetController.java | 6 +- .../WEB-INF/greeter-spring-quickstart-ds.xml | 8 +- .../webapp/WEB-INF/spring-mvc-context.xml | 2 +- .../quickstarts/kitchensink/test/Member.java | 15 +- .../test/page/MembersTablePageFragment.java | 1 - .../page/RegistrationFormPageFragment.java | 1 - .../pom.xml | 2 +- .../controller/MemberRestController.java | 6 +- .../main/resources/META-INF/persistence.xml | 6 +- .../META-INF/spring/applicationContext.xml | 2 +- .../META-INF/spring/infrastructure.xml | 2 +- .../WEB-INF/jboss-as-spring-mvc-context.xml | 2 +- .../webapp/WEB-INF/spring-quickstart-ds.xml | 6 +- .../src/main/webapp/WEB-INF/web.xml | 4 +- .../test/MemberDaoTest.java | 4 +- .../resources/META-INF/test-persistence.xml | 2 +- .../src/test/resources/test-context.xml | 2 +- .../functional-tests/pom.xml | 4 +- .../quickstarts/kitchensink/test/Member.java | 15 +- .../test/page/MembersTablePageFragment.java | 1 - .../page/RegistrationFormPageFragment.java | 1 - spring-kitchensink-basic/pom.xml | 2 +- .../controller/MemberRestController.java | 6 +- .../main/resources/META-INF/persistence.xml | 6 +- .../META-INF/spring/applicationContext.xml | 2 +- .../META-INF/spring/infrastructure.xml | 2 +- .../WEB-INF/jboss-as-spring-mvc-context.xml | 2 +- .../webapp/WEB-INF/spring-quickstart-ds.xml | 6 +- .../spring/basic/test/MemberDaoTest.java | 4 +- .../resources/META-INF/test-persistence.xml | 2 +- .../src/test/resources/test-context.xml | 2 +- ...KitchensinkSpringControllerAdviceTest.java | 2 - .../quickstarts/kitchensink/test/Member.java | 15 +- .../test/page/MemberPageFragment.java | 1 - .../page/RegistrationFormPageFragment.java | 1 - spring-kitchensink-controlleradvice/pom.xml | 2 +- .../controller/MemberControllerAdvice.java | 1 - .../controller/MemberRestController.java | 6 +- .../main/resources/META-INF/persistence.xml | 6 +- .../META-INF/spring/applicationContext.xml | 2 +- .../META-INF/spring/infrastructure.xml | 2 +- .../WEB-INF/jboss-as-spring-mvc-context.xml | 2 +- .../webapp/WEB-INF/spring-quickstart-ds.xml | 6 +- .../src/main/webapp/WEB-INF/web.xml | 4 +- .../controlleradvice/test/MemberDaoTest.java | 4 +- .../resources/META-INF/test-persistence.xml | 2 +- .../src/test/resources/test-context.xml | 2 +- .../KitchensinkSpringMatrixVariablesTest.java | 1 - .../quickstarts/kitchensink/test/Member.java | 15 +- .../test/page/MemberPageFragment.java | 1 - .../test/page/MembersTablePageFragment.java | 4 +- .../page/RegistrationFormPageFragment.java | 1 - spring-kitchensink-matrixvariables/pom.xml | 2 +- .../matrixvariables/config/WebConfig.java | 2 +- .../controller/MemberController.java | 3 +- .../controller/MemberRestController.java | 6 +- .../main/resources/META-INF/persistence.xml | 6 +- .../META-INF/spring/applicationContext.xml | 2 +- .../META-INF/spring/infrastructure.xml | 2 +- .../WEB-INF/jboss-as-spring-mvc-context.xml | 4 +- .../webapp/WEB-INF/spring-quickstart-ds.xml | 4 +- .../src/main/webapp/WEB-INF/web.xml | 4 +- .../matrixvariables/test/MemberDaoTest.java | 4 +- .../resources/META-INF/test-persistence.xml | 2 +- .../src/test/resources/test-context.xml | 2 +- .../quickstarts/kitchensink/test/Member.java | 15 +- .../test/page/MemberPageFragment.java | 1 - .../test/page/MembersTablePageFragment.java | 1 - .../page/RegistrationFormPageFragment.java | 1 - spring-kitchensink-springmvctest/pom.xml | 4 +- .../controller/MemberRestController.java | 6 +- .../main/resources/META-INF/persistence.xml | 6 +- .../META-INF/spring/applicationContext.xml | 2 +- .../META-INF/spring/infrastructure.xml | 2 +- .../WEB-INF/jboss-as-spring-mvc-context.xml | 2 +- .../webapp/WEB-INF/spring-quickstart-ds.xml | 6 +- .../springmvctest/test/MemberDaoTest.java | 4 +- .../springmvctest/test/MemberMockMVCTest.java | 8 +- .../resources/META-INF/test-persistence.xml | 2 +- .../src/test/resources/test-context.xml | 2 +- spring-petclinic/functional-tests/pom.xml | 4 +- .../test/webdriver/PetclinicTest.java | 4 +- .../spring/petclinic/test/webdriver/Vet.java | 5 - .../src/test/resources/arquillian.xml | 6 +- .../src/test/resources/jdbc_web.xml | 6 +- spring-petclinic/license.txt | 2 +- spring-petclinic/pom.xml | 886 +++++++++--------- .../samples/petclinic/model/BaseEntity.java | 1 - .../samples/petclinic/model/NamedEntity.java | 2 - .../samples/petclinic/model/Owner.java | 17 +- .../samples/petclinic/model/Person.java | 1 - .../samples/petclinic/model/Pet.java | 1 - .../samples/petclinic/model/Vet.java | 3 +- .../samples/petclinic/model/Visit.java | 2 - .../petclinic/repository/OwnerRepository.java | 2 - .../petclinic/repository/VetRepository.java | 1 - .../jdbc/JdbcOwnerRepositoryImpl.java | 44 +- .../petclinic/repository/jdbc/JdbcPet.java | 1 - .../jdbc/JdbcPetRepositoryImpl.java | 35 +- .../jdbc/JdbcPetVisitExtractor.java | 2 +- .../jdbc/JdbcVetRepositoryImpl.java | 24 +- .../jdbc/JdbcVisitRepositoryImpl.java | 20 +- .../repository/jdbc/JdbcVisitRowMapper.java | 1 - .../jpa/JpaOwnerRepositoryImpl.java | 14 +- .../repository/jpa/JpaPetRepositoryImpl.java | 12 +- .../repository/jpa/JpaVetRepositoryImpl.java | 1 - .../jpa/JpaVisitRepositoryImpl.java | 14 +- .../SpringDataOwnerRepository.java | 12 +- .../petclinic/service/ClinicService.java | 1 - .../petclinic/service/ClinicServiceImpl.java | 3 - .../petclinic/util/CallMonitoringAspect.java | 12 +- .../samples/petclinic/util/EntityUtils.java | 2 +- .../petclinic/web/CrashController.java | 3 +- .../petclinic/web/OwnerController.java | 7 +- .../samples/petclinic/web/PetController.java | 3 +- .../petclinic/web/PetTypeFormatter.java | 2 - .../samples/petclinic/web/PetValidator.java | 3 +- .../samples/petclinic/web/VetController.java | 7 +- .../petclinic/web/VisitController.java | 5 +- .../src/main/resources/logback.xml | 4 +- .../main/resources/spring/business-config.xml | 38 +- .../resources/spring/datasource-config.xml | 118 +-- .../main/resources/spring/mvc-core-config.xml | 4 +- .../main/resources/spring/mvc-view-config.xml | 40 +- .../main/resources/spring/tools-config.xml | 4 +- .../WEB-INF/no-spring-config-files-there.txt | 2 +- .../src/main/webapp/WEB-INF/web.xml | 290 +++--- .../petclinic/model/ValidatorTests.java | 16 +- .../service/AbstractClinicServiceTests.java | 163 ++-- .../service/ClinicServiceJdbcTests.java | 3 +- .../service/ClinicServiceJpaTests.java | 2 +- .../ClinicServiceSpringDataJpaTests.java | 2 +- .../petclinic/web/VetControllerTests.java | 10 +- spring-resteasy/pom.xml | 20 +- .../resteasyspring/HelloSpringResource.java | 19 +- .../webapp/WEB-INF/applicationContext.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 4 +- spring-resteasy/src/test/resources/log4j.xml | 2 +- tasks-jsf/pom.xml | 12 +- .../quickstarts/tasksJsf/AuthController.java | 1 - .../quickstarts/tasksJsf/Authentication.java | 1 - .../tasksJsf/CurrentTaskStore.java | 1 - .../as/quickstarts/tasksJsf/TaskDaoImpl.java | 2 +- .../as/quickstarts/tasksJsf/TaskList.java | 1 - .../as/quickstarts/tasksJsf/TaskListBean.java | 1 - .../as/quickstarts/tasksJsf/UserDaoImpl.java | 2 +- .../main/resources/META-INF/persistence.xml | 6 +- tasks-jsf/src/main/webapp/WEB-INF/beans.xml | 4 +- .../src/main/webapp/WEB-INF/faces-config.xml | 6 +- .../src/main/webapp/WEB-INF/tasks-jsf-ds.xml | 12 +- .../quickstarts/tasksJsf/ResourcesTest.java | 2 +- .../as/quickstarts/tasksJsf/TaskDaoTest.java | 4 +- .../tasksJsf/TaskListBeanTest.java | 2 +- .../as/quickstarts/tasksJsf/UserDaoTest.java | 2 +- .../resources/META-INF/test-persistence.xml | 6 +- tasks-jsf/src/test/resources/test-ds.xml | 12 +- tasks-rs/pom.xml | 4 +- .../as/quickstarts/tasksrs/model/Task.java | 5 +- .../tasksrs/model/TaskDaoImpl.java | 2 +- .../tasksrs/model/UserDaoImpl.java | 2 +- .../tasksrs/service/TaskResource.java | 18 +- tasks-rs/src/main/webapp/WEB-INF/beans.xml | 4 +- .../src/main/webapp/WEB-INF/tasks-rs-ds.xml | 8 +- .../tasksrs/DefaultDeployment.java | 4 +- .../as/quickstarts/tasksrs/TaskDaoTest.java | 4 +- .../as/quickstarts/tasksrs/UserDaoTest.java | 2 +- tasks-rs/src/test/resources/test-ds.xml | 8 +- tasks/pom.xml | 36 +- .../as/quickstarts/tasks/TaskDaoImpl.java | 2 +- .../org/jboss/as/quickstarts/tasks/User.java | 2 +- .../as/quickstarts/tasks/UserDaoImpl.java | 2 +- tasks/src/test/java/META-INF/beans.xml | 6 +- .../quickstarts/tasks/DefaultDeployment.java | 10 +- .../as/quickstarts/tasks/TaskDaoTest.java | 2 +- .../resources/META-INF/test-persistence.xml | 6 +- tasks/src/test/resources/test-ds.xml | 12 +- temperature-converter/pom.xml | 16 +- .../temperatureconverter/ejb/Scale.java | 3 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- .../src/main/webapp/WEB-INF/faces-config.xml | 2 +- template/pom.xml | 8 +- websocket-endpoint/pom.xml | 48 +- .../src/main/webapp/WEB-INF/beans.xml | 2 +- websocket-hello/pom.xml | 10 +- .../websocket_hello/HelloName.java | 2 +- .../src/main/webapp/WEB-INF/jboss-web.xml | 4 +- wsat-simple/pom.xml | 12 +- .../wsat/simple/RestaurantParticipant.java | 2 +- .../wsat/simple/RestaurantServiceATImpl.java | 3 +- .../jaxws/RestaurantServiceATService.java | 6 +- .../servlet/WSATSimpleServletClient.java | 4 +- wsat-simple/src/main/webapp/WEB-INF/beans.xml | 6 +- .../WEB-INF/classes/context-handlers.xml | 2 +- .../src/main/webapp/WEB-INF/jboss-web.xml | 4 +- .../as/quickstarts/wsat/simple/Client.java | 4 +- .../quickstarts/wsat/simple/ClientStub.java | 2 +- .../quickstarts/wsat/simple/ClientTest.java | 18 +- wsat-simple/src/test/resources/arquillian.xml | 6 +- .../src/test/resources/context-handlers.xml | 2 +- wsba-coordinator-completion-simple/pom.xml | 38 +- .../simple/MockSetManager.java | 4 +- .../simple/SetParticipantBA.java | 12 +- .../simple/SetServiceBAImpl.java | 5 +- .../simple/jaxws/SetServiceBAService.java | 2 +- .../src/test/java/META-INF/beans.xml | 4 +- .../coordinatorcompletion/simple/Client.java | 4 +- .../simple/ClientStub.java | 2 +- .../simple/ClientTest.java | 18 +- .../src/test/resources/context-handlers.xml | 2 +- wsba-participant-completion-simple/pom.xml | 14 +- .../src/main/java/META-INF/beans.xml | 4 +- .../simple/MockSetManager.java | 4 +- .../simple/SetParticipantBA.java | 10 +- .../simple/SetServiceBAImpl.java | 7 +- .../simple/jaxws/SetServiceBAService.java | 2 +- .../participantcompletion/simple/Client.java | 4 +- .../simple/ClientStub.java | 2 +- .../simple/ClientTest.java | 18 +- .../src/test/resources/context-handlers.xml | 2 +- xml-dom4j/pom.xml | 38 +- .../jboss/as/quickstart/xml/XMLParser.java | 2 +- .../xml/upload/FileUploadServlet.java | 2 +- xml-dom4j/src/main/resources/catalog.xml | 2 +- xml-dom4j/src/main/webapp/WEB-INF/beans.xml | 2 +- xml-jaxp/pom.xml | 32 +- .../jboss/as/quickstart/xml/XMLParser.java | 2 +- .../xml/upload/FileUploadServlet.java | 2 +- xml-jaxp/src/main/resources/catalog.xml | 2 +- xml-jaxp/src/main/webapp/WEB-INF/beans.xml | 4 +- 582 files changed, 3735 insertions(+), 3758 deletions(-) diff --git a/app-client/client-simple/pom.xml b/app-client/client-simple/pom.xml index a6af58590a..ac62ed9e26 100644 --- a/app-client/client-simple/pom.xml +++ b/app-client/client-simple/pom.xml @@ -70,6 +70,6 @@ - + diff --git a/app-client/client-simple/src/main/java/org/jboss/as/quickstarts/appclient/acc/client/Main.java b/app-client/client-simple/src/main/java/org/jboss/as/quickstarts/appclient/acc/client/Main.java index 8d1883a2d9..6807f593d2 100644 --- a/app-client/client-simple/src/main/java/org/jboss/as/quickstarts/appclient/acc/client/Main.java +++ b/app-client/client-simple/src/main/java/org/jboss/as/quickstarts/appclient/acc/client/Main.java @@ -52,8 +52,9 @@ private Main() { */ public static void main(String args[]) { // Show that the client is started with arguments at command line - LOG.info("Main started " + ( args.length != 0 ? "with" : "without") + " arguments"); - if(args.length > 0) LOG.info(" " + Arrays.asList(args)); + LOG.info("Main started " + (args.length != 0 ? "with" : "without") + " arguments"); + if (args.length > 0) + LOG.info(" " + Arrays.asList(args)); // add an client side interceptor to provide the client machine name to the server application EJBClientContext.getCurrent().registerInterceptor(0, new ClientInterceptor()); diff --git a/app-client/client-simple/src/main/resources/META-INF/application-client.xml b/app-client/client-simple/src/main/resources/META-INF/application-client.xml index 77ce11c9db..0038346d13 100644 --- a/app-client/client-simple/src/main/resources/META-INF/application-client.xml +++ b/app-client/client-simple/src/main/resources/META-INF/application-client.xml @@ -15,8 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> - SimpleApplicationClient diff --git a/app-client/ejb/pom.xml b/app-client/ejb/pom.xml index d7fe154753..ad7f12d1b3 100644 --- a/app-client/ejb/pom.xml +++ b/app-client/ejb/pom.xml @@ -17,18 +17,18 @@ --> 4.0.0 - + org.jboss.quickstarts.eap jboss-app-client 7.0.0-SNAPSHOT - + jboss-app-client-ejb ejb JBoss EAP Quickstart: app-client - ejb http://maven.apache.org - + Apache License, Version 2.0 @@ -36,7 +36,7 @@ http://www.apache.org/licenses/LICENSE-2.0.html - + org.wildfly diff --git a/app-client/ejb/src/main/java/org/jboss/as/quickstarts/appclient/server/ejb/StatelessSession.java b/app-client/ejb/src/main/java/org/jboss/as/quickstarts/appclient/server/ejb/StatelessSession.java index a00a38f91b..fd4b46a932 100644 --- a/app-client/ejb/src/main/java/org/jboss/as/quickstarts/appclient/server/ejb/StatelessSession.java +++ b/app-client/ejb/src/main/java/org/jboss/as/quickstarts/appclient/server/ejb/StatelessSession.java @@ -27,6 +27,7 @@ public interface StatelessSession { * Show the provided client context data via INFO logging. */ public abstract void invokeWithClientContext(); + /** * * @return a greeting string with the jboss.node.name diff --git a/app-client/ejb/src/main/java/org/jboss/as/quickstarts/appclient/server/ejb/StatelessSessionBean.java b/app-client/ejb/src/main/java/org/jboss/as/quickstarts/appclient/server/ejb/StatelessSessionBean.java index 05e2208bdd..4a6ce1de6b 100644 --- a/app-client/ejb/src/main/java/org/jboss/as/quickstarts/appclient/server/ejb/StatelessSessionBean.java +++ b/app-client/ejb/src/main/java/org/jboss/as/quickstarts/appclient/server/ejb/StatelessSessionBean.java @@ -36,7 +36,7 @@ public class StatelessSessionBean implements StatelessSession { @Override public void invokeWithClientContext() { - LOGGER.info("ClientContext is here = "+context.getContextData()); + LOGGER.info("ClientContext is here = " + context.getContextData()); } @Override diff --git a/app-client/pom.xml b/app-client/pom.xml index 9e3cf1fa37..cb9a89c1d5 100644 --- a/app-client/pom.xml +++ b/app-client/pom.xml @@ -23,7 +23,7 @@ JBoss EAP Quickstart: app-client app-client: An example that demonstrates how to package and use an EE application client. This POM defines common properties to specify the used versions and plug-ins. - The subprojects are built in the appropriate sequence. + The subprojects are built in the appropriate sequence. http://www.jboss.org/products/eap @@ -44,7 +44,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml index 3d2ae38718..bdca5878f2 100644 --- a/batch-processing/pom.xml +++ b/batch-processing/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,16 +90,16 @@ - - UTF-8 1.0.2.Final - 7.0.0-build-7 @@ -116,8 +116,8 @@ @@ -139,7 +139,7 @@ - javax.enterprise @@ -157,7 +157,7 @@ provided - org.jboss.spec.javax.annotation @@ -165,7 +165,7 @@ provided - org.jboss.spec.javax.ws.rs @@ -173,7 +173,7 @@ provided - org.hibernate.javax.persistence @@ -181,7 +181,7 @@ provided - org.jboss.spec.javax.ejb @@ -204,7 +204,7 @@ - org.jboss.spec.javax.faces @@ -220,7 +220,7 @@ commons-lang - org.hibernate @@ -228,7 +228,7 @@ provided - org.hibernate @@ -244,7 +244,7 @@ - org.jboss.arquillian.junit @@ -261,7 +261,7 @@ - ${project.artifactId} @@ -285,9 +285,9 @@ - - default @@ -338,11 +338,11 @@ - - - openshift diff --git a/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/controller/JobData.java b/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/controller/JobData.java index 1990fcf8a7..b6edde8820 100644 --- a/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/controller/JobData.java +++ b/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/controller/JobData.java @@ -70,7 +70,7 @@ public Date getStartTime() { } public Date getEndTime() { - endTime = new Date(); + endTime = new Date(); return endTime.getTime() == 0 ? null : endTime; } diff --git a/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/job/listener/JobListener.java b/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/job/listener/JobListener.java index e9b31780c0..14f322775a 100644 --- a/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/job/listener/JobListener.java +++ b/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/job/listener/JobListener.java @@ -47,7 +47,7 @@ public void afterJob() throws Exception { JobOperator jobOperator = BatchRuntime.getJobOperator(); Properties jobParameters = jobOperator.getParameters(jobContext.getExecutionId()); //If the JOB was already restarted once, mark it as abandoned - if (jobParameters.get("restartedOnce") != null && jobContext.getBatchStatus().equals(BatchStatus.FAILED)){ + if (jobParameters.get("restartedOnce") != null && jobContext.getBatchStatus().equals(BatchStatus.FAILED)) { log.info("Job already restarted once! Abandoning it forever"); jobOperator.abandon(jobContext.getExecutionId()); } diff --git a/batch-processing/src/main/resources/META-INF/batch-jobs/import-file.xml b/batch-processing/src/main/resources/META-INF/batch-jobs/import-file.xml index e7edbd25dc..855529dd72 100644 --- a/batch-processing/src/main/resources/META-INF/batch-jobs/import-file.xml +++ b/batch-processing/src/main/resources/META-INF/batch-jobs/import-file.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/batch-processing/src/main/resources/META-INF/persistence.xml b/batch-processing/src/main/resources/META-INF/persistence.xml index 7e5a35305d..e1968d733d 100644 --- a/batch-processing/src/main/resources/META-INF/persistence.xml +++ b/batch-processing/src/main/resources/META-INF/persistence.xml @@ -22,7 +22,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - diff --git a/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml b/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml index a5866a9859..15749df80c 100644 --- a/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml +++ b/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml @@ -16,13 +16,13 @@ limitations under the License. --> - - - + diff --git a/bean-validation-custom-constraint/pom.xml b/bean-validation-custom-constraint/pom.xml index 1af32854ea..961d0a6b25 100644 --- a/bean-validation-custom-constraint/pom.xml +++ b/bean-validation-custom-constraint/pom.xml @@ -40,7 +40,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -180,14 +180,14 @@ hibernate-jpamodelgen provided - + org.hibernate hibernate-core provided - + junit @@ -254,7 +254,7 @@ default - + true diff --git a/bean-validation-custom-constraint/src/main/java/org/jboss/as/quickstarts/bean_validation_custom_constraint/AddressValidator.java b/bean-validation-custom-constraint/src/main/java/org/jboss/as/quickstarts/bean_validation_custom_constraint/AddressValidator.java index dad6945610..573835ad38 100644 --- a/bean-validation-custom-constraint/src/main/java/org/jboss/as/quickstarts/bean_validation_custom_constraint/AddressValidator.java +++ b/bean-validation-custom-constraint/src/main/java/org/jboss/as/quickstarts/bean_validation_custom_constraint/AddressValidator.java @@ -24,6 +24,7 @@ public class AddressValidator implements ConstraintValidator - - \ No newline at end of file + diff --git a/bean-validation-custom-constraint/src/test/resources/META-INF/test-persistence.xml b/bean-validation-custom-constraint/src/test/resources/META-INF/test-persistence.xml index ea5ffc5b87..dc554f73d8 100644 --- a/bean-validation-custom-constraint/src/test/resources/META-INF/test-persistence.xml +++ b/bean-validation-custom-constraint/src/test/resources/META-INF/test-persistence.xml @@ -21,10 +21,10 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - - java:jboss/datasources/BeanValidationCustomConstraintQuickstartTestDS diff --git a/bean-validation-custom-constraint/src/test/resources/test-ds.xml b/bean-validation-custom-constraint/src/test/resources/test-ds.xml index d4259faf5e..99e73901ca 100644 --- a/bean-validation-custom-constraint/src/test/resources/test-ds.xml +++ b/bean-validation-custom-constraint/src/test/resources/test-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/bean-validation/pom.xml b/bean-validation/pom.xml index 4dbc864d56..ed31cdb719 100644 --- a/bean-validation/pom.xml +++ b/bean-validation/pom.xml @@ -40,7 +40,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/bean-validation/src/main/java/META-INF/beans.xml b/bean-validation/src/main/java/META-INF/beans.xml index 8c5ac6eaa9..4114ef5dc1 100644 --- a/bean-validation/src/main/java/META-INF/beans.xml +++ b/bean-validation/src/main/java/META-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - - \ No newline at end of file + diff --git a/bean-validation/src/main/java/org/jboss/as/quickstarts/bean_validation/model/Member.java b/bean-validation/src/main/java/org/jboss/as/quickstarts/bean_validation/model/Member.java index 1c3175968b..28da9cd97b 100644 --- a/bean-validation/src/main/java/org/jboss/as/quickstarts/bean_validation/model/Member.java +++ b/bean-validation/src/main/java/org/jboss/as/quickstarts/bean_validation/model/Member.java @@ -33,7 +33,7 @@ import org.hibernate.validator.constraints.NotEmpty; @Entity -@Table(name="MEMBER_BEAN_VALIDATION", uniqueConstraints = @UniqueConstraint(columnNames = "email")) +@Table(name = "MEMBER_BEAN_VALIDATION", uniqueConstraints = @UniqueConstraint(columnNames = "email")) public class Member implements Serializable { /** Default value included to remove warning. Remove or modify at will. **/ private static final long serialVersionUID = 1L; diff --git a/bean-validation/src/test/java/org/jboss/as/quickstarts/bean_validation/test/MemberValidationTest.java b/bean-validation/src/test/java/org/jboss/as/quickstarts/bean_validation/test/MemberValidationTest.java index 7027d19a42..28572e8fbf 100644 --- a/bean-validation/src/test/java/org/jboss/as/quickstarts/bean_validation/test/MemberValidationTest.java +++ b/bean-validation/src/test/java/org/jboss/as/quickstarts/bean_validation/test/MemberValidationTest.java @@ -55,14 +55,14 @@ public class MemberValidationTest { @Deployment public static Archive createTestArchive() { return ShrinkWrap.create(WebArchive.class, "test.war").addClasses(Member.class) - // enable JPA - .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") - // add sample data - .addAsResource("import.sql") - // enable CDI - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - // Deploy our test datasource - .addAsWebInfResource("test-ds.xml", "test-ds.xml"); + // enable JPA + .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") + // add sample data + .addAsResource("import.sql") + // enable CDI + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + // Deploy our test datasource + .addAsWebInfResource("test-ds.xml", "test-ds.xml"); } // Get configured validator directly from JBoss EAP environment @@ -109,7 +109,7 @@ public void testNameViolation() { Assert.assertEquals("One violation was found", 1, violations.size()); Assert.assertEquals("Name was invalid", "must contain only letters and spaces", violations.iterator().next() - .getMessage()); + .getMessage()); } /** @@ -136,7 +136,7 @@ public void testPhoneViolation() { Assert.assertEquals("One violation was found", 1, violations.size()); Assert.assertEquals("Phone number was invalid", "size must be between 10 and 12", violations.iterator().next() - .getMessage()); + .getMessage()); } private Member createValidMember() { diff --git a/bean-validation/src/test/resources/META-INF/test-persistence.xml b/bean-validation/src/test/resources/META-INF/test-persistence.xml index b301103565..ab537093b2 100644 --- a/bean-validation/src/test/resources/META-INF/test-persistence.xml +++ b/bean-validation/src/test/resources/META-INF/test-persistence.xml @@ -21,10 +21,10 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - - java:jboss/datasources/BeanValidationQuickstartTestDS diff --git a/bean-validation/src/test/resources/test-ds.xml b/bean-validation/src/test/resources/test-ds.xml index 0697df5c0d..d47538980e 100644 --- a/bean-validation/src/test/resources/test-ds.xml +++ b/bean-validation/src/test/resources/test-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/bmt/pom.xml b/bmt/pom.xml index 6d1bbfef3e..7d5f6d79a7 100644 --- a/bmt/pom.xml +++ b/bmt/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -97,7 +97,7 @@ UTF-8 - + 1.0.2.Final 1.0.3.Final diff --git a/bmt/src/main/resources/META-INF/persistence.xml b/bmt/src/main/resources/META-INF/persistence.xml index 2553a8c981..7968e4f377 100644 --- a/bmt/src/main/resources/META-INF/persistence.xml +++ b/bmt/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - diff --git a/bmt/src/main/webapp/WEB-INF/beans.xml b/bmt/src/main/webapp/WEB-INF/beans.xml index 955868d46a..460d1cf31b 100644 --- a/bmt/src/main/webapp/WEB-INF/beans.xml +++ b/bmt/src/main/webapp/WEB-INF/beans.xml @@ -19,6 +19,6 @@ diff --git a/bmt/src/main/webapp/WEB-INF/bmt-quickstart-ds.xml b/bmt/src/main/webapp/WEB-INF/bmt-quickstart-ds.xml index c8f5387b96..f6d5ae8c54 100644 --- a/bmt/src/main/webapp/WEB-INF/bmt-quickstart-ds.xml +++ b/bmt/src/main/webapp/WEB-INF/bmt-quickstart-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/cdi-alternative/pom.xml b/cdi-alternative/pom.xml index 7e524f1e70..507328f8c9 100644 --- a/cdi-alternative/pom.xml +++ b/cdi-alternative/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -94,15 +94,15 @@ --> - UTF-8 - + 1.0.2.Final - 1.0.3.Final + 1.0.3.Final 2.1.1 @@ -114,8 +114,8 @@ - - - - org.jboss.as.quickstarts.cdi.alternative.TaxImpl_2 - - - + + + + org.jboss.as.quickstarts.cdi.alternative.TaxImpl_2 + + + diff --git a/cdi-decorator/pom.xml b/cdi-decorator/pom.xml index 6944efa001..1c4e500106 100644 --- a/cdi-decorator/pom.xml +++ b/cdi-decorator/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/cdi-decorator/src/main/webapp/WEB-INF/beans.xml b/cdi-decorator/src/main/webapp/WEB-INF/beans.xml index e7c3310e1d..68798efd3e 100644 --- a/cdi-decorator/src/main/webapp/WEB-INF/beans.xml +++ b/cdi-decorator/src/main/webapp/WEB-INF/beans.xml @@ -18,7 +18,7 @@ @@ -91,12 +91,12 @@ - UTF-8 - + 1.0.2.Final 1.0.3.Final @@ -137,7 +137,7 @@ provided - org.jboss.spec.javax.annotation diff --git a/cdi-injection/src/main/java/org/jboss/as/quickstarts/cdi/injection/qualifier/English.java b/cdi-injection/src/main/java/org/jboss/as/quickstarts/cdi/injection/qualifier/English.java index d93d9e6e1f..2911635ae2 100644 --- a/cdi-injection/src/main/java/org/jboss/as/quickstarts/cdi/injection/qualifier/English.java +++ b/cdi-injection/src/main/java/org/jboss/as/quickstarts/cdi/injection/qualifier/English.java @@ -36,7 +36,7 @@ * @see Spanish */ @Qualifier -@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Target({ TYPE, METHOD, FIELD, PARAMETER }) @Documented @Retention(RetentionPolicy.RUNTIME) public @interface English { diff --git a/cdi-injection/src/main/java/org/jboss/as/quickstarts/cdi/injection/qualifier/Spanish.java b/cdi-injection/src/main/java/org/jboss/as/quickstarts/cdi/injection/qualifier/Spanish.java index ff3faa2ad3..4f965ee06d 100644 --- a/cdi-injection/src/main/java/org/jboss/as/quickstarts/cdi/injection/qualifier/Spanish.java +++ b/cdi-injection/src/main/java/org/jboss/as/quickstarts/cdi/injection/qualifier/Spanish.java @@ -38,7 +38,7 @@ * @author Jason Porter */ @Qualifier -@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Target({ TYPE, METHOD, FIELD, PARAMETER }) @Documented @Retention(RetentionPolicy.RUNTIME) public @interface Spanish { diff --git a/cdi-injection/src/main/webapp/WEB-INF/beans.xml b/cdi-injection/src/main/webapp/WEB-INF/beans.xml index 2af4b0b1be..81dcc04e38 100644 --- a/cdi-injection/src/main/webapp/WEB-INF/beans.xml +++ b/cdi-injection/src/main/webapp/WEB-INF/beans.xml @@ -17,6 +17,6 @@ diff --git a/cdi-interceptors/pom.xml b/cdi-interceptors/pom.xml index f0fa81bf4a..e0cc647dc6 100644 --- a/cdi-interceptors/pom.xml +++ b/cdi-interceptors/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -208,7 +208,7 @@ arquillian-protocol-servlet test - + diff --git a/cdi-interceptors/src/main/webapp/WEB-INF/beans.xml b/cdi-interceptors/src/main/webapp/WEB-INF/beans.xml index 8e10e73fec..0e3c5f0358 100644 --- a/cdi-interceptors/src/main/webapp/WEB-INF/beans.xml +++ b/cdi-interceptors/src/main/webapp/WEB-INF/beans.xml @@ -18,7 +18,7 @@ org.jboss.as.quickstarts.cdi.interceptor.AuditInterceptor diff --git a/cdi-interceptors/src/main/webapp/WEB-INF/cdi-quickstart-ds.xml b/cdi-interceptors/src/main/webapp/WEB-INF/cdi-quickstart-ds.xml index 0da77098a2..a65f26b61d 100644 --- a/cdi-interceptors/src/main/webapp/WEB-INF/cdi-quickstart-ds.xml +++ b/cdi-interceptors/src/main/webapp/WEB-INF/cdi-quickstart-ds.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - @@ -33,4 +33,4 @@ - + diff --git a/cdi-interceptors/src/test/java/org/jboss/as/quickstarts/cdi/interceptors/test/InterceptorsDisabledTest.java b/cdi-interceptors/src/test/java/org/jboss/as/quickstarts/cdi/interceptors/test/InterceptorsDisabledTest.java index 54b75ca383..7adb687fdf 100644 --- a/cdi-interceptors/src/test/java/org/jboss/as/quickstarts/cdi/interceptors/test/InterceptorsDisabledTest.java +++ b/cdi-interceptors/src/test/java/org/jboss/as/quickstarts/cdi/interceptors/test/InterceptorsDisabledTest.java @@ -38,12 +38,12 @@ public class InterceptorsDisabledTest { @Deployment public static Archive createDeployment() { return ShrinkWrap.create(WebArchive.class, "test.war").addPackages(true, "org.jboss.as.quickstarts.cdi") - // enable JPA - .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") - // enable CDI and passing empty beans.xml descriptor to war archive, so cdi interceptors are disabled. - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - // Deploy test datasource - .addAsWebInfResource("test-ds.xml", "test-ds.xml"); + // enable JPA + .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") + // enable CDI and passing empty beans.xml descriptor to war archive, so cdi interceptors are disabled. + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + // Deploy test datasource + .addAsWebInfResource("test-ds.xml", "test-ds.xml"); } @EJB diff --git a/cdi-interceptors/src/test/java/org/jboss/as/quickstarts/cdi/interceptors/test/InterceptorsEnabledTest.java b/cdi-interceptors/src/test/java/org/jboss/as/quickstarts/cdi/interceptors/test/InterceptorsEnabledTest.java index 06838cfedb..3631864d2a 100644 --- a/cdi-interceptors/src/test/java/org/jboss/as/quickstarts/cdi/interceptors/test/InterceptorsEnabledTest.java +++ b/cdi-interceptors/src/test/java/org/jboss/as/quickstarts/cdi/interceptors/test/InterceptorsEnabledTest.java @@ -42,12 +42,12 @@ public class InterceptorsEnabledTest { @Deployment public static Archive createDeployment() { return ShrinkWrap.create(WebArchive.class, "test.war").addPackages(true, "org.jboss.as.quickstarts.cdi") - // enable JPA - .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") - // enable CDI interceptors - .addAsWebInfResource("beans.xml", "beans.xml") - // Deploy test datasource - .addAsWebInfResource("test-ds.xml", "test-ds.xml"); + // enable JPA + .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") + // enable CDI interceptors + .addAsWebInfResource("beans.xml", "beans.xml") + // Deploy test datasource + .addAsWebInfResource("test-ds.xml", "test-ds.xml"); } @EJB diff --git a/cdi-interceptors/src/test/resources/META-INF/test-persistence.xml b/cdi-interceptors/src/test/resources/META-INF/test-persistence.xml index f42602fffc..f970c251c7 100644 --- a/cdi-interceptors/src/test/resources/META-INF/test-persistence.xml +++ b/cdi-interceptors/src/test/resources/META-INF/test-persistence.xml @@ -20,10 +20,10 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - - java:jboss/datasources/cdiInterceptorsQuickstartTestDS diff --git a/cdi-interceptors/src/test/resources/beans.xml b/cdi-interceptors/src/test/resources/beans.xml index 8e10e73fec..0e3c5f0358 100644 --- a/cdi-interceptors/src/test/resources/beans.xml +++ b/cdi-interceptors/src/test/resources/beans.xml @@ -18,7 +18,7 @@ org.jboss.as.quickstarts.cdi.interceptor.AuditInterceptor diff --git a/cdi-interceptors/src/test/resources/test-ds.xml b/cdi-interceptors/src/test/resources/test-ds.xml index 7fdfdfdab0..18b0d3fe5f 100644 --- a/cdi-interceptors/src/test/resources/test-ds.xml +++ b/cdi-interceptors/src/test/resources/test-ds.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - @@ -33,4 +33,4 @@ - + diff --git a/cdi-portable-extension/pom.xml b/cdi-portable-extension/pom.xml index ef8559c4c3..71090a91c8 100644 --- a/cdi-portable-extension/pom.xml +++ b/cdi-portable-extension/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -94,9 +94,9 @@ [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! --> UTF-8 - + - + 1.0.2.Final diff --git a/cdi-portable-extension/src/main/java/org/jboss/as/quickstart/cdi/extension/model/CreatureType.java b/cdi-portable-extension/src/main/java/org/jboss/as/quickstart/cdi/extension/model/CreatureType.java index 757aec1a81..ad92b40024 100644 --- a/cdi-portable-extension/src/main/java/org/jboss/as/quickstart/cdi/extension/model/CreatureType.java +++ b/cdi-portable-extension/src/main/java/org/jboss/as/quickstart/cdi/extension/model/CreatureType.java @@ -20,5 +20,6 @@ * The various types of creatures. */ public enum CreatureType { - MONSTER, NPC + MONSTER, + NPC } diff --git a/cdi-portable-extension/src/main/resources/creatures.xml b/cdi-portable-extension/src/main/resources/creatures.xml index 3b082f88ea..0720cf0476 100644 --- a/cdi-portable-extension/src/main/resources/creatures.xml +++ b/cdi-portable-extension/src/main/resources/creatures.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - diff --git a/cdi-portable-extension/src/test/java/org/jboss/as/quickstart/cdi/extension/test/CreatureExtensionTest.java b/cdi-portable-extension/src/test/java/org/jboss/as/quickstart/cdi/extension/test/CreatureExtensionTest.java index eba0528d5c..10bab4c26f 100644 --- a/cdi-portable-extension/src/test/java/org/jboss/as/quickstart/cdi/extension/test/CreatureExtensionTest.java +++ b/cdi-portable-extension/src/test/java/org/jboss/as/quickstart/cdi/extension/test/CreatureExtensionTest.java @@ -42,10 +42,10 @@ public class CreatureExtensionTest { @Deployment public static Archive getDeployment() { return ShrinkWrap.create(JavaArchive.class, "creature-creation.jar") - .addPackages(true, CreatureExtension.class.getPackage()) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") - .addAsResource("creatures.xml") - .addAsServiceProvider(Extension.class, CreatureExtension.class); + .addPackages(true, CreatureExtension.class.getPackage()) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") + .addAsResource("creatures.xml") + .addAsServiceProvider(Extension.class, CreatureExtension.class); } @Inject diff --git a/cdi-stereotype/pom.xml b/cdi-stereotype/pom.xml index c6aca66552..38ba1343da 100644 --- a/cdi-stereotype/pom.xml +++ b/cdi-stereotype/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/cdi-stereotype/src/main/webapp/WEB-INF/beans.xml b/cdi-stereotype/src/main/webapp/WEB-INF/beans.xml index aaa2bcab64..5b7a1c5cdf 100644 --- a/cdi-stereotype/src/main/webapp/WEB-INF/beans.xml +++ b/cdi-stereotype/src/main/webapp/WEB-INF/beans.xml @@ -18,7 +18,7 @@ org.jboss.as.quickstarts.cdi.interceptor.AuditInterceptor diff --git a/cdi-stereotype/src/main/webapp/WEB-INF/stereotype-quickstart-ds.xml b/cdi-stereotype/src/main/webapp/WEB-INF/stereotype-quickstart-ds.xml index 051aab1e71..2d685e69f6 100644 --- a/cdi-stereotype/src/main/webapp/WEB-INF/stereotype-quickstart-ds.xml +++ b/cdi-stereotype/src/main/webapp/WEB-INF/stereotype-quickstart-ds.xml @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -94,9 +94,9 @@ [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! --> UTF-8 - + - + 1.0.2.Final diff --git a/cdi-veto/src/main/java/org/jboss/as/quickstart/cdi/veto/model/Car.java b/cdi-veto/src/main/java/org/jboss/as/quickstart/cdi/veto/model/Car.java index 0a06ea15be..ea355dee48 100644 --- a/cdi-veto/src/main/java/org/jboss/as/quickstart/cdi/veto/model/Car.java +++ b/cdi-veto/src/main/java/org/jboss/as/quickstart/cdi/veto/model/Car.java @@ -27,7 +27,8 @@ */ @Entity public class Car { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @Basic diff --git a/cdi-veto/src/main/webapp/WEB-INF/cdi-veto-quickstart-ds.xml b/cdi-veto/src/main/webapp/WEB-INF/cdi-veto-quickstart-ds.xml index 7e5b83ea8f..5d6f49c1f9 100644 --- a/cdi-veto/src/main/webapp/WEB-INF/cdi-veto-quickstart-ds.xml +++ b/cdi-veto/src/main/webapp/WEB-INF/cdi-veto-quickstart-ds.xml @@ -15,9 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - createTestArchive() { return ShrinkWrap.create(WebArchive.class, InjectionWithVetoExtensionAndManagerTest.class.getSimpleName() + ".war") - .addClasses(Car.class, EntityManagerProducer.class, VetoExtension.class, CarManager.class) - .addAsServiceProvider(Extension.class, VetoExtension.class) - .addAsResource("META-INF/persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - // Using this to get the datasource xml file - .merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class) - .importDirectory("src/main/webapp").as(GenericArchive.class), - "/", Filters.include(".*ds\\.xml$")); + .addClasses(Car.class, EntityManagerProducer.class, VetoExtension.class, CarManager.class) + .addAsServiceProvider(Extension.class, VetoExtension.class) + .addAsResource("META-INF/persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + // Using this to get the datasource xml file + .merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class) + .importDirectory("src/main/webapp").as(GenericArchive.class), + "/", Filters.include(".*ds\\.xml$")); } @Inject diff --git a/cdi-veto/src/test/java/org/jboss/as/quickstart/cdi/veto/test/InjectionWithVetoExtensionWithoutManagerTest.java b/cdi-veto/src/test/java/org/jboss/as/quickstart/cdi/veto/test/InjectionWithVetoExtensionWithoutManagerTest.java index 4d3292c157..a4917c653e 100644 --- a/cdi-veto/src/test/java/org/jboss/as/quickstart/cdi/veto/test/InjectionWithVetoExtensionWithoutManagerTest.java +++ b/cdi-veto/src/test/java/org/jboss/as/quickstart/cdi/veto/test/InjectionWithVetoExtensionWithoutManagerTest.java @@ -46,14 +46,14 @@ public class InjectionWithVetoExtensionWithoutManagerTest { @Deployment public static Archive createTestArchive() { return ShrinkWrap.create(WebArchive.class, InjectionWithVetoExtensionWithoutManagerTest.class.getSimpleName() + ".war") - .addClasses(Car.class, EntityManagerProducer.class, VetoExtension.class) - .addAsServiceProvider(Extension.class, VetoExtension.class) - .addAsResource("META-INF/persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - // Using this to get the datasource xml file - .merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class) - .importDirectory("src/main/webapp").as(GenericArchive.class), - "/", Filters.include(".*ds\\.xml$")); + .addClasses(Car.class, EntityManagerProducer.class, VetoExtension.class) + .addAsServiceProvider(Extension.class, VetoExtension.class) + .addAsResource("META-INF/persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + // Using this to get the datasource xml file + .merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class) + .importDirectory("src/main/webapp").as(GenericArchive.class), + "/", Filters.include(".*ds\\.xml$")); } @Inject diff --git a/cdi-veto/src/test/java/org/jboss/as/quickstart/cdi/veto/test/InjectionWithoutVetoExtensionWithManagerTest.java b/cdi-veto/src/test/java/org/jboss/as/quickstart/cdi/veto/test/InjectionWithoutVetoExtensionWithManagerTest.java index 4870329ae1..1b165548cc 100644 --- a/cdi-veto/src/test/java/org/jboss/as/quickstart/cdi/veto/test/InjectionWithoutVetoExtensionWithManagerTest.java +++ b/cdi-veto/src/test/java/org/jboss/as/quickstart/cdi/veto/test/InjectionWithoutVetoExtensionWithManagerTest.java @@ -45,13 +45,13 @@ public class InjectionWithoutVetoExtensionWithManagerTest { @Deployment public static Archive createTestArchive() { return ShrinkWrap.create(WebArchive.class, InjectionWithoutVetoExtensionWithManagerTest.class.getSimpleName() + ".war") - .addClasses(Car.class, EntityManagerProducer.class, CarManager.class) - .addAsResource("META-INF/persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - // Using this to get the datasource xml file - .merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class) - .importDirectory("src/main/webapp").as(GenericArchive.class), - "/", Filters.include(".*ds\\.xml$")); + .addClasses(Car.class, EntityManagerProducer.class, CarManager.class) + .addAsResource("META-INF/persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + // Using this to get the datasource xml file + .merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class) + .importDirectory("src/main/webapp").as(GenericArchive.class), + "/", Filters.include(".*ds\\.xml$")); } @Inject diff --git a/cluster-ha-singleton/pom.xml b/cluster-ha-singleton/pom.xml index a2c1e180cf..77b12931dd 100644 --- a/cluster-ha-singleton/pom.xml +++ b/cluster-ha-singleton/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,7 +91,7 @@ - UTF-8 diff --git a/cluster-ha-singleton/service/pom.xml b/cluster-ha-singleton/service/pom.xml index b515849cba..9b3fc3cd14 100644 --- a/cluster-ha-singleton/service/pom.xml +++ b/cluster-ha-singleton/service/pom.xml @@ -36,7 +36,7 @@ - @@ -45,19 +45,19 @@ jboss-msc 1.2.6.Final - org.jboss.spec.javax.ejb jboss-ejb-api_3.2_spec - org.jboss.spec.javax.annotation jboss-annotations-api_1.2_spec - org.wildfly @@ -70,7 +70,7 @@ ${project.artifactId} - org.apache.maven.plugins maven-ejb-plugin diff --git a/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/HATimerService.java b/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/HATimerService.java index e48bc1cc70..43549c7780 100644 --- a/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/HATimerService.java +++ b/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/HATimerService.java @@ -29,7 +29,6 @@ import org.jboss.msc.service.StartException; import org.jboss.msc.service.StopContext; - /** *

A service to start schedule-timer as HASingleton timer in a clustered environment. * The {@link HATimerServiceActivator} will ensure that the timer is initialized only once in a cluster.

@@ -69,7 +68,8 @@ public void start(StartContext arg0) throws StartException { final String node = System.getProperty("jboss.node.name"); try { InitialContext ic = new InitialContext(); - ((Scheduler) ic.lookup("global/jboss-cluster-ha-singleton-service/SchedulerBean!org.jboss.as.quickstarts.cluster.hasingleton.service.ejb.Scheduler")).initialize("HASingleton timer @" + node + " " + new Date()); + ((Scheduler) ic.lookup("global/jboss-cluster-ha-singleton-service/SchedulerBean!org.jboss.as.quickstarts.cluster.hasingleton.service.ejb.Scheduler")) + .initialize("HASingleton timer @" + node + " " + new Date()); } catch (NamingException e) { throw new StartException("Could not initialize timer", e); } @@ -84,7 +84,7 @@ public void stop(StopContext arg0) { InitialContext ic = new InitialContext(); ((Scheduler) ic.lookup("global/jboss-cluster-ha-singleton-service/SchedulerBean!org.jboss.as.quickstarts.cluster.hasingleton.service.ejb.Scheduler")).stop(); } catch (NamingException e) { - LOGGER.info("Could not stop timer:" + e.getMessage()); + LOGGER.info("Could not stop timer:" + e.getMessage()); } } } diff --git a/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/HATimerServiceActivator.java b/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/HATimerServiceActivator.java index a37dd55e88..591519c639 100644 --- a/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/HATimerServiceActivator.java +++ b/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/HATimerServiceActivator.java @@ -48,22 +48,21 @@ public void activate(ServiceActivatorContext context) { ServiceController factoryService = context.getServiceRegistry().getRequiredService(factoryServiceName); SingletonServiceBuilderFactory factory = (SingletonServiceBuilderFactory) factoryService.getValue(); factory.createSingletonServiceBuilder(HATimerService.SINGLETON_SERVICE_NAME, service) - /* - * The NamePreference is a combination of the node name (-Djboss.node.name) and the name of - * the configured cache "singleton". If there is more than 1 node, it is possible to add more than - * one name and the election will use the first available node in that list. - * - To pass a chain of election policies to the singleton and tell JGroups to run the - * singleton on a node with a particular name, uncomment the first line and - * comment the second line below. - * - To pass a list of more than one node, comment the first line and uncomment the - * second line below. - */ - .electionPolicy(new PreferredSingletonElectionPolicy(new SimpleSingletonElectionPolicy(), new NamePreference("node1/singleton"))) - //singleton.setElectionPolicy(new PreferredSingletonElectionPolicy(new SimpleSingletonElectionPolicy(), new NamePreference("node1/singleton"), new NamePreference("node2/singleton"))); + /* + * The NamePreference is a combination of the node name (-Djboss.node.name) and the name of + * the configured cache "singleton". If there is more than 1 node, it is possible to add more than + * one name and the election will use the first available node in that list. + * - To pass a chain of election policies to the singleton and tell JGroups to run the + * singleton on a node with a particular name, uncomment the first line and + * comment the second line below. + * - To pass a list of more than one node, comment the first line and uncomment the + * second line below. + */ + .electionPolicy(new PreferredSingletonElectionPolicy(new SimpleSingletonElectionPolicy(), new NamePreference("node1/singleton"))) + //singleton.setElectionPolicy(new PreferredSingletonElectionPolicy(new SimpleSingletonElectionPolicy(), new NamePreference("node1/singleton"), new NamePreference("node2/singleton"))); - .build(new DelegatingServiceContainer(context.getServiceTarget(), context.getServiceRegistry())) - .setInitialMode(ServiceController.Mode.ACTIVE) - .install() - ; + .build(new DelegatingServiceContainer(context.getServiceTarget(), context.getServiceRegistry())) + .setInitialMode(ServiceController.Mode.ACTIVE) + .install(); } } diff --git a/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/SchedulerBean.java b/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/SchedulerBean.java index 92ec911106..4dfc50f652 100644 --- a/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/SchedulerBean.java +++ b/cluster-ha-singleton/service/src/main/java/org/jboss/as/quickstarts/cluster/hasingleton/service/ejb/SchedulerBean.java @@ -26,7 +26,6 @@ import javax.ejb.TimerConfig; import javax.ejb.TimerService; - /** * A simple example to demonstrate a implementation of a cluster-wide singleton timer. * diff --git a/cmt/pom.xml b/cmt/pom.xml index 495bfc6205..d1ae2139d5 100644 --- a/cmt/pom.xml +++ b/cmt/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,14 +90,14 @@ - - UTF-8 - + 1.0.2.Final @@ -113,11 +113,11 @@ - org.jboss.bom @@ -166,7 +166,7 @@ javax.inject provided - + junit @@ -177,7 +177,7 @@ - ${project.artifactId} @@ -186,7 +186,7 @@ maven-war-plugin ${version.war.plugin} - false diff --git a/cmt/src/main/java/org/jboss/as/quickstarts/cmt/ejb/InvoiceManagerEJB.java b/cmt/src/main/java/org/jboss/as/quickstarts/cmt/ejb/InvoiceManagerEJB.java index 80b40864e4..c93459c43a 100644 --- a/cmt/src/main/java/org/jboss/as/quickstarts/cmt/ejb/InvoiceManagerEJB.java +++ b/cmt/src/main/java/org/jboss/as/quickstarts/cmt/ejb/InvoiceManagerEJB.java @@ -38,6 +38,6 @@ public class InvoiceManagerEJB { @TransactionAttribute(TransactionAttributeType.MANDATORY) public void createInvoice(String name) { jmsContext.createProducer() - .send(queue, "Created invoice for customer named: " + name); + .send(queue, "Created invoice for customer named: " + name); } } diff --git a/cmt/src/main/java/org/jboss/as/quickstarts/cmt/mdb/HelloWorldMDB.java b/cmt/src/main/java/org/jboss/as/quickstarts/cmt/mdb/HelloWorldMDB.java index 0a2f72ed0d..59bbeb03e5 100644 --- a/cmt/src/main/java/org/jboss/as/quickstarts/cmt/mdb/HelloWorldMDB.java +++ b/cmt/src/main/java/org/jboss/as/quickstarts/cmt/mdb/HelloWorldMDB.java @@ -34,9 +34,9 @@ * */ @MessageDriven(name = "HelloWorldMDB", activationConfig = { - @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), - @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/CMTQueue"), - @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") }) + @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), + @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/CMTQueue"), + @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") }) public class HelloWorldMDB implements MessageListener { private final static Logger LOGGER = Logger.getLogger(HelloWorldMDB.class.toString()); diff --git a/cmt/src/main/webapp/WEB-INF/beans.xml b/cmt/src/main/webapp/WEB-INF/beans.xml index f2a9ad4a32..5c0dbc2d7d 100644 --- a/cmt/src/main/webapp/WEB-INF/beans.xml +++ b/cmt/src/main/webapp/WEB-INF/beans.xml @@ -16,6 +16,6 @@ --> diff --git a/cmt/src/main/webapp/WEB-INF/faces-config.xml b/cmt/src/main/webapp/WEB-INF/faces-config.xml index 94ec5ad6ea..1672a28dc7 100644 --- a/cmt/src/main/webapp/WEB-INF/faces-config.xml +++ b/cmt/src/main/webapp/WEB-INF/faces-config.xml @@ -17,8 +17,8 @@ --> - diff --git a/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/Contact.java b/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/Contact.java index 5d35df8ea3..3b2b92f5c5 100644 --- a/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/Contact.java +++ b/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/Contact.java @@ -70,15 +70,21 @@ public void setBirthDate(String birthDate) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Contact contact = (Contact) o; - if (birthDate != null ? !birthDate.equals(contact.birthDate) : contact.birthDate != null) return false; - if (email != null ? !email.equals(contact.email) : contact.email != null) return false; - if (name != null ? !name.equals(contact.name) : contact.name != null) return false; - if (phoneNumber != null ? !phoneNumber.equals(contact.phoneNumber) : contact.phoneNumber != null) return false; + if (birthDate != null ? !birthDate.equals(contact.birthDate) : contact.birthDate != null) + return false; + if (email != null ? !email.equals(contact.email) : contact.email != null) + return false; + if (name != null ? !name.equals(contact.name) : contact.name != null) + return false; + if (phoneNumber != null ? !phoneNumber.equals(contact.phoneNumber) : contact.phoneNumber != null) + return false; return true; } diff --git a/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/ContactsMobileBasicTest.java b/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/ContactsMobileBasicTest.java index 88c902a774..012dab1184 100644 --- a/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/ContactsMobileBasicTest.java +++ b/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/ContactsMobileBasicTest.java @@ -95,7 +95,6 @@ public class ContactsMobileBasicTest { private static String DATE_TOO_OLD = "1700-02-04"; private static String DATE_FUTURE = "2020-01-01"; - /** * Creates deployment which is sent to the container upon test's start. * @@ -106,7 +105,6 @@ public static WebArchive deployment() { return Deployments.contacts(); } - @Before public void loadPage() { browser.get(contextPath.toString()); @@ -207,5 +205,4 @@ public void editContactTest() { assertTrue(listPage.getContacts().contains(contact)); } - } diff --git a/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/RESTTest.java b/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/RESTTest.java index cc863c1f9a..1ba0d9d68b 100644 --- a/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/RESTTest.java +++ b/contacts-jquerymobile/functional-tests/src/test/java/org/jboss/as/quickstarts/contacts/test/RESTTest.java @@ -99,12 +99,12 @@ public void testAddContact() throws Exception { HttpPost post = new HttpPost(contextPath.toString() + API_PATH); post.setHeader("Content-Type", "application/json"); String newContactJSON = new JSONStringer().object() - .key("firstName").value(NEW_CONTACT_FIRSTNAME) - .key("lastName").value(NEW_CONTACT_LASTNAME) - .key("email").value(NEW_CONTACT_EMAIL) - .key("phoneNumber").value(NEW_CONTACT_PHONE) - .key("birthDate").value(NEW_CONTACT_BIRTHDATE) - .endObject().toString(); + .key("firstName").value(NEW_CONTACT_FIRSTNAME) + .key("lastName").value(NEW_CONTACT_LASTNAME) + .key("email").value(NEW_CONTACT_EMAIL) + .key("phoneNumber").value(NEW_CONTACT_PHONE) + .key("birthDate").value(NEW_CONTACT_BIRTHDATE) + .endObject().toString(); post.setEntity(new StringEntity(newContactJSON)); HttpResponse response = httpClient.execute(post); diff --git a/contacts-jquerymobile/pom.xml b/contacts-jquerymobile/pom.xml index f052b87b1e..dcd218cc67 100644 --- a/contacts-jquerymobile/pom.xml +++ b/contacts-jquerymobile/pom.xml @@ -42,7 +42,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -94,11 +94,11 @@ UTF-8 - + - + - + 1.0.2.Final @@ -207,7 +207,7 @@ - + org.jboss.resteasy resteasy-jackson2-provider @@ -243,25 +243,25 @@ arquillian-protocol-servlet test - + org.jboss.arquillian.container arquillian-container-test-api test - + org.jboss.arquillian.junit arquillian-junit-core test - + org.jboss.shrinkwrap shrinkwrap-api test - + org.jboss.shrinkwrap.resolver shrinkwrap-resolver-api-maven @@ -270,7 +270,7 @@ - ${project.artifactId} @@ -282,7 +282,7 @@ true - + maven-war-plugin ${version.war.plugin} @@ -399,7 +399,7 @@ - + diff --git a/contacts-jquerymobile/src/main/java/org/jboss/quickstarts/contact/ContactRESTService.java b/contacts-jquerymobile/src/main/java/org/jboss/quickstarts/contact/ContactRESTService.java index 754d004ba6..7b91a28147 100644 --- a/contacts-jquerymobile/src/main/java/org/jboss/quickstarts/contact/ContactRESTService.java +++ b/contacts-jquerymobile/src/main/java/org/jboss/quickstarts/contact/ContactRESTService.java @@ -111,7 +111,7 @@ public Response retrieveContactById(@PathParam("id") long id) { throw new WebApplicationException(Response.Status.NOT_FOUND); } log.info("findById " + id + ": found Contact = " + contact.getFirstName() + " " + contact.getLastName() + " " + contact.getEmail() + " " + contact.getPhoneNumber() + " " - + contact.getBirthDate() + " " + contact.getId()); + + contact.getBirthDate() + " " + contact.getId()); return Response.ok(contact).build(); } @@ -178,7 +178,7 @@ public Response updateContact(@PathParam("id") long id, Contact contact) { throw new WebApplicationException(Response.Status.BAD_REQUEST); } log.info("updateContact started. Contact = " + contact.getFirstName() + " " + contact.getLastName() + " " + contact.getEmail() + " " + contact.getPhoneNumber() + " " - + contact.getBirthDate() + " " + contact.getId()); + + contact.getBirthDate() + " " + contact.getId()); if (contact.getId() != id) { // The client attempted to update the read-only Id. This is not permitted. @@ -279,5 +279,4 @@ private Response.ResponseBuilder createViolationResponse(Set update(Contact contact) throws Exception { + // Map update(Contact contact) throws Exception { Contact update(Contact contact) throws ConstraintViolationException, ValidationException, Exception { log.info("ContactRepository.update() - Updating " + contact.getFirstName() + " " + contact.getLastName()); @@ -159,7 +159,7 @@ Contact update(Contact contact) throws ConstraintViolationException, ValidationE * @return Contact * @throws Exception */ -// Map delete(Contact contact) throws Exception { + // Map delete(Contact contact) throws Exception { Contact delete(Contact contact) throws Exception { log.info("ContactRepository.delete() - Deleting " + contact.getFirstName() + " " + contact.getLastName()); diff --git a/contacts-jquerymobile/src/main/java/org/jboss/quickstarts/contact/ContactService.java b/contacts-jquerymobile/src/main/java/org/jboss/quickstarts/contact/ContactService.java index 42cac473dd..99da80c788 100644 --- a/contacts-jquerymobile/src/main/java/org/jboss/quickstarts/contact/ContactService.java +++ b/contacts-jquerymobile/src/main/java/org/jboss/quickstarts/contact/ContactService.java @@ -133,7 +133,7 @@ Contact create(Contact contact) throws ConstraintViolationException, ValidationE * @return Contact * @throws ConstraintViolationException, ValidationException, Exception */ -// Map update(Contact contact) throws Exception { + // Map update(Contact contact) throws Exception { Contact update(Contact contact) throws ConstraintViolationException, ValidationException, Exception { log.info("ContactService.update() - Updating " + contact.getFirstName() + " " + contact.getLastName()); @@ -153,7 +153,7 @@ Contact update(Contact contact) throws ConstraintViolationException, ValidationE * @return Contact * @throws Exception */ -// Map delete(Contact contact) throws Exception { + // Map delete(Contact contact) throws Exception { Contact delete(Contact contact) throws Exception { log.info("ContactService.delete() - Deleting " + contact.getFirstName() + " " + contact.getLastName()); diff --git a/contacts-jquerymobile/src/main/resources/META-INF/persistence.xml b/contacts-jquerymobile/src/main/resources/META-INF/persistence.xml index bfeda9f082..0bdc9ab566 100644 --- a/contacts-jquerymobile/src/main/resources/META-INF/persistence.xml +++ b/contacts-jquerymobile/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - java:jboss/datasources/JbossContactsMobileBasicQuickstartDS diff --git a/contacts-jquerymobile/src/main/webapp/WEB-INF/beans.xml b/contacts-jquerymobile/src/main/webapp/WEB-INF/beans.xml index bfb72e3d65..6b2c62fc13 100644 --- a/contacts-jquerymobile/src/main/webapp/WEB-INF/beans.xml +++ b/contacts-jquerymobile/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - diff --git a/contacts-jquerymobile/src/main/webapp/WEB-INF/contacts-quickstart-ds.xml b/contacts-jquerymobile/src/main/webapp/WEB-INF/contacts-quickstart-ds.xml index 9c94df8c75..a1def11e41 100644 --- a/contacts-jquerymobile/src/main/webapp/WEB-INF/contacts-quickstart-ds.xml +++ b/contacts-jquerymobile/src/main/webapp/WEB-INF/contacts-quickstart-ds.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - + diff --git a/contacts-jquerymobile/src/test/java/org/jboss/quickstarts/contact/test/ContactRegistrationTest.java b/contacts-jquerymobile/src/test/java/org/jboss/quickstarts/contact/test/ContactRegistrationTest.java index 8e6054c3cc..a84a2dc7fb 100644 --- a/contacts-jquerymobile/src/test/java/org/jboss/quickstarts/contact/test/ContactRegistrationTest.java +++ b/contacts-jquerymobile/src/test/java/org/jboss/quickstarts/contact/test/ContactRegistrationTest.java @@ -57,19 +57,19 @@ public class ContactRegistrationTest { @Deployment public static Archive createTestArchive() { -// File[] libs = Maven.resolver().loadPomFromFile("pom.xml").resolve( -// "org.hibernate.javax.persistence:hibernate-jpa-2.0-api" -// ).withTransitivity().asFile(); + // File[] libs = Maven.resolver().loadPomFromFile("pom.xml").resolve( + // "org.hibernate.javax.persistence:hibernate-jpa-2.0-api" + // ).withTransitivity().asFile(); Archive archive = ShrinkWrap .create(WebArchive.class, "test.war") .addClasses(Contact.class, - ContactRESTService.class, - ContactRepository.class, - ContactValidator.class, - ContactService.class, - Resources.class) -// .addAsLibraries(libs) + ContactRESTService.class, + ContactRepository.class, + ContactValidator.class, + ContactService.class, + Resources.class) + // .addAsLibraries(libs) .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") .addAsWebInfResource("arquillian-ds.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); @@ -84,10 +84,10 @@ public static Archive createTestArchive() { Logger log; // The URI is needed for the JAX-RS 2.0 tests. -// private static URI uri = UriBuilder.fromUri("http://localhost/jboss-contacts-jquerymobile/rest/contact").port(8080).build(); + // private static URI uri = UriBuilder.fromUri("http://localhost/jboss-contacts-jquerymobile/rest/contact").port(8080).build(); // JAX-RS 2.0 Client API -// private static Client client = ClientBuilder.newClient(); + // private static Client client = ClientBuilder.newClient(); //Set millis 498484800000 from 1985-10-10T12:00:00.000Z private Date date = new Date(498484800000L); @@ -136,49 +136,49 @@ public void testDuplicateEmail() throws Exception { } // Uncomment when you have access to JAX-RS 2.0 -// @Test -// @InSequence(4) -// public void shouldNotCreateANullContact() throws JAXBException { -// //POSTs a null Contact -// Response response = client.target(uri).request().post(Entity.entity(null, MediaType.APPLICATION_JSON)); -// assertEquals(Response.Status.BAD_REQUEST, response.getStatusInfo()); -// } -// -// @Test -// @InSequence(5) -// public void shouldNotFindTheContactID() throws JAXBException { -// // GETs a Contact with an unknown ID -// Response response = client.target(uri).path("unknownID").request().get(); -// assertEquals(Response.Status.NOT_FOUND, response.getStatusInfo()); -// } -// -// @Test -// @InSequence(6) -// public void shouldCreateAndDeleteAContact() throws JAXBException { -// -// Contact contact = createContactInstance("Jason", "Smith", "jason@mailinator.com", "2125551234", date); -// -// // POSTs a Contact -// Response response = client.target(uri).request().post(Entity.entity(contact, MediaType.APPLICATION_JSON)); -// -// assertEquals(Response.Status.CREATED, response.getStatusInfo()); -// URI contactURI = response.getLocation(); -// -// // With the location, GETs the Contact -// response = client.target(contactURI).request().get(); -// contact = response.readEntity(Contact.class); -// assertEquals(Response.Status.OK, response.getStatusInfo()); -// assertEquals("Jason", contact.getFirstName()); -// -// // GETs the Contact ID and DELETEs it -// String contactID = contactURI.toString().split("/")[6]; -// response = client.target(uri).path(contactID).request().delete(); -// assertEquals(Response.Status.NO_CONTENT, response.getStatusInfo()); -// -// // GETs the Contact and checks if it has been deleted -// response = client.target(bookURI).request().get(); -// assertEquals(Response.Status.NOT_FOUND, response.getStatusInfo()); -// } + // @Test + // @InSequence(4) + // public void shouldNotCreateANullContact() throws JAXBException { + // //POSTs a null Contact + // Response response = client.target(uri).request().post(Entity.entity(null, MediaType.APPLICATION_JSON)); + // assertEquals(Response.Status.BAD_REQUEST, response.getStatusInfo()); + // } + // + // @Test + // @InSequence(5) + // public void shouldNotFindTheContactID() throws JAXBException { + // // GETs a Contact with an unknown ID + // Response response = client.target(uri).path("unknownID").request().get(); + // assertEquals(Response.Status.NOT_FOUND, response.getStatusInfo()); + // } + // + // @Test + // @InSequence(6) + // public void shouldCreateAndDeleteAContact() throws JAXBException { + // + // Contact contact = createContactInstance("Jason", "Smith", "jason@mailinator.com", "2125551234", date); + // + // // POSTs a Contact + // Response response = client.target(uri).request().post(Entity.entity(contact, MediaType.APPLICATION_JSON)); + // + // assertEquals(Response.Status.CREATED, response.getStatusInfo()); + // URI contactURI = response.getLocation(); + // + // // With the location, GETs the Contact + // response = client.target(contactURI).request().get(); + // contact = response.readEntity(Contact.class); + // assertEquals(Response.Status.OK, response.getStatusInfo()); + // assertEquals("Jason", contact.getFirstName()); + // + // // GETs the Contact ID and DELETEs it + // String contactID = contactURI.toString().split("/")[6]; + // response = client.target(uri).path(contactID).request().delete(); + // assertEquals(Response.Status.NO_CONTENT, response.getStatusInfo()); + // + // // GETs the Contact and checks if it has been deleted + // response = client.target(bookURI).request().get(); + // assertEquals(Response.Status.NOT_FOUND, response.getStatusInfo()); + // } private Contact createContactInstance(String firstName, String lastName, String email, String phone, Date birthDate) { Contact contact = new Contact(); diff --git a/contacts-jquerymobile/src/test/resources/arquillian-ds.xml b/contacts-jquerymobile/src/test/resources/arquillian-ds.xml index b06aadeebc..6d77ce88ec 100644 --- a/contacts-jquerymobile/src/test/resources/arquillian-ds.xml +++ b/contacts-jquerymobile/src/test/resources/arquillian-ds.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - + diff --git a/contributor-settings.xml b/contributor-settings.xml index 9ae8b19b4c..a2399c23b4 100644 --- a/contributor-settings.xml +++ b/contributor-settings.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + - + @@ -72,7 +72,7 @@ - + jboss-earlyaccess-repository @@ -101,7 +101,7 @@ - + jboss-developer-repository @@ -137,7 +137,7 @@ jboss-ga-repository jboss-earlyaccess-repository - jboss-developer-repository + jboss-developer-repository diff --git a/dist/license.txt b/dist/license.txt index 9d210a52da..d5d5621d0d 100644 --- a/dist/license.txt +++ b/dist/license.txt @@ -1,6 +1,6 @@ JBoss, Home of Professional Open Source Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual -contributors by the @authors tag. See the copyright.txt in the +contributors by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. Licensed under the Apache License, Version 2.0 (the "License"); @@ -8,7 +8,7 @@ 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, +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. diff --git a/dist/pom.xml b/dist/pom.xml index 62f636b912..6bb6fd879b 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -61,5 +61,5 @@ - + diff --git a/ejb-asynchronous/client/pom.xml b/ejb-asynchronous/client/pom.xml index 727dfdc496..eacf2672d5 100644 --- a/ejb-asynchronous/client/pom.xml +++ b/ejb-asynchronous/client/pom.xml @@ -63,7 +63,7 @@ jboss-ejb-asynchronous-ejb ejb-client - + org.jboss.spec.javax.ejb @@ -84,7 +84,7 @@ ${project.artifactId} - org.codehaus.mojo @@ -101,7 +101,7 @@ java ${project.build.directory}/exec-working-directory - -classpath diff --git a/ejb-asynchronous/client/src/main/java/org/jboss/as/quickstarts/ejb/asynchronous/client/AsynchronousClient.java b/ejb-asynchronous/client/src/main/java/org/jboss/as/quickstarts/ejb/asynchronous/client/AsynchronousClient.java index 9f4c4a7a4a..043291a84a 100644 --- a/ejb-asynchronous/client/src/main/java/org/jboss/as/quickstarts/ejb/asynchronous/client/AsynchronousClient.java +++ b/ejb-asynchronous/client/src/main/java/org/jboss/as/quickstarts/ejb/asynchronous/client/AsynchronousClient.java @@ -74,7 +74,8 @@ private AsynchronousClient() throws NamingException { private void fireAndForget() throws InterruptedException { long sleepMillis = 15000; accessBean.fireAndForget(sleepMillis); - LOGGER.info(String.format("The server log should contain a message at (about) %s, indicating that the call to the asynchronous bean completed.", new Date(new Date().getTime() + sleepMillis))); + LOGGER.info(String.format("The server log should contain a message at (about) %s, indicating that the call to the asynchronous bean completed.", + new Date(new Date().getTime() + sleepMillis))); // in AS7.1.1.Final there is a bug that an ERROR will be logged that the result can not be written // it will be solved in a later version } diff --git a/ejb-asynchronous/ejb/pom.xml b/ejb-asynchronous/ejb/pom.xml index 5b6d04cfc2..021b6b1aa4 100644 --- a/ejb-asynchronous/ejb/pom.xml +++ b/ejb-asynchronous/ejb/pom.xml @@ -37,7 +37,7 @@ http://www.apache.org/licenses/LICENSE-2.0.html - + @@ -64,7 +64,7 @@ - + org.wildfly.plugins diff --git a/ejb-asynchronous/ejb/src/main/java/org/jboss/as/quickstarts/ejb/asynchronous/ParallelAccessBean.java b/ejb-asynchronous/ejb/src/main/java/org/jboss/as/quickstarts/ejb/asynchronous/ParallelAccessBean.java index 13e24c7076..2c79641e7e 100644 --- a/ejb-asynchronous/ejb/src/main/java/org/jboss/as/quickstarts/ejb/asynchronous/ParallelAccessBean.java +++ b/ejb-asynchronous/ejb/src/main/java/org/jboss/as/quickstarts/ejb/asynchronous/ParallelAccessBean.java @@ -27,7 +27,6 @@ import javax.ejb.EJB; import javax.ejb.Stateless; - /** * Stateless session bean implementation to demonstrate how to invoke asynchronous methods to parallelize different actions to * minimize the duration time of client invocation. diff --git a/ejb-asynchronous/pom.xml b/ejb-asynchronous/pom.xml index d5e7d24f87..cd6b87ffa3 100644 --- a/ejb-asynchronous/pom.xml +++ b/ejb-asynchronous/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,9 +90,9 @@ - - UTF-8 @@ -133,7 +133,7 @@ import - org.jboss.quickstarts.eap diff --git a/ejb-in-ear/ear/pom.xml b/ejb-in-ear/ear/pom.xml index 644008488c..023f3d914e 100644 --- a/ejb-in-ear/ear/pom.xml +++ b/ejb-in-ear/ear/pom.xml @@ -69,12 +69,12 @@ 6 - lib - diff --git a/ejb-in-ear/ejb/pom.xml b/ejb-in-ear/ejb/pom.xml index 8ac6a4b5a8..070c8174db 100644 --- a/ejb-in-ear/ejb/pom.xml +++ b/ejb-in-ear/ejb/pom.xml @@ -40,7 +40,7 @@ http://www.apache.org/licenses/LICENSE-2.0.html - + diff --git a/ejb-in-ear/ejb/src/main/java/META-INF/beans.xml b/ejb-in-ear/ejb/src/main/java/META-INF/beans.xml index 6a7b5b81a1..642bf1e10e 100644 --- a/ejb-in-ear/ejb/src/main/java/META-INF/beans.xml +++ b/ejb-in-ear/ejb/src/main/java/META-INF/beans.xml @@ -18,6 +18,6 @@ diff --git a/ejb-in-ear/pom.xml b/ejb-in-ear/pom.xml index 218b13b453..ed489c52ba 100644 --- a/ejb-in-ear/pom.xml +++ b/ejb-in-ear/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -119,7 +119,7 @@ - org.jboss.quickstarts.eap @@ -127,8 +127,8 @@ ${project.version} ejb - - org.jboss.quickstarts.eap @@ -156,8 +156,8 @@ - org.wildfly.plugins diff --git a/ejb-in-ear/web/pom.xml b/ejb-in-ear/web/pom.xml index 927d2f23cc..9498ac00eb 100644 --- a/ejb-in-ear/web/pom.xml +++ b/ejb-in-ear/web/pom.xml @@ -42,7 +42,7 @@ http://www.apache.org/licenses/LICENSE-2.0.html - + diff --git a/ejb-in-ear/web/src/main/webapp/WEB-INF/beans.xml b/ejb-in-ear/web/src/main/webapp/WEB-INF/beans.xml index 6a7b5b81a1..642bf1e10e 100644 --- a/ejb-in-ear/web/src/main/webapp/WEB-INF/beans.xml +++ b/ejb-in-ear/web/src/main/webapp/WEB-INF/beans.xml @@ -18,6 +18,6 @@ diff --git a/ejb-in-war/pom.xml b/ejb-in-war/pom.xml index 5ac2714378..ac79f9eab4 100644 --- a/ejb-in-war/pom.xml +++ b/ejb-in-war/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,12 +91,12 @@ - UTF-8 - + 1.0.2.Final @@ -113,14 +113,14 @@ - - org.jboss.bom @@ -141,7 +141,7 @@ provided - org.jboss.spec.javax.annotation @@ -179,7 +179,7 @@ - ${project.artifactId} @@ -187,7 +187,7 @@ maven-war-plugin ${version.war.plugin} - false @@ -203,9 +203,9 @@ - - default @@ -224,9 +224,9 @@ - - arq-wildfly-managed @@ -239,7 +239,7 @@ - arq-wildfly-remote diff --git a/ejb-in-war/src/main/webapp/WEB-INF/beans.xml b/ejb-in-war/src/main/webapp/WEB-INF/beans.xml index 955868d46a..460d1cf31b 100644 --- a/ejb-in-war/src/main/webapp/WEB-INF/beans.xml +++ b/ejb-in-war/src/main/webapp/WEB-INF/beans.xml @@ -19,6 +19,6 @@ diff --git a/ejb-in-war/src/main/webapp/WEB-INF/faces-config.xml b/ejb-in-war/src/main/webapp/WEB-INF/faces-config.xml index a745c52343..40ec16100c 100644 --- a/ejb-in-war/src/main/webapp/WEB-INF/faces-config.xml +++ b/ejb-in-war/src/main/webapp/WEB-INF/faces-config.xml @@ -23,5 +23,5 @@ xsi:schemaLocation=" http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"> - + diff --git a/ejb-in-war/src/test/java/org/jboss/as/quickstarts/ejbinwar/test/GreeterEJBTest.java b/ejb-in-war/src/test/java/org/jboss/as/quickstarts/ejbinwar/test/GreeterEJBTest.java index 9d6bcd7e3f..71ecaf8592 100644 --- a/ejb-in-war/src/test/java/org/jboss/as/quickstarts/ejbinwar/test/GreeterEJBTest.java +++ b/ejb-in-war/src/test/java/org/jboss/as/quickstarts/ejbinwar/test/GreeterEJBTest.java @@ -41,7 +41,7 @@ public class GreeterEJBTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class, "test.jar").addClasses(GreeterEJB.class) - .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")); + .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")); } @EJB diff --git a/ejb-in-war/src/test/java/org/jboss/as/quickstarts/ejbinwar/test/GreeterTest.java b/ejb-in-war/src/test/java/org/jboss/as/quickstarts/ejbinwar/test/GreeterTest.java index 8fa37f06af..a9e57f6074 100644 --- a/ejb-in-war/src/test/java/org/jboss/as/quickstarts/ejbinwar/test/GreeterTest.java +++ b/ejb-in-war/src/test/java/org/jboss/as/quickstarts/ejbinwar/test/GreeterTest.java @@ -42,7 +42,7 @@ public class GreeterTest { @Deployment public static JavaArchive createTestArchive() { return ShrinkWrap.create(JavaArchive.class, "test.jar").addClasses(Greeter.class, GreeterEJB.class) - .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")); + .addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")); } @Inject diff --git a/ejb-multi-server/app-main/ear/pom.xml b/ejb-multi-server/app-main/ear/pom.xml index 75e82faa7e..7f96c5ee09 100644 --- a/ejb-multi-server/app-main/ear/pom.xml +++ b/ejb-multi-server/app-main/ear/pom.xml @@ -47,7 +47,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/ejb-multi-server/app-main/ear/src/main/application/META-INF/jboss-ejb-client.xml b/ejb-multi-server/app-main/ear/src/main/application/META-INF/jboss-ejb-client.xml index 67591e2c8f..0b78ca6158 100644 --- a/ejb-multi-server/app-main/ear/src/main/application/META-INF/jboss-ejb-client.xml +++ b/ejb-multi-server/app-main/ear/src/main/application/META-INF/jboss-ejb-client.xml @@ -22,7 +22,7 @@ - + diff --git a/ejb-multi-server/app-main/ejb/pom.xml b/ejb-multi-server/app-main/ejb/pom.xml index 40b57c061e..dabe1051eb 100644 --- a/ejb-multi-server/app-main/ejb/pom.xml +++ b/ejb-multi-server/app-main/ejb/pom.xml @@ -44,7 +44,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainApp.java b/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainApp.java index e8ff884129..309b678af6 100644 --- a/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainApp.java +++ b/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainApp.java @@ -21,12 +21,12 @@ @Remote public interface MainApp { - /** - * Invoke the sub applications with the recommended lookup names. Return informations about the called beans. - * - * @param text This text will be logged in the main-application - * @return A simple text representation of the call stack and the destination servers - */ + /** + * Invoke the sub applications with the recommended lookup names. Return informations about the called beans. + * + * @param text This text will be logged in the main-application + * @return A simple text representation of the call stack and the destination servers + */ String invokeAll(String text); String getJBossNodeName(); diff --git a/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppBean.java b/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppBean.java index 69c0e41e96..990909dae3 100644 --- a/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppBean.java +++ b/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppBean.java @@ -43,9 +43,9 @@ public class MainAppBean implements MainApp { @Resource SessionContext context; - /** - * The context to invoke foreign EJB's as the SessionContext can not be used for that. - */ + /** + * The context to invoke foreign EJB's as the SessionContext can not be used for that. + */ private InitialContext iCtx; @EJB(lookup = "ejb:jboss-ejb-multi-server-app-one/ejb//AppOneBean!org.jboss.as.quickstarts.ejb.multi.server.app.AppOne") @@ -53,16 +53,16 @@ public class MainAppBean implements MainApp { @EJB(lookup = "ejb:jboss-ejb-multi-server-app-two/ejb//AppTwoBean!org.jboss.as.quickstarts.ejb.multi.server.app.AppTwo") AppTwo appTwoProxy; - /** - * Initialize and store the context for the EJB invocations. - */ + /** + * Initialize and store the context for the EJB invocations. + */ @PostConstruct public void init() { try { final Hashtable p = new Hashtable<>(); p.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming"); this.iCtx = new InitialContext(p); - }catch (NamingException e) { + } catch (NamingException e) { throw new RuntimeException("Could not initialize context", e); } } @@ -78,20 +78,20 @@ public String invokeAll(String text) { LOGGER.info("[" + caller.getName() + "] " + text); final StringBuilder result = new StringBuilder("MainApp[" + caller.getName() + "]@" + System.getProperty("jboss.node.name")); - // Call AppOne with the direct ejb: naming + // Call AppOne with the direct ejb: naming try { result.append(" > [ " + invokeAppOne(text)); - }catch (Exception e) { + } catch (Exception e) { LOGGER.error("Could not invoke AppOne", e); } String lookup = ""; - // Call AppTwo with the direct ejb: naming + // Call AppTwo with the direct ejb: naming try { lookup = "ejb:jboss-ejb-multi-server-app-two/ejb//AppTwoBean!" + AppTwo.class.getName(); result.append(" > " + invokeAppTwo(lookup, text)); LOGGER.info("Invoke '" + lookup + " OK"); - }catch (Exception e) { + } catch (Exception e) { LOGGER.error("Could not invoke apptwo '" + lookup + "'", e); } @@ -101,7 +101,7 @@ public String invokeAll(String text) { lookup = "java:comp/env/AppTwoAlias"; result.append(" ; " + invokeAppTwo(lookup, text)); LOGGER.info("Invoke '" + lookup + " OK"); - }catch (Exception e) { + } catch (Exception e) { LOGGER.error("Could not invoke apptwo '" + lookup + "'", e); } @@ -110,7 +110,7 @@ public String invokeAll(String text) { return result.toString(); } - /** + /** * The application one can only be called with the standard naming, there is * no alias. * @@ -125,27 +125,27 @@ private String invokeAppOne(String text) { LOGGER.info("AppOne return : " + appOneResult); return appOneResult; - }catch (Exception e) { + } catch (Exception e) { throw new RuntimeException("Could not invoke appOne", e); } } /** - * The application two can be called via lookup. - *
    - *
  • with the standard naming - * ejb:jboss-ejb-multi-server-app-two/ejb//AppTwoBean!org.jboss.as.quickstarts - * .ejb.multi.server.app.AppTwo
    • - *
  • java:global/AliasAppTwo the alias provided by the server - * configuration this is not recommended
    • - *
  • java:comp/env/AppTwoAlias the local alias provided by the - * ejb-jar.xml configuration
    • - *
- * - * @param text - * Simple text for logging in the target servers logfile - * @return A text with server details for demonstration - */ + * The application two can be called via lookup. + *
    + *
  • with the standard naming + * ejb:jboss-ejb-multi-server-app-two/ejb//AppTwoBean!org.jboss.as.quickstarts + * .ejb.multi.server.app.AppTwo
    • + *
  • java:global/AliasAppTwo the alias provided by the server + * configuration this is not recommended
    • + *
  • java:comp/env/AppTwoAlias the local alias provided by the + * ejb-jar.xml configuration
    • + *
+ * + * @param text + * Simple text for logging in the target servers logfile + * @return A text with server details for demonstration + */ private String invokeAppTwo(String lookup, String text) throws NamingException { final AppTwo bean = (AppTwo) iCtx.lookup(lookup); diff --git a/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppSContextBean.java b/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppSContextBean.java index abb84b05fc..9e5bf65e5e 100644 --- a/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppSContextBean.java +++ b/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppSContextBean.java @@ -65,7 +65,7 @@ private void createAppOneContext() { ejbClientContextProps.put("org.jboss.ejb.client.scoped.context", true); // Property which will handle the ejb: namespace during JNDI lookup ejbClientContextProps.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming"); - ejbClientContextProps.put("remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED","false"); + ejbClientContextProps.put("remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED", "false"); // add a property which lists the connections that we are configuring. // In this example, we are just configuring a single connection. final String connectionName = "appOneConnection"; @@ -80,8 +80,10 @@ private void createAppOneContext() { ejbClientContextProps.put("remote.cluster.ejb.password", "quick+123"); try { - appOneScopedEjbContext = (Context)new InitialContext(ejbClientContextProps).lookup("ejb:"); - } catch (NamingException e) {LOGGER.error("Could not create InitialContext('appOne')", e);} + appOneScopedEjbContext = (Context) new InitialContext(ejbClientContextProps).lookup("ejb:"); + } catch (NamingException e) { + LOGGER.error("Could not create InitialContext('appOne')", e); + } } private void createAppTwoContext() { @@ -104,7 +106,9 @@ private void createAppTwoContext() { try { appTwoScopedEjbContextA = (Context) new InitialContext(ejbClientContextProps).lookup("ejb:"); - } catch (NamingException e) {LOGGER.error("Could not create InitialContext('appTwoA')", e);} + } catch (NamingException e) { + LOGGER.error("Could not create InitialContext('appTwoA')", e); + } // change the necessary properties to call the other server ejbClientContextProps.put("endpoint.name", "appMain->appTwoB_endpoint"); @@ -114,13 +118,15 @@ private void createAppTwoContext() { try { appTwoScopedEjbContextB = (Context) new InitialContext(ejbClientContextProps).lookup("ejb:"); - } catch (NamingException e) {LOGGER.error("Could not create InitialContext('appTwoB')", e);} + } catch (NamingException e) { + LOGGER.error("Could not create InitialContext('appTwoB')", e); + } } @PostConstruct private void createScopedContext() { synchronized (activeInstances) { - if(activeInstances == 0) { + if (activeInstances == 0) { LOGGER.info("First instance of " + this.getClass().getSimpleName() + " initializing scoped-context"); createAppOneContext(); createAppTwoContext(); @@ -133,7 +139,7 @@ private void createScopedContext() { private void destroyScopedContext() { synchronized (activeInstances) { activeInstances--; - if(activeInstances == 0) { + if (activeInstances == 0) { LOGGER.info("Last active instance of " + this.getClass().getSimpleName() + " closing scoped-context"); try { appOneScopedEjbContext.close(); @@ -166,7 +172,7 @@ public String getJBossNodeName() { public String invokeAll(String text) { Principal caller = context.getCallerPrincipal(); LOGGER.info("[" + caller.getName() + "] " + text); - final StringBuilder result = new StringBuilder("MainAppSContext["+ caller.getName() + "]@" + getJBossNodeName()); + final StringBuilder result = new StringBuilder("MainAppSContext[" + caller.getName() + "]@" + getJBossNodeName()); // Call AppOne with the direct ejb: naming try { result.append(" > [ " + invokeAppOne(text)); @@ -181,7 +187,7 @@ public String invokeAll(String text) { return result.toString(); } - /** + /** * Invoke the AppOne with the scoped client context. The initial connection * will use the 'quickuser1', to differentiate the cluster connection it * will be use the user 'quickuser2' to see if the clustered context is used @@ -193,9 +199,9 @@ public String invokeAll(String text) { */ private String invokeAppOne(String text) { try { - // this context will not use the server configured - // 'outbound-connection' and also did not use the - // jboss-ejb-client.xml. + // this context will not use the server configured + // 'outbound-connection' and also did not use the + // jboss-ejb-client.xml. final AppOne bean = (AppOne) appOneScopedEjbContext.lookup("jboss-ejb-multi-server-app-one/ejb//AppOneBean!" + AppOne.class.getName()); StringBuilder result = new StringBuilder("{"); @@ -219,15 +225,15 @@ private String invokeAppOne(String text) { } /** - * Close the given context and write a log message which endpoint is closed. - * - * @param iCtx - * context to close, null will be ignored. - */ + * Close the given context and write a log message which endpoint is closed. + * + * @param iCtx + * context to close, null will be ignored. + */ private static void saveContextClose(Context iCtx) { if (iCtx != null) { try { - LOGGER.info("close Context "+ iCtx.getEnvironment().get("endpoint.name")); + LOGGER.info("close Context " + iCtx.getEnvironment().get("endpoint.name")); iCtx.close(); } catch (NamingException e) { @@ -237,22 +243,24 @@ private static void saveContextClose(Context iCtx) { } /** - * Invoke the App2 with different ejb-client context. The server AppTwoA - * will be called with the user quickuser1. The server AppTwoB will be - * called with the user quickuser2. Both invocations are separate, there - * will no mix between. Also the outbound-connection is not used. - * - * @param text - * Simple text which will be logged at server side. - * @return simple collection of the returned results - */ + * Invoke the App2 with different ejb-client context. The server AppTwoA + * will be called with the user quickuser1. The server AppTwoB will be + * called with the user quickuser2. Both invocations are separate, there + * will no mix between. Also the outbound-connection is not used. + * + * @param text + * Simple text which will be logged at server side. + * @return simple collection of the returned results + */ private String invokeAppTwo(String text) { AppTwo beanA = null; AppTwo beanB = null; try { beanA = (AppTwo) appTwoScopedEjbContextA.lookup("jboss-ejb-multi-server-app-two/ejb//AppTwoBean!" + AppTwo.class.getName()); - } catch (NamingException e) {LOGGER.error("Could not create InitialContext('appTwoA')");} + } catch (NamingException e) { + LOGGER.error("Could not create InitialContext('appTwoA')"); + } try { beanB = (AppTwo) appTwoScopedEjbContextB.lookup("jboss-ejb-multi-server-app-two/ejb//AppTwoBean!" + AppTwo.class.getName()); @@ -280,18 +288,18 @@ private String invokeAppTwo(String text) { } /** - * Same method as {@link #invokeAppTwo(String)}, but the scoped context is created and destroyed - * inside the method. Because of this it is not possbile to use the transaction managed by the container - * as the connection must be open until the container send commit/rollback to the foreign server. - * Therefore it is necessary to add the annotation @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) - * to the {@link #invokeAll(String)} method. - * - * For test you might rename this method. - * - * @param text - * Simple text which will be logged at server side. - * @return simple collection of the returned results - */ + * Same method as {@link #invokeAppTwo(String)}, but the scoped context is created and destroyed + * inside the method. Because of this it is not possbile to use the transaction managed by the container + * as the connection must be open until the container send commit/rollback to the foreign server. + * Therefore it is necessary to add the annotation @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) + * to the {@link #invokeAll(String)} method. + * + * For test you might rename this method. + * + * @param text + * Simple text which will be logged at server side. + * @return simple collection of the returned results + */ @SuppressWarnings("unused") private String invokeAppTwoAlternative(String text) { AppTwo beanA = null; @@ -318,7 +326,9 @@ private String invokeAppTwoAlternative(String text) { try { iCtxA = (Context) new InitialContext(ejbClientContextProps).lookup("ejb:"); beanA = (AppTwo) iCtxA.lookup("jboss-ejb-multi-server-app-two/ejb//AppTwoBean!" + AppTwo.class.getName()); - } catch (NamingException e) {LOGGER.error("Could not create InitialContext('appTwoA')");} + } catch (NamingException e) { + LOGGER.error("Could not create InitialContext('appTwoA')"); + } // change the necessary properties to call the other server ejbClientContextProps.put("endpoint.name", "appMain->appTwoB_endpoint"); diff --git a/ejb-multi-server/app-main/web/pom.xml b/ejb-multi-server/app-main/web/pom.xml index 2471a62ab5..4f0cbfd2a3 100644 --- a/ejb-multi-server/app-main/web/pom.xml +++ b/ejb-multi-server/app-main/web/pom.xml @@ -44,7 +44,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -149,7 +149,7 @@ copy - diff --git a/ejb-multi-server/app-main/web/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/JsfController.java b/ejb-multi-server/app-main/web/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/JsfController.java index 3e96428859..a80d02c25c 100644 --- a/ejb-multi-server/app-main/web/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/JsfController.java +++ b/ejb-multi-server/app-main/web/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/JsfController.java @@ -35,43 +35,43 @@ public class JsfController { private static final Logger LOOGER = Logger.getLogger(JsfController.class); private EjbInvocation invocation; - /** - * Inject the 'standard' bean.
- * The simple @EJB injection is valid only if the MainApp is unique within the same application EAR archive. - * Since there is a MainAppSContextBean using same interface, we can use this @EJB approach and specify - * the name and interface as shown here to specify which exact reference should be injected.
- * The beanInterface and the mappedName can be used in this case, but it is not necessary if the beanName is unique and implement only one interface. - */ + /** + * Inject the 'standard' bean.
+ * The simple @EJB injection is valid only if the MainApp is unique within the same application EAR archive. + * Since there is a MainAppSContextBean using same interface, we can use this @EJB approach and specify + * the name and interface as shown here to specify which exact reference should be injected.
+ * The beanInterface and the mappedName can be used in this case, but it is not necessary if the beanName is unique and implement only one interface. + */ @EJB(beanName = "MainAppBean", beanInterface = MainApp.class) MainApp mainApp; - /** - * Inject a different bean implementation of the same interface.
- * Or use the @Resource annotation with the lookup name only. - */ + /** + * Inject a different bean implementation of the same interface.
+ * Or use the @Resource annotation with the lookup name only. + */ @Resource(mappedName = "ejb:jboss-ejb-multi-server-app-main/ejb/MainAppSContextBean!org.jboss.as.quickstarts.ejb.multi.server.app.MainApp") MainApp mainAppScopedContext; - /** - * Injection with @EJB is not possible for foreign application in a different server. For this we can use @Resource.
- * Lookup is introduced in Java EE6, so there are compiler or runtime problems if a Java version is used which not contain - * the javax.annotation.Resource lookup. - * Therefore a fix/workaround is necessary to be able to compile. - * See Jaikiran's technical blog - */ + /** + * Injection with @EJB is not possible for foreign application in a different server. For this we can use @Resource.
+ * Lookup is introduced in Java EE6, so there are compiler or runtime problems if a Java version is used which not contain + * the javax.annotation.Resource lookup. + * Therefore a fix/workaround is necessary to be able to compile. + * See Jaikiran's technical blog + */ @Resource(lookup = "ejb:jboss-ejb-multi-server-app-one/ejb//AppOneBean!org.jboss.as.quickstarts.ejb.multi.server.app.AppOne") AppOne oneApp; - /** - * Injection with @EJB is not possible for a foreign application in a different server. For this we can use @Resource. - * Here, we use mappedName, which was available prior to Java EE 7, to avoid compilation errors. - */ + /** + * Injection with @EJB is not possible for a foreign application in a different server. For this we can use @Resource. + * Here, we use mappedName, which was available prior to Java EE 7, to avoid compilation errors. + */ @Resource(mappedName = "ejb:jboss-ejb-multi-server-app-two/ejb//AppTwoBean!org.jboss.as.quickstarts.ejb.multi.server.app.AppTwo") AppTwo twoApp; - /** - * Initialize the controller. - */ + /** + * Initialize the controller. + */ @PostConstruct public void initForm() { this.invocation = new EjbInvocation(); diff --git a/ejb-multi-server/app-main/web/src/main/webapp/WEB-INF/beans.xml b/ejb-multi-server/app-main/web/src/main/webapp/WEB-INF/beans.xml index 6a7b5b81a1..642bf1e10e 100644 --- a/ejb-multi-server/app-main/web/src/main/webapp/WEB-INF/beans.xml +++ b/ejb-multi-server/app-main/web/src/main/webapp/WEB-INF/beans.xml @@ -18,6 +18,6 @@ diff --git a/ejb-multi-server/app-one/ear/pom.xml b/ejb-multi-server/app-one/ear/pom.xml index 920adee3dc..8b25c4640e 100644 --- a/ejb-multi-server/app-one/ear/pom.xml +++ b/ejb-multi-server/app-one/ear/pom.xml @@ -43,7 +43,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -117,7 +117,7 @@ A simple quickstart application to demonstrate the server-server communication 6 - true diff --git a/ejb-multi-server/app-one/ejb/pom.xml b/ejb-multi-server/app-one/ejb/pom.xml index 41dcd3b3a7..7e7ed6461c 100644 --- a/ejb-multi-server/app-one/ejb/pom.xml +++ b/ejb-multi-server/app-one/ejb/pom.xml @@ -44,7 +44,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/ejb-multi-server/app-one/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppOne.java b/ejb-multi-server/app-one/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppOne.java index 65e31119f7..7a8391154e 100644 --- a/ejb-multi-server/app-one/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppOne.java +++ b/ejb-multi-server/app-one/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppOne.java @@ -26,24 +26,24 @@ @Remote public interface AppOne { - /** - * Unsecured invocation, will return the name of application, principal and JBoss node. - * - * @param text Simple text written to to the logfile to identify the invocation - * @return app1[<PrincipalName>]@<jboss.node.name> - */ + /** + * Unsecured invocation, will return the name of application, principal and JBoss node. + * + * @param text Simple text written to to the logfile to identify the invocation + * @return app1[<PrincipalName>]@<jboss.node.name> + */ String invoke(String text); - /** - * @return The property of jboss.node.name, pattern <host>:<server> - */ + /** + * @return The property of jboss.node.name, pattern <host>:<server> + */ String getJBossNodeName(); - /** - * Secured invocation for Roles ( AppOne, Intern ). See {@link #invoke(String)} - * - * @param text Simple text written to to the logfile to identify the invocation - * @return app1[<PrincipalName>]@<jboss.node.name> - */ + /** + * Secured invocation for Roles ( AppOne, Intern ). See {@link #invoke(String)} + * + * @param text Simple text written to to the logfile to identify the invocation + * @return app1[<PrincipalName>]@<jboss.node.name> + */ String invokeSecured(String text); } diff --git a/ejb-multi-server/app-two/ear/pom.xml b/ejb-multi-server/app-two/ear/pom.xml index 920bedcd45..fe2f5574eb 100644 --- a/ejb-multi-server/app-two/ear/pom.xml +++ b/ejb-multi-server/app-two/ear/pom.xml @@ -43,7 +43,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -117,7 +117,7 @@ A simple quickstart application to demonstrate the server-server communication 6 - true diff --git a/ejb-multi-server/app-two/ejb/pom.xml b/ejb-multi-server/app-two/ejb/pom.xml index 9c5845653b..33382987dd 100644 --- a/ejb-multi-server/app-two/ejb/pom.xml +++ b/ejb-multi-server/app-two/ejb/pom.xml @@ -44,7 +44,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/ejb-multi-server/app-two/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppTwo.java b/ejb-multi-server/app-two/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppTwo.java index 975f08caca..b06faf5444 100644 --- a/ejb-multi-server/app-two/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppTwo.java +++ b/ejb-multi-server/app-two/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppTwo.java @@ -26,25 +26,25 @@ @Remote public interface AppTwo { - /** - * Unsecured invocation, will return the name of application, principal and JBoss node. - * - * @param text Simple text written to to the logfile to identify the invocation - * @return app1[<PrincipalName>]@<jboss.node.name> - */ + /** + * Unsecured invocation, will return the name of application, principal and JBoss node. + * + * @param text Simple text written to to the logfile to identify the invocation + * @return app1[<PrincipalName>]@<jboss.node.name> + */ String invoke(String text); - /** - * @return The property of jboss.node.name, pattern <host>:<server> - */ + /** + * @return The property of jboss.node.name, pattern <host>:<server> + */ String getJBossNodeName(); - /** - * Secured invocation for Roles ( AppTwo, Intern ). See {@link #invoke(String)} - * - * @param text Simple text written to to the logfile to identify the invocation - * @return app1[<PrincipalName>]@<jboss.node.name> - */ + /** + * Secured invocation for Roles ( AppTwo, Intern ). See {@link #invoke(String)} + * + * @param text Simple text written to to the logfile to identify the invocation + * @return app1[<PrincipalName>]@<jboss.node.name> + */ String invokeSecured(String text); } diff --git a/ejb-multi-server/app-two/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppTwoBean.java b/ejb-multi-server/app-two/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppTwoBean.java index 9222e7a0f4..7774e82d45 100644 --- a/ejb-multi-server/app-two/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppTwoBean.java +++ b/ejb-multi-server/app-two/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppTwoBean.java @@ -33,7 +33,8 @@ * @author Wolf-Dieter Fink */ @SecurityDomain(value = "other") -public @Stateless class AppTwoBean implements AppTwo { +public @Stateless +class AppTwoBean implements AppTwo { private static final Logger LOGGER = Logger.getLogger(AppTwoBean.class); @Resource diff --git a/ejb-multi-server/app-web/pom.xml b/ejb-multi-server/app-web/pom.xml index 7fe8bd5051..8f61e0ffaa 100644 --- a/ejb-multi-server/app-web/pom.xml +++ b/ejb-multi-server/app-web/pom.xml @@ -49,7 +49,7 @@ provided ${project.groupId} diff --git a/ejb-multi-server/client/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/Client.java b/ejb-multi-server/client/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/Client.java index c69046e0fe..5a0cc6c5f3 100644 --- a/ejb-multi-server/client/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/Client.java +++ b/ejb-multi-server/client/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/Client.java @@ -71,9 +71,9 @@ public static void main(String[] args) throws Exception { final boolean useScopedExample = Boolean.getBoolean("UseScopedContext"); final String rcal = "ejb:jboss-ejb-multi-server-app-main/ejb//" + (useScopedExample ? "MainAppSContextBean" : "MainAppBean") + "!" + MainApp.class.getName(); final MainApp remote = (MainApp) context.lookup(rcal); - final String result = remote.invokeAll("Client call at "+new Date()); + final String result = remote.invokeAll("Client call at " + new Date()); - System.out.println("InvokeAll succeed: "+result); + System.out.println("InvokeAll succeed: " + result); } } diff --git a/ejb-multi-server/pom.xml b/ejb-multi-server/pom.xml index 507985df9d..b21e1619c9 100644 --- a/ejb-multi-server/pom.xml +++ b/ejb-multi-server/pom.xml @@ -43,7 +43,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -92,9 +92,9 @@ - - UTF-8 @@ -106,7 +106,7 @@ 2.0.3.Final - + 3.1 diff --git a/ejb-remote/client/pom.xml b/ejb-remote/client/pom.xml index 09bf970efc..93438ceb85 100644 --- a/ejb-remote/client/pom.xml +++ b/ejb-remote/client/pom.xml @@ -40,9 +40,9 @@ - - UTF-8 @@ -81,7 +81,7 @@ - org.jboss.spec.javax.transaction @@ -89,7 +89,7 @@ runtime - org.jboss.spec.javax.ejb @@ -119,7 +119,7 @@ ${project.artifactId} - org.codehaus.mojo @@ -136,7 +136,7 @@ java ${project.build.directory}/exec-working-directory - -classpath @@ -160,9 +160,9 @@ - - org.wildfly.plugins diff --git a/ejb-remote/client/src/main/java/org/jboss/as/quickstarts/ejb/remote/client/RemoteEJBClient.java b/ejb-remote/client/src/main/java/org/jboss/as/quickstarts/ejb/remote/client/RemoteEJBClient.java index 3256ddb8ab..6a0739f7b5 100644 --- a/ejb-remote/client/src/main/java/org/jboss/as/quickstarts/ejb/remote/client/RemoteEJBClient.java +++ b/ejb-remote/client/src/main/java/org/jboss/as/quickstarts/ejb/remote/client/RemoteEJBClient.java @@ -58,18 +58,18 @@ private static void invokeStatelessBean() throws NamingException { System.out.println("Remote calculator returned sum = " + sum); if (sum != a + b) { throw new RuntimeException("Remote stateless calculator returned an incorrect sum " + sum + " ,expected sum was " - + (a + b)); + + (a + b)); } // try one more invocation, this time for subtraction int num1 = 3434; int num2 = 2332; System.out.println("Subtracting " + num2 + " from " + num1 - + " via the remote stateless calculator deployed on the server"); + + " via the remote stateless calculator deployed on the server"); int difference = statelessRemoteCalculator.subtract(num1, num2); System.out.println("Remote calculator returned difference = " + difference); if (difference != num1 - num2) { throw new RuntimeException("Remote stateless calculator returned an incorrect difference " + difference - + " ,expected difference was " + (num1 - num2)); + + " ,expected difference was " + (num1 - num2)); } } @@ -130,7 +130,7 @@ private static RemoteCalculator lookupRemoteStatelessCalculator() throws NamingE // let's do the lookup return (RemoteCalculator) context.lookup("ejb:/jboss-ejb-remote-server-side/CalculatorBean!" - + RemoteCalculator.class.getName()); + + RemoteCalculator.class.getName()); } /** @@ -164,6 +164,6 @@ private static RemoteCounter lookupRemoteStatefulCounter() throws NamingExceptio // let's do the lookup return (RemoteCounter) context.lookup("ejb:/jboss-ejb-remote-server-side/CounterBean!" - + RemoteCounter.class.getName() + "?stateful"); + + RemoteCounter.class.getName() + "?stateful"); } } diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml index d6c33d884d..914587aa74 100644 --- a/ejb-remote/pom.xml +++ b/ejb-remote/pom.xml @@ -39,7 +39,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -109,7 +109,7 @@ ${project.artifactId} - diff --git a/ejb-remote/server-side/pom.xml b/ejb-remote/server-side/pom.xml index 27ed09f90a..13025c4204 100644 --- a/ejb-remote/server-side/pom.xml +++ b/ejb-remote/server-side/pom.xml @@ -17,7 +17,7 @@ --> 4.0.0 - + org.jboss.quickstarts.eap jboss-ejb-remote-server-side 7.0.0-SNAPSHOT @@ -35,14 +35,14 @@ - UTF-8 - + 1.0.2.Final - + 1.0.3.Final @@ -56,9 +56,9 @@ - diff --git a/ejb-security-interceptors/pom.xml b/ejb-security-interceptors/pom.xml index 82d063d548..e516bf83d8 100644 --- a/ejb-security-interceptors/pom.xml +++ b/ejb-security-interceptors/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/ejb-security-interceptors/src/main/java/org/jboss/as/quickstarts/ejb_security_interceptors/ServerSecurityInterceptor.java b/ejb-security-interceptors/src/main/java/org/jboss/as/quickstarts/ejb_security_interceptors/ServerSecurityInterceptor.java index 5431a49363..db54a3174c 100644 --- a/ejb-security-interceptors/src/main/java/org/jboss/as/quickstarts/ejb_security_interceptors/ServerSecurityInterceptor.java +++ b/ejb-security-interceptors/src/main/java/org/jboss/as/quickstarts/ejb_security_interceptors/ServerSecurityInterceptor.java @@ -64,7 +64,6 @@ public Object aroundInvoke(final InvocationContext invocationContext) throws Exc } } - ContextStateCache stateCache = null; try { if (desiredUser != null && connectionUser != null @@ -85,7 +84,8 @@ public Object aroundInvoke(final InvocationContext invocationContext) throws Exc } finally { // switch back to original context if (stateCache != null) { - SecurityActions.popIdentity(stateCache);; + SecurityActions.popIdentity(stateCache); + ; } } } diff --git a/ejb-security-interceptors/src/main/resources/META-INF/beans.xml b/ejb-security-interceptors/src/main/resources/META-INF/beans.xml index 8c5ac6eaa9..4114ef5dc1 100644 --- a/ejb-security-interceptors/src/main/resources/META-INF/beans.xml +++ b/ejb-security-interceptors/src/main/resources/META-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - - \ No newline at end of file + diff --git a/ejb-security-interceptors/src/main/resources/META-INF/jboss-deployment-structure.xml b/ejb-security-interceptors/src/main/resources/META-INF/jboss-deployment-structure.xml index 7f05359741..6d2d142067 100644 --- a/ejb-security-interceptors/src/main/resources/META-INF/jboss-deployment-structure.xml +++ b/ejb-security-interceptors/src/main/resources/META-INF/jboss-deployment-structure.xml @@ -23,5 +23,5 @@ - - \ No newline at end of file + + diff --git a/ejb-security-interceptors/src/main/resources/META-INF/jboss-ejb-client.xml b/ejb-security-interceptors/src/main/resources/META-INF/jboss-ejb-client.xml index 932f2b13ab..e3d834f04a 100644 --- a/ejb-security-interceptors/src/main/resources/META-INF/jboss-ejb-client.xml +++ b/ejb-security-interceptors/src/main/resources/META-INF/jboss-ejb-client.xml @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/ejb-security-interceptors/src/main/resources/META-INF/jboss-ejb3.xml b/ejb-security-interceptors/src/main/resources/META-INF/jboss-ejb3.xml index 73ed0cb2ef..35241a7096 100644 --- a/ejb-security-interceptors/src/main/resources/META-INF/jboss-ejb3.xml +++ b/ejb-security-interceptors/src/main/resources/META-INF/jboss-ejb3.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/ejb-security/pom.xml b/ejb-security/pom.xml index 4edf838354..316680a5b5 100644 --- a/ejb-security/pom.xml +++ b/ejb-security/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,9 +90,9 @@ - - UTF-8 @@ -133,7 +133,7 @@ provided - org.jboss.spec.javax.annotation @@ -161,7 +161,7 @@ - ${project.artifactId} diff --git a/ejb-security/src/main/webapp/WEB-INF/beans.xml b/ejb-security/src/main/webapp/WEB-INF/beans.xml index 8c5ac6eaa9..4114ef5dc1 100644 --- a/ejb-security/src/main/webapp/WEB-INF/beans.xml +++ b/ejb-security/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - - \ No newline at end of file + diff --git a/ejb-security/src/main/webapp/WEB-INF/web.xml b/ejb-security/src/main/webapp/WEB-INF/web.xml index 6ccb7c9e63..bf4d4465c7 100644 --- a/ejb-security/src/main/webapp/WEB-INF/web.xml +++ b/ejb-security/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - diff --git a/ejb-throws-exception/ear/pom.xml b/ejb-throws-exception/ear/pom.xml index 0d006f6b30..dd919ada77 100644 --- a/ejb-throws-exception/ear/pom.xml +++ b/ejb-throws-exception/ear/pom.xml @@ -1,117 +1,117 @@ - - - - 4.0.0 - - - org.jboss.quickstarts.eap - jboss-ejb-throws-exception - 7.0.0-SNAPSHOT - - - jboss-ejb-throws-exception-ear - ear - - JBoss EAP Quickstart: ejb-throws-exception - ear - - http://www.jboss.org/products/eap - - - Apache License, Version 2.0 - repo - http://www.apache.org/licenses/LICENSE-2.0.html - - - - - - - - org.jboss.quickstarts.eap - jboss-ejb-throws-exception-web - war - - - org.jboss.quickstarts.eap - jboss-ejb-throws-exception-ejb - ejb - - - org.jboss.quickstarts.eap - jboss-ejb-throws-exception-ejb-api - - - - - ${project.parent.artifactId} - - - org.apache.maven.plugins - maven-ear-plugin - ${version.ear.plugin} - - - ${version.javaee} - - lib - no-version - - - - - - org.wildfly.plugins - wildfly-maven-plugin - - false - - - - - - - - - - - - openshift - - - - maven-ear-plugin - ${version.ear.plugin} - - deployments - - - - - - - - + + + + 4.0.0 + + + org.jboss.quickstarts.eap + jboss-ejb-throws-exception + 7.0.0-SNAPSHOT + + + jboss-ejb-throws-exception-ear + ear + + JBoss EAP Quickstart: ejb-throws-exception - ear + + http://www.jboss.org/products/eap + + + Apache License, Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0.html + + + + + + + + org.jboss.quickstarts.eap + jboss-ejb-throws-exception-web + war + + + org.jboss.quickstarts.eap + jboss-ejb-throws-exception-ejb + ejb + + + org.jboss.quickstarts.eap + jboss-ejb-throws-exception-ejb-api + + + + + ${project.parent.artifactId} + + + org.apache.maven.plugins + maven-ear-plugin + ${version.ear.plugin} + + + ${version.javaee} + + lib + no-version + + + + + + org.wildfly.plugins + wildfly-maven-plugin + + false + + + + + + + + + + + + openshift + + + + maven-ear-plugin + ${version.ear.plugin} + + deployments + + + + + + + + diff --git a/ejb-throws-exception/ejb/pom.xml b/ejb-throws-exception/ejb/pom.xml index e725777565..7a62e40931 100644 --- a/ejb-throws-exception/ejb/pom.xml +++ b/ejb-throws-exception/ejb/pom.xml @@ -1,102 +1,102 @@ - - - - 4.0.0 - - - jboss-ejb-throws-exception - org.jboss.quickstarts.eap - 7.0.0-SNAPSHOT - - - jboss-ejb-throws-exception-ejb - ejb - - JBoss EAP Quickstart: ejb-throws-exception - ejb - - http://www.jboss.org/products/eap - - - Apache License, Version 2.0 - repo - http://www.apache.org/licenses/LICENSE-2.0.html - - - - - - - - - - org.jboss.spec.javax.ejb - jboss-ejb-api_3.2_spec - provided - - - - - javax.enterprise - cdi-api - provided - - - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - provided - - - - - - - org.hibernate - hibernate-validator - provided - - - - org.jboss.quickstarts.eap - jboss-ejb-throws-exception-ejb-api - - - - - - ${project.artifactId} - - - - maven-ejb-plugin - ${version.ejb.plugin} - - - ${version.ejb} - - - - - - + + + + 4.0.0 + + + jboss-ejb-throws-exception + org.jboss.quickstarts.eap + 7.0.0-SNAPSHOT + + + jboss-ejb-throws-exception-ejb + ejb + + JBoss EAP Quickstart: ejb-throws-exception - ejb + + http://www.jboss.org/products/eap + + + Apache License, Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0.html + + + + + + + + + + org.jboss.spec.javax.ejb + jboss-ejb-api_3.2_spec + provided + + + + + javax.enterprise + cdi-api + provided + + + + + org.hibernate.javax.persistence + hibernate-jpa-2.1-api + provided + + + + + + + org.hibernate + hibernate-validator + provided + + + + org.jboss.quickstarts.eap + jboss-ejb-throws-exception-ejb-api + + + + + + ${project.artifactId} + + + + maven-ejb-plugin + ${version.ejb.plugin} + + + ${version.ejb} + + + + + + diff --git a/ejb-throws-exception/ejb/src/main/java/org/jboss/as/quickstarts/ear/ejb/GreeterEJB.java b/ejb-throws-exception/ejb/src/main/java/org/jboss/as/quickstarts/ear/ejb/GreeterEJB.java index 55e07553a0..fc7ea736e2 100644 --- a/ejb-throws-exception/ejb/src/main/java/org/jboss/as/quickstarts/ear/ejb/GreeterEJB.java +++ b/ejb-throws-exception/ejb/src/main/java/org/jboss/as/quickstarts/ear/ejb/GreeterEJB.java @@ -35,7 +35,7 @@ public GreeterEJB() { public String sayHello(String name) throws GreeterException { - if(name == null || name.equals("")) + if (name == null || name.equals("")) throw new GreeterException("name cannot be null or empty"); return "Hello " + name; diff --git a/ejb-throws-exception/ejb/src/main/resources/META-INF/beans.xml b/ejb-throws-exception/ejb/src/main/resources/META-INF/beans.xml index 792d07e7cd..293f71a853 100644 --- a/ejb-throws-exception/ejb/src/main/resources/META-INF/beans.xml +++ b/ejb-throws-exception/ejb/src/main/resources/META-INF/beans.xml @@ -17,6 +17,6 @@ --> diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml index fbbefb0083..a0c9bd203d 100644 --- a/ejb-throws-exception/pom.xml +++ b/ejb-throws-exception/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,10 +91,10 @@ UTF-8 - - 7.0.0-build-7 @@ -129,7 +129,7 @@ - org.jboss.quickstarts.eap @@ -138,7 +138,7 @@ ejb - org.jboss.quickstarts.eap @@ -148,7 +148,7 @@ compile - org.jboss.quickstarts.eap @@ -156,11 +156,11 @@ ${project.version} - org.jboss.bom @@ -176,8 +176,8 @@ - org.wildfly.plugins diff --git a/ejb-throws-exception/web/pom.xml b/ejb-throws-exception/web/pom.xml index 549e3f6420..a83f9d68e2 100644 --- a/ejb-throws-exception/web/pom.xml +++ b/ejb-throws-exception/web/pom.xml @@ -1,100 +1,100 @@ - - - - 4.0.0 - - - org.jboss.quickstarts.eap - jboss-ejb-throws-exception - 7.0.0-SNAPSHOT - - - jboss-ejb-throws-exception-web - war - - JBoss EAP Quickstart: ejb-throws-exception - web - - http://www.jboss.org/products/eap - - - Apache License, Version 2.0 - repo - http://www.apache.org/licenses/LICENSE-2.0.html - - - - - - - - org.jboss.quickstarts.eap - jboss-ejb-throws-exception-ejb - ejb - provided - - - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.0_spec - provided - - - - - javax.enterprise - cdi-api - provided - - - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - provided - - - - org.jboss.spec.javax.ejb - jboss-ejb-api_3.2_spec - provided - - - - - ${project.artifactId} - - - - maven-war-plugin - ${version.war.plugin} - - - false - - - - - - + + + + 4.0.0 + + + org.jboss.quickstarts.eap + jboss-ejb-throws-exception + 7.0.0-SNAPSHOT + + + jboss-ejb-throws-exception-web + war + + JBoss EAP Quickstart: ejb-throws-exception - web + + http://www.jboss.org/products/eap + + + Apache License, Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0.html + + + + + + + + org.jboss.quickstarts.eap + jboss-ejb-throws-exception-ejb + ejb + provided + + + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.0_spec + provided + + + + + javax.enterprise + cdi-api + provided + + + + + org.hibernate.javax.persistence + hibernate-jpa-2.1-api + provided + + + + org.jboss.spec.javax.ejb + jboss-ejb-api_3.2_spec + provided + + + + + ${project.artifactId} + + + + maven-war-plugin + ${version.war.plugin} + + + false + + + + + + diff --git a/ejb-throws-exception/web/src/main/java/org/jboss/as/quickstarts/ear/controller/GreeterBean.java b/ejb-throws-exception/web/src/main/java/org/jboss/as/quickstarts/ear/controller/GreeterBean.java index 50b4994f0e..f0c124ddb9 100644 --- a/ejb-throws-exception/web/src/main/java/org/jboss/as/quickstarts/ear/controller/GreeterBean.java +++ b/ejb-throws-exception/web/src/main/java/org/jboss/as/quickstarts/ear/controller/GreeterBean.java @@ -23,7 +23,6 @@ import org.jboss.as.quickstarts.ear.client.GreeterEJBLocal; import org.jboss.as.quickstarts.ear.client.GreeterException; - /** * @author bmaxwell * @@ -35,7 +34,8 @@ public class GreeterBean { /* Inject the Local interface of the GreeterEJB so we can invoke sayHello */ - private @EJB GreeterEJBLocal greeterEJB; + private @EJB + GreeterEJBLocal greeterEJB; /* An instance variable to hold the data bound in the inputText of the JSF page */ private String name; @@ -81,12 +81,10 @@ public String sayHello() { try { response = greeterEJB.sayHello(name); - } - catch(GreeterException e) { + } catch (GreeterException e) { response = "Error: " + e.getMessage(); } return ""; } - } diff --git a/ejb-throws-exception/web/src/main/webapp/WEB-INF/beans.xml b/ejb-throws-exception/web/src/main/webapp/WEB-INF/beans.xml index 7f366005b0..3c35906d3d 100644 --- a/ejb-throws-exception/web/src/main/webapp/WEB-INF/beans.xml +++ b/ejb-throws-exception/web/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml index 710cbf1f18..acfe19b12b 100644 --- a/ejb-timer/pom.xml +++ b/ejb-timer/pom.xml @@ -42,7 +42,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -103,9 +103,9 @@ - org.jboss.spec @@ -152,7 +152,7 @@ - ${project.artifactId} @@ -168,7 +168,7 @@ - + maven-war-plugin 2.4 diff --git a/ejb-timer/src/main/java/META-INF/beans.xml b/ejb-timer/src/main/java/META-INF/beans.xml index 8c5ac6eaa9..4114ef5dc1 100644 --- a/ejb-timer/src/main/java/META-INF/beans.xml +++ b/ejb-timer/src/main/java/META-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - - \ No newline at end of file + diff --git a/ejb-timer/src/main/java/org/jboss/as/quickstarts/ejbTimer/ScheduleExample.java b/ejb-timer/src/main/java/org/jboss/as/quickstarts/ejbTimer/ScheduleExample.java index fd9f776564..51653eccac 100644 --- a/ejb-timer/src/main/java/org/jboss/as/quickstarts/ejbTimer/ScheduleExample.java +++ b/ejb-timer/src/main/java/org/jboss/as/quickstarts/ejbTimer/ScheduleExample.java @@ -21,7 +21,6 @@ import javax.ejb.Schedule; import javax.ejb.Singleton; - /** * Demonstrates how to use the EJB's @Schedule. * @@ -30,11 +29,11 @@ @Singleton public class ScheduleExample { - @Schedule(second="*/6", minute="*",hour="*", persistent=false) - public void doWork(){ + @Schedule(second = "*/6", minute = "*", hour = "*", persistent = false) + public void doWork() { Date currentTime = new Date(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd G 'at' HH:mm:ss z"); - System.out.println( "ScheduleExample.doWork() invoked at " + simpleDateFormat.format(currentTime) ); + System.out.println("ScheduleExample.doWork() invoked at " + simpleDateFormat.format(currentTime)); } } diff --git a/ejb-timer/src/main/java/org/jboss/as/quickstarts/ejbTimer/TimeoutExample.java b/ejb-timer/src/main/java/org/jboss/as/quickstarts/ejbTimer/TimeoutExample.java index f5750bd94e..a05ba811de 100644 --- a/ejb-timer/src/main/java/org/jboss/as/quickstarts/ejbTimer/TimeoutExample.java +++ b/ejb-timer/src/main/java/org/jboss/as/quickstarts/ejbTimer/TimeoutExample.java @@ -24,7 +24,6 @@ import javax.ejb.*; import javax.interceptor.InvocationContext; - /** * Demonstrates how to use the EJB's @Timeout. * @@ -45,11 +44,11 @@ public void scheduler(Timer timer) { } @PostConstruct - public void initialize( InvocationContext ctx ) { + public void initialize(InvocationContext ctx) { ScheduleExpression se = new ScheduleExpression(); // Set schedule to every 3 seconds (starting at second 0 of every minute). se.hour("*").minute("*").second("0/3"); - timerService.createCalendarTimer( se, new TimerConfig("EJB timer service timeout at ", false) ); + timerService.createCalendarTimer(se, new TimerConfig("EJB timer service timeout at ", false)); } @PreDestroy diff --git a/greeter/pom.xml b/greeter/pom.xml index 1cde0b8389..1c7d97a10c 100644 --- a/greeter/pom.xml +++ b/greeter/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,9 +90,9 @@ - - UTF-8 @@ -112,8 +112,8 @@ - org.jboss.spec.javax.annotation @@ -179,7 +179,7 @@ - ${project.artifactId} @@ -187,7 +187,7 @@ maven-war-plugin ${version.war.plugin} - false diff --git a/greeter/src/main/java/org/jboss/as/quickstarts/greeter/domain/User.java b/greeter/src/main/java/org/jboss/as/quickstarts/greeter/domain/User.java index 9e1457be80..705882a588 100644 --- a/greeter/src/main/java/org/jboss/as/quickstarts/greeter/domain/User.java +++ b/greeter/src/main/java/org/jboss/as/quickstarts/greeter/domain/User.java @@ -24,7 +24,7 @@ @Entity // User is a keyword in some SQL dialects! -@Table(name="Users") +@Table(name = "Users") public class User { @Id diff --git a/greeter/src/main/resources/META-INF/persistence.xml b/greeter/src/main/resources/META-INF/persistence.xml index 6e53ace01c..55534b16f8 100644 --- a/greeter/src/main/resources/META-INF/persistence.xml +++ b/greeter/src/main/resources/META-INF/persistence.xml @@ -21,9 +21,9 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - - java:jboss/datasources/GreeterQuickstartDS diff --git a/greeter/src/main/webapp/WEB-INF/beans.xml b/greeter/src/main/webapp/WEB-INF/beans.xml index 8a1563c857..27e7d28fd5 100644 --- a/greeter/src/main/webapp/WEB-INF/beans.xml +++ b/greeter/src/main/webapp/WEB-INF/beans.xml @@ -17,10 +17,10 @@ - diff --git a/greeter/src/main/webapp/WEB-INF/greeter-quickstart-ds.xml b/greeter/src/main/webapp/WEB-INF/greeter-quickstart-ds.xml index 716d4eec13..d7a1743b6d 100644 --- a/greeter/src/main/webapp/WEB-INF/greeter-quickstart-ds.xml +++ b/greeter/src/main/webapp/WEB-INF/greeter-quickstart-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - @@ -34,4 +34,4 @@ - + diff --git a/helloworld-html5/README.md b/helloworld-html5/README.md index f1de30af5a..84f3247f85 100644 --- a/helloworld-html5/README.md +++ b/helloworld-html5/README.md @@ -3,9 +3,9 @@ helloworld-html5: HTML5 and REST Hello World Example Author: Jay Balunas, Burr Sutter, Douglas Campos, Bruno Olivera Level: Beginner Technologies: CDI, JAX-RS, HTML5 -Summary: The `helloworld-html5` quickstart demonstrates the use of *CDI 1.1* and *JAX-RS 2.0* using the HTML5 architecture and RESTful services on the backend. -Target Product: JBoss EAP -Source: +Summary: The `helloworld-html5` quickstart demonstrates the use of *CDI 1.1* and *JAX-RS 2.0* using the HTML5 architecture and RESTful services on the backend. +Target Product: JBoss EAP +Source: What is it? ----------- diff --git a/helloworld-html5/pom.xml b/helloworld-html5/pom.xml index edacacdcf7..0a99f12e1b 100644 --- a/helloworld-html5/pom.xml +++ b/helloworld-html5/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,7 +91,7 @@ - UTF-8 @@ -136,7 +136,7 @@ provided - org.jboss.spec.javax.annotation @@ -176,11 +176,11 @@ - - - openshift diff --git a/helloworld-html5/src/main/webapp/WEB-INF/beans.xml b/helloworld-html5/src/main/webapp/WEB-INF/beans.xml index 71531b7b5f..460d1cf31b 100644 --- a/helloworld-html5/src/main/webapp/WEB-INF/beans.xml +++ b/helloworld-html5/src/main/webapp/WEB-INF/beans.xml @@ -21,4 +21,4 @@ xsi:schemaLocation=" http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all"> - \ No newline at end of file + diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml index 534dd1be93..0f8312ab59 100644 --- a/helloworld-jms/pom.xml +++ b/helloworld-jms/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,7 +91,7 @@ - UTF-8 diff --git a/helloworld-jms/src/main/java/org/jboss/as/quickstarts/jms/HelloWorldJMSClient.java b/helloworld-jms/src/main/java/org/jboss/as/quickstarts/jms/HelloWorldJMSClient.java index f87b93a5ef..c4b87e65aa 100644 --- a/helloworld-jms/src/main/java/org/jboss/as/quickstarts/jms/HelloWorldJMSClient.java +++ b/helloworld-jms/src/main/java/org/jboss/as/quickstarts/jms/HelloWorldJMSClient.java @@ -98,4 +98,3 @@ public static void main(String[] args) { } } } - diff --git a/helloworld-mbean/helloworld-mbean-service/pom.xml b/helloworld-mbean/helloworld-mbean-service/pom.xml index 4b75c5d418..57ae1afb0a 100644 --- a/helloworld-mbean/helloworld-mbean-service/pom.xml +++ b/helloworld-mbean/helloworld-mbean-service/pom.xml @@ -1,61 +1,61 @@ - - - - 4.0.0 - - org.jboss.quickstarts.eap - jboss-helloworld-mbean - 7.0.0-SNAPSHOT - - jboss-helloworld-mbean-helloworld-mbean-service - jboss-sar - - JBoss EAP Quickstart: helloworld-mbean - helloworld-mbean-service - - http://www.jboss.org/products/eap - - - Apache License, Version 2.0 - repo - http://www.apache.org/licenses/LICENSE-2.0.html - - - - - ${project.artifactId} - - - org.codehaus.mojo - jboss-packaging-maven-plugin - ${version.jboss.packaging.plugin} - - true - - - org.wildfly.plugins - wildfly-maven-plugin - ${version.wildfly.maven.plugin} - - false - ${project.artifactId}.sar - - - - - + + + + 4.0.0 + + org.jboss.quickstarts.eap + jboss-helloworld-mbean + 7.0.0-SNAPSHOT + + jboss-helloworld-mbean-helloworld-mbean-service + jboss-sar + + JBoss EAP Quickstart: helloworld-mbean - helloworld-mbean-service + + http://www.jboss.org/products/eap + + + Apache License, Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0.html + + + + + ${project.artifactId} + + + org.codehaus.mojo + jboss-packaging-maven-plugin + ${version.jboss.packaging.plugin} + + true + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.wildfly.maven.plugin} + + false + ${project.artifactId}.sar + + + + + diff --git a/helloworld-mbean/helloworld-mbean-service/src/main/resources/META-INF/beans.xml b/helloworld-mbean/helloworld-mbean-service/src/main/resources/META-INF/beans.xml index 8c5ac6eaa9..4114ef5dc1 100644 --- a/helloworld-mbean/helloworld-mbean-service/src/main/resources/META-INF/beans.xml +++ b/helloworld-mbean/helloworld-mbean-service/src/main/resources/META-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - - \ No newline at end of file + diff --git a/helloworld-mbean/helloworld-mbean-service/src/main/resources/META-INF/jboss-service.xml b/helloworld-mbean/helloworld-mbean-service/src/main/resources/META-INF/jboss-service.xml index 8bf8de5824..86713b646d 100644 --- a/helloworld-mbean/helloworld-mbean-service/src/main/resources/META-INF/jboss-service.xml +++ b/helloworld-mbean/helloworld-mbean-service/src/main/resources/META-INF/jboss-service.xml @@ -1,22 +1,22 @@ - - - - - Welcome - - \ No newline at end of file + + + + + Welcome + + diff --git a/helloworld-mbean/helloworld-mbean-webapp/pom.xml b/helloworld-mbean/helloworld-mbean-webapp/pom.xml index 34f8d8fbd2..09ea2d4673 100644 --- a/helloworld-mbean/helloworld-mbean-webapp/pom.xml +++ b/helloworld-mbean/helloworld-mbean-webapp/pom.xml @@ -1,61 +1,61 @@ - - - - 4.0.0 - - org.jboss.quickstarts.eap - jboss-helloworld-mbean - 7.0.0-SNAPSHOT - - jboss-helloworld-mbean-helloworld-mbean-webapp - war - JBoss EAP Quickstart: helloworld-mbean - helloworld-mbean-webapp - - http://www.jboss.org/products/eap - - - Apache License, Version 2.0 - repo - http://www.apache.org/licenses/LICENSE-2.0.html - - - - - - ${project.artifactId} - - - maven-war-plugin - ${version.war.plugin} - - - false - - - - org.wildfly.plugins - wildfly-maven-plugin - ${version.wildfly.maven.plugin} - - false - - - - - + + + + 4.0.0 + + org.jboss.quickstarts.eap + jboss-helloworld-mbean + 7.0.0-SNAPSHOT + + jboss-helloworld-mbean-helloworld-mbean-webapp + war + JBoss EAP Quickstart: helloworld-mbean - helloworld-mbean-webapp + + http://www.jboss.org/products/eap + + + Apache License, Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0.html + + + + + + ${project.artifactId} + + + maven-war-plugin + ${version.war.plugin} + + + false + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.wildfly.maven.plugin} + + false + + + + + diff --git a/helloworld-mbean/helloworld-mbean-webapp/src/main/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/IAnnotatedHelloWorldMBean.java b/helloworld-mbean/helloworld-mbean-webapp/src/main/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/IAnnotatedHelloWorldMBean.java index e7b4014457..f458674614 100644 --- a/helloworld-mbean/helloworld-mbean-webapp/src/main/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/IAnnotatedHelloWorldMBean.java +++ b/helloworld-mbean/helloworld-mbean-webapp/src/main/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/IAnnotatedHelloWorldMBean.java @@ -36,6 +36,7 @@ public interface IAnnotatedHelloWorldMBean { * Read write attribute */ void setWelcomeMessage(String message); + String getWelcomeMessage(); /** diff --git a/helloworld-mbean/helloworld-mbean-webapp/src/main/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/IHelloWorldMXBean.java b/helloworld-mbean/helloworld-mbean-webapp/src/main/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/IHelloWorldMXBean.java index b910ccf996..46900f76a6 100644 --- a/helloworld-mbean/helloworld-mbean-webapp/src/main/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/IHelloWorldMXBean.java +++ b/helloworld-mbean/helloworld-mbean-webapp/src/main/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/IHelloWorldMXBean.java @@ -33,6 +33,7 @@ public interface IHelloWorldMXBean { * Read write attribute */ void setWelcomeMessage(String message); + String getWelcomeMessage(); /** diff --git a/helloworld-mbean/helloworld-mbean-webapp/src/main/webapp/META-INF/jboss-service.xml b/helloworld-mbean/helloworld-mbean-webapp/src/main/webapp/META-INF/jboss-service.xml index d4058475e2..39da287da8 100644 --- a/helloworld-mbean/helloworld-mbean-webapp/src/main/webapp/META-INF/jboss-service.xml +++ b/helloworld-mbean/helloworld-mbean-webapp/src/main/webapp/META-INF/jboss-service.xml @@ -1,24 +1,24 @@ - - - - - - Welcome - - - + + + + + + Welcome + + + diff --git a/helloworld-mbean/helloworld-mbean-webapp/src/main/webapp/WEB-INF/beans.xml b/helloworld-mbean/helloworld-mbean-webapp/src/main/webapp/WEB-INF/beans.xml index 80b601a73c..4dc8a800ab 100644 --- a/helloworld-mbean/helloworld-mbean-webapp/src/main/webapp/WEB-INF/beans.xml +++ b/helloworld-mbean/helloworld-mbean-webapp/src/main/webapp/WEB-INF/beans.xml @@ -1,23 +1,23 @@ - - - - + + + + diff --git a/helloworld-mbean/helloworld-mbean-webapp/src/test/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/AnnotatedComponentHelloWorldTest.java b/helloworld-mbean/helloworld-mbean-webapp/src/test/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/AnnotatedComponentHelloWorldTest.java index ad438c6686..b75f937539 100644 --- a/helloworld-mbean/helloworld-mbean-webapp/src/test/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/AnnotatedComponentHelloWorldTest.java +++ b/helloworld-mbean/helloworld-mbean-webapp/src/test/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/AnnotatedComponentHelloWorldTest.java @@ -50,11 +50,11 @@ public class AnnotatedComponentHelloWorldTest { */ @Deployment public static Archive createTestArchive() { - return ShrinkWrap.create(JavaArchive.class,"helloworld.jar") - .addClasses(AnnotatedComponentHelloWorld.class).addClasses(AbstractComponentMBean.class) - .addClass(IAnnotatedHelloWorldMBean.class) - .addClass(HelloService.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + return ShrinkWrap.create(JavaArchive.class, "helloworld.jar") + .addClasses(AnnotatedComponentHelloWorld.class).addClasses(AbstractComponentMBean.class) + .addClass(IAnnotatedHelloWorldMBean.class) + .addClass(HelloService.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); } @Test @@ -63,12 +63,12 @@ public void testHello() throws Exception { ObjectName objectName = new ObjectName("quickstarts", "type", AnnotatedComponentHelloWorld.class.getSimpleName()); MBeanInfo mbeanInfo = mbeanServer.getMBeanInfo(objectName); Assert.assertNotNull(mbeanInfo); - Assert.assertEquals(0L,mbeanServer.getAttribute(objectName, "Count")); - Assert.assertEquals("Hello",mbeanServer.getAttribute(objectName, "WelcomeMessage")); - Assert.assertEquals("Hello jer!",mbeanServer.invoke(objectName, "sayHello", new Object[] {"jer"}, new String[] {"java.lang.String"})); - Assert.assertEquals(1L,mbeanServer.getAttribute(objectName, "Count")); - mbeanServer.setAttribute(objectName, new Attribute("WelcomeMessage","Hi")); - Assert.assertEquals("Hi jer!",mbeanServer.invoke(objectName, "sayHello", new Object[] {"jer"}, new String[] {"java.lang.String"})); - Assert.assertEquals(2L,mbeanServer.getAttribute(objectName, "Count")); + Assert.assertEquals(0L, mbeanServer.getAttribute(objectName, "Count")); + Assert.assertEquals("Hello", mbeanServer.getAttribute(objectName, "WelcomeMessage")); + Assert.assertEquals("Hello jer!", mbeanServer.invoke(objectName, "sayHello", new Object[] { "jer" }, new String[] { "java.lang.String" })); + Assert.assertEquals(1L, mbeanServer.getAttribute(objectName, "Count")); + mbeanServer.setAttribute(objectName, new Attribute("WelcomeMessage", "Hi")); + Assert.assertEquals("Hi jer!", mbeanServer.invoke(objectName, "sayHello", new Object[] { "jer" }, new String[] { "java.lang.String" })); + Assert.assertEquals(2L, mbeanServer.getAttribute(objectName, "Count")); } } diff --git a/helloworld-mbean/helloworld-mbean-webapp/src/test/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/MXPojoHelloWorldTest.java b/helloworld-mbean/helloworld-mbean-webapp/src/test/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/MXPojoHelloWorldTest.java index 72d760255b..62a4fbdfc3 100644 --- a/helloworld-mbean/helloworld-mbean-webapp/src/test/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/MXPojoHelloWorldTest.java +++ b/helloworld-mbean/helloworld-mbean-webapp/src/test/java/org/jboss/as/quickstarts/mbeanhelloworld/mbean/MXPojoHelloWorldTest.java @@ -55,11 +55,11 @@ public class MXPojoHelloWorldTest { */ @Deployment public static Archive createTestArchive() { - return ShrinkWrap.create(WebArchive.class,"test.war") - .addClasses(MXPojoHelloWorld.class, IHelloWorldMXBean.class, HelloService.class, CDIExtension.class) - .addAsManifestResource(new File(WEBAPP_SRC, "META-INF/jboss-service.xml"), "jboss-service.xml") - .addAsServiceProvider(Extension.class, CDIExtension.class) - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); + return ShrinkWrap.create(WebArchive.class, "test.war") + .addClasses(MXPojoHelloWorld.class, IHelloWorldMXBean.class, HelloService.class, CDIExtension.class) + .addAsManifestResource(new File(WEBAPP_SRC, "META-INF/jboss-service.xml"), "jboss-service.xml") + .addAsServiceProvider(Extension.class, CDIExtension.class) + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); } @Test @@ -68,12 +68,12 @@ public void testHello() throws Exception { ObjectName objectName = new ObjectName("quickstarts", "type", MXPojoHelloWorld.class.getSimpleName()); MBeanInfo mbeanInfo = mbeanServer.getMBeanInfo(objectName); Assert.assertNotNull(mbeanInfo); - Assert.assertEquals(0L,mbeanServer.getAttribute(objectName, "Count")); - Assert.assertEquals("Welcome",mbeanServer.getAttribute(objectName, "WelcomeMessage")); - Assert.assertEquals("Welcome jer!",mbeanServer.invoke(objectName, "sayHello", new Object[] {"jer"}, new String[] {"java.lang.String"})); - Assert.assertEquals(1L,mbeanServer.getAttribute(objectName, "Count")); - mbeanServer.setAttribute(objectName, new Attribute("WelcomeMessage","Hi")); - Assert.assertEquals("Hi jer!",mbeanServer.invoke(objectName, "sayHello", new Object[] {"jer"}, new String[] {"java.lang.String"})); - Assert.assertEquals(2L,mbeanServer.getAttribute(objectName, "Count")); + Assert.assertEquals(0L, mbeanServer.getAttribute(objectName, "Count")); + Assert.assertEquals("Welcome", mbeanServer.getAttribute(objectName, "WelcomeMessage")); + Assert.assertEquals("Welcome jer!", mbeanServer.invoke(objectName, "sayHello", new Object[] { "jer" }, new String[] { "java.lang.String" })); + Assert.assertEquals(1L, mbeanServer.getAttribute(objectName, "Count")); + mbeanServer.setAttribute(objectName, new Attribute("WelcomeMessage", "Hi")); + Assert.assertEquals("Hi jer!", mbeanServer.invoke(objectName, "sayHello", new Object[] { "jer" }, new String[] { "java.lang.String" })); + Assert.assertEquals(2L, mbeanServer.getAttribute(objectName, "Count")); } } diff --git a/helloworld-mbean/pom.xml b/helloworld-mbean/pom.xml index c80302f4fb..f30b4d9c31 100644 --- a/helloworld-mbean/pom.xml +++ b/helloworld-mbean/pom.xml @@ -40,7 +40,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -89,9 +89,9 @@ - - UTF-8 @@ -105,7 +105,7 @@ 2.2 2.1.1 2.10 - + 1.8 1.8 @@ -118,14 +118,14 @@ - - org.jboss.bom diff --git a/helloworld-mdb-propertysubstitution/pom.xml b/helloworld-mdb-propertysubstitution/pom.xml index 0bcdfc78c5..514b241be3 100644 --- a/helloworld-mdb-propertysubstitution/pom.xml +++ b/helloworld-mdb-propertysubstitution/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,9 +90,9 @@ - - UTF-8 @@ -113,11 +113,11 @@ - org.jboss.spec @@ -130,7 +130,7 @@ - org.jboss.spec.javax.servlet @@ -155,7 +155,7 @@ - ${project.artifactId} @@ -163,7 +163,7 @@ maven-war-plugin ${version.war.plugin} - false @@ -179,11 +179,11 @@ - - - openshift @@ -195,7 +195,7 @@ deployments ROOT - false diff --git a/helloworld-mdb-propertysubstitution/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java b/helloworld-mdb-propertysubstitution/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java index ebc931a0b4..3ed2c9c108 100644 --- a/helloworld-mdb-propertysubstitution/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java +++ b/helloworld-mdb-propertysubstitution/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java @@ -33,9 +33,9 @@ * */ @MessageDriven(name = "HelloWorldQueueMDB", activationConfig = { - @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "queue/HELLOWORLDMDBQueue"), - @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), - @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") }) + @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "queue/HELLOWORLDMDBQueue"), + @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), + @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") }) public class HelloWorldQueueMDB implements MessageListener { private final static Logger LOGGER = Logger.getLogger(HelloWorldQueueMDB.class.toString()); diff --git a/helloworld-mdb-propertysubstitution/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java b/helloworld-mdb-propertysubstitution/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java index 42f14c9c06..1a85f58cd0 100644 --- a/helloworld-mdb-propertysubstitution/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java +++ b/helloworld-mdb-propertysubstitution/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java @@ -38,20 +38,18 @@ * (one queue and one topic). */ @JMSDestinationDefinitions( - value = { - @JMSDestinationDefinition( - name = "java:/queue/HELLOWORLDMDBQueue", - interfaceName = "javax.jms.Queue", - destinationName = "HelloWorldMDBQueue" - ), - @JMSDestinationDefinition( - name = "java:/topic/HELLOWORLDMDBTopic", - interfaceName = "javax.jms.Topic", - destinationName = "HelloWorldMDBTopic" - ) - } -) - + value = { + @JMSDestinationDefinition( + name = "java:/queue/HELLOWORLDMDBQueue", + interfaceName = "javax.jms.Queue", + destinationName = "HelloWorldMDBQueue" + ), + @JMSDestinationDefinition( + name = "java:/topic/HELLOWORLDMDBTopic", + interfaceName = "javax.jms.Topic", + destinationName = "HelloWorldMDBTopic" + ) + }) /** *

* A simple servlet 3 as client that sends several messages to a queue or a topic. diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml index 33531be57e..8c2263540e 100644 --- a/helloworld-mdb/pom.xml +++ b/helloworld-mdb/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,9 +90,9 @@ - - UTF-8 @@ -113,11 +113,11 @@ - org.jboss.spec @@ -130,7 +130,7 @@ - org.jboss.spec.javax.servlet @@ -152,11 +152,11 @@ cdi-api provided - + - ${project.artifactId} @@ -164,7 +164,7 @@ maven-war-plugin ${version.war.plugin} - false @@ -180,11 +180,11 @@ - - - openshift @@ -196,7 +196,7 @@ deployments ROOT - false diff --git a/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java b/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java index ebc931a0b4..3ed2c9c108 100644 --- a/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java +++ b/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/mdb/HelloWorldQueueMDB.java @@ -33,9 +33,9 @@ * */ @MessageDriven(name = "HelloWorldQueueMDB", activationConfig = { - @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "queue/HELLOWORLDMDBQueue"), - @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), - @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") }) + @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = "queue/HELLOWORLDMDBQueue"), + @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), + @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") }) public class HelloWorldQueueMDB implements MessageListener { private final static Logger LOGGER = Logger.getLogger(HelloWorldQueueMDB.class.toString()); diff --git a/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java b/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java index 42f14c9c06..1a85f58cd0 100644 --- a/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java +++ b/helloworld-mdb/src/main/java/org/jboss/as/quickstarts/servlet/HelloWorldMDBServletClient.java @@ -38,20 +38,18 @@ * (one queue and one topic). */ @JMSDestinationDefinitions( - value = { - @JMSDestinationDefinition( - name = "java:/queue/HELLOWORLDMDBQueue", - interfaceName = "javax.jms.Queue", - destinationName = "HelloWorldMDBQueue" - ), - @JMSDestinationDefinition( - name = "java:/topic/HELLOWORLDMDBTopic", - interfaceName = "javax.jms.Topic", - destinationName = "HelloWorldMDBTopic" - ) - } -) - + value = { + @JMSDestinationDefinition( + name = "java:/queue/HELLOWORLDMDBQueue", + interfaceName = "javax.jms.Queue", + destinationName = "HelloWorldMDBQueue" + ), + @JMSDestinationDefinition( + name = "java:/topic/HELLOWORLDMDBTopic", + interfaceName = "javax.jms.Topic", + destinationName = "HelloWorldMDBTopic" + ) + }) /** *

* A simple servlet 3 as client that sends several messages to a queue or a topic. diff --git a/helloworld-rs/pom.xml b/helloworld-rs/pom.xml index 1bbf72e481..56ffe68b97 100644 --- a/helloworld-rs/pom.xml +++ b/helloworld-rs/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,7 +91,7 @@ - UTF-8 @@ -111,8 +111,8 @@ - org.jboss.spec.javax.annotation @@ -156,7 +156,7 @@ - ${project.artifactId} diff --git a/helloworld-rs/src/main/webapp/WEB-INF/beans.xml b/helloworld-rs/src/main/webapp/WEB-INF/beans.xml index 955868d46a..460d1cf31b 100644 --- a/helloworld-rs/src/main/webapp/WEB-INF/beans.xml +++ b/helloworld-rs/src/main/webapp/WEB-INF/beans.xml @@ -19,6 +19,6 @@ diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml index 24594ad8dd..4bda0a4d20 100644 --- a/helloworld-singleton/pom.xml +++ b/helloworld-singleton/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,14 +91,14 @@ - UTF-8 1.0.2.Final - + 1.0.3.Final @@ -112,11 +112,11 @@ - org.jboss.spec @@ -129,7 +129,7 @@ - org.jboss.spec.javax.ejb diff --git a/helloworld-singleton/src/main/webapp/WEB-INF/faces-config.xml b/helloworld-singleton/src/main/webapp/WEB-INF/faces-config.xml index 924bcfcf75..76ee021140 100644 --- a/helloworld-singleton/src/main/webapp/WEB-INF/faces-config.xml +++ b/helloworld-singleton/src/main/webapp/WEB-INF/faces-config.xml @@ -23,5 +23,5 @@ xsi:schemaLocation=" http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"> - + diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml index a84398820a..8a16ebd42a 100644 --- a/helloworld-ws/pom.xml +++ b/helloworld-ws/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,16 +90,16 @@ - - UTF-8 - + 1.0.2.Final - + 7.0.0-build-7 @@ -117,14 +117,14 @@ - - org.jboss.bom @@ -137,7 +137,7 @@ - javax.enterprise @@ -145,7 +145,7 @@ provided - org.jboss.spec.javax.servlet @@ -153,7 +153,7 @@ provided - org.jboss.spec.javax.annotation @@ -176,7 +176,7 @@ - ${project.artifactId} @@ -198,7 +198,7 @@ - default @@ -223,9 +223,9 @@ - - arq-wildfly-managed @@ -252,7 +252,7 @@ - arq-wildfly-remote @@ -279,7 +279,7 @@ - jbossas-remote @@ -305,11 +305,11 @@ - - - openshift diff --git a/helloworld-ws/src/main/java/org/jboss/as/quickstarts/wshelloworld/HelloWorldServiceImpl.java b/helloworld-ws/src/main/java/org/jboss/as/quickstarts/wshelloworld/HelloWorldServiceImpl.java index 07570e8d72..e1fcb4253f 100644 --- a/helloworld-ws/src/main/java/org/jboss/as/quickstarts/wshelloworld/HelloWorldServiceImpl.java +++ b/helloworld-ws/src/main/java/org/jboss/as/quickstarts/wshelloworld/HelloWorldServiceImpl.java @@ -26,7 +26,8 @@ * * @author lnewson@redhat.com */ -@WebService(serviceName = "HelloWorldService", portName = "HelloWorld", name = "HelloWorld", endpointInterface = "org.jboss.as.quickstarts.wshelloworld.HelloWorldService", targetNamespace = "http://www.jboss.org/eap/quickstarts/wshelloworld/HelloWorld") +@WebService(serviceName = "HelloWorldService", portName = "HelloWorld", name = "HelloWorld", endpointInterface = "org.jboss.as.quickstarts.wshelloworld.HelloWorldService", + targetNamespace = "http://www.jboss.org/eap/quickstarts/wshelloworld/HelloWorld") public class HelloWorldServiceImpl implements HelloWorldService { @Override diff --git a/helloworld-ws/src/main/webapp/WEB-INF/beans.xml b/helloworld-ws/src/main/webapp/WEB-INF/beans.xml index 639207b526..4114ef5dc1 100644 --- a/helloworld-ws/src/main/webapp/WEB-INF/beans.xml +++ b/helloworld-ws/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - diff --git a/helloworld/pom.xml b/helloworld/pom.xml index 4e427fa03f..999490cd5b 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,9 +90,9 @@ - - UTF-8 @@ -138,7 +138,7 @@ provided - org.jboss.spec.javax.annotation @@ -156,7 +156,7 @@ - ${project.artifactId} diff --git a/helloworld/src/main/webapp/WEB-INF/beans.xml b/helloworld/src/main/webapp/WEB-INF/beans.xml index 34e3d0824d..4b8daeb212 100644 --- a/helloworld/src/main/webapp/WEB-INF/beans.xml +++ b/helloworld/src/main/webapp/WEB-INF/beans.xml @@ -18,6 +18,6 @@ diff --git a/hibernate5/pom.xml b/hibernate5/pom.xml index 73fafcfd55..c48ff6ac87 100644 --- a/hibernate5/pom.xml +++ b/hibernate5/pom.xml @@ -40,7 +40,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,7 +90,7 @@ - UTF-8 @@ -110,10 +110,10 @@ - org.jboss.bom @@ -127,7 +127,7 @@ - @@ -137,7 +137,7 @@ provided - org.jboss.spec.javax.annotation @@ -145,8 +145,8 @@ provided - @@ -193,10 +193,10 @@ provided - - org.hibernate @@ -207,7 +207,7 @@ - ${project.artifactId} @@ -215,7 +215,7 @@ maven-war-plugin ${version.war.plugin} - false @@ -233,11 +233,11 @@ - - - openshift diff --git a/hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/controller/MemberController.java b/hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/controller/MemberController.java index b18d6833d8..884e8390fa 100644 --- a/hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/controller/MemberController.java +++ b/hibernate5/src/main/java/org/jboss/as/quickstart/hibernate/controller/MemberController.java @@ -52,12 +52,12 @@ public void register() { try { memberRegistration.register(newMember); facesContext.addMessage(null, - new FacesMessage(FacesMessage.SEVERITY_INFO, "Registered!", "Registration successful")); + new FacesMessage(FacesMessage.SEVERITY_INFO, "Registered!", "Registration successful")); initNewMember(); } catch (Exception e) { String errorMessage = getRootErrorMessage(e); facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, - errorMessage, "Registration unsuccessful")); + errorMessage, "Registration unsuccessful")); } } diff --git a/hibernate5/src/main/resources/META-INF/persistence.xml b/hibernate5/src/main/resources/META-INF/persistence.xml index a69a4a7e73..67352bf4a2 100644 --- a/hibernate5/src/main/resources/META-INF/persistence.xml +++ b/hibernate5/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - diff --git a/hibernate5/src/main/webapp/WEB-INF/beans.xml b/hibernate5/src/main/webapp/WEB-INF/beans.xml index bfb72e3d65..6b2c62fc13 100644 --- a/hibernate5/src/main/webapp/WEB-INF/beans.xml +++ b/hibernate5/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - diff --git a/hibernate5/src/main/webapp/WEB-INF/faces-config.xml b/hibernate5/src/main/webapp/WEB-INF/faces-config.xml index 4037c8c00c..c4497af3ed 100644 --- a/hibernate5/src/main/webapp/WEB-INF/faces-config.xml +++ b/hibernate5/src/main/webapp/WEB-INF/faces-config.xml @@ -24,7 +24,7 @@ - diff --git a/hibernate5/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml b/hibernate5/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml index d5cbc21799..c1805f724b 100644 --- a/hibernate5/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml +++ b/hibernate5/src/main/webapp/WEB-INF/hibernate5-quickstart-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/inter-app/appA/pom.xml b/inter-app/appA/pom.xml index 1de815b503..1f2b9000bd 100644 --- a/inter-app/appA/pom.xml +++ b/inter-app/appA/pom.xml @@ -54,8 +54,8 @@ provided - org.jboss.quickstarts.eap @@ -67,7 +67,7 @@ - ${project.artifactId} @@ -75,11 +75,11 @@ maven-war-plugin ${version.war.plugin} - false - diff --git a/inter-app/appA/src/main/webapp/WEB-INF/beans.xml b/inter-app/appA/src/main/webapp/WEB-INF/beans.xml index 41a076358d..f7077a85bc 100644 --- a/inter-app/appA/src/main/webapp/WEB-INF/beans.xml +++ b/inter-app/appA/src/main/webapp/WEB-INF/beans.xml @@ -17,7 +17,7 @@ diff --git a/inter-app/appA/src/main/webapp/WEB-INF/faces-config.xml b/inter-app/appA/src/main/webapp/WEB-INF/faces-config.xml index f8044659a5..5a0fee2288 100644 --- a/inter-app/appA/src/main/webapp/WEB-INF/faces-config.xml +++ b/inter-app/appA/src/main/webapp/WEB-INF/faces-config.xml @@ -18,7 +18,7 @@ diff --git a/inter-app/appB/pom.xml b/inter-app/appB/pom.xml index 9ea394332a..3e58f49593 100644 --- a/inter-app/appB/pom.xml +++ b/inter-app/appB/pom.xml @@ -54,8 +54,8 @@ provided - org.jboss.quickstarts.eap @@ -67,7 +67,7 @@ - ${project.artifactId} @@ -75,11 +75,11 @@ maven-war-plugin ${version.war.plugin} - false - diff --git a/inter-app/appB/src/main/java/org/jboss/as/quickstarts/interapp/appB/Imports.java b/inter-app/appB/src/main/java/org/jboss/as/quickstarts/interapp/appB/Imports.java index 1f9c96b56a..93c5603754 100644 --- a/inter-app/appB/src/main/java/org/jboss/as/quickstarts/interapp/appB/Imports.java +++ b/inter-app/appB/src/main/java/org/jboss/as/quickstarts/interapp/appB/Imports.java @@ -31,7 +31,7 @@ public class Imports { @Produces - @EJB(lookup="java:global/jboss-inter-app-appA/FooImpl!org.jboss.as.quickstarts.interapp.shared.Foo") + @EJB(lookup = "java:global/jboss-inter-app-appA/FooImpl!org.jboss.as.quickstarts.interapp.shared.Foo") private Foo foo; private Imports() { diff --git a/inter-app/appB/src/main/webapp/WEB-INF/beans.xml b/inter-app/appB/src/main/webapp/WEB-INF/beans.xml index 41a076358d..f7077a85bc 100644 --- a/inter-app/appB/src/main/webapp/WEB-INF/beans.xml +++ b/inter-app/appB/src/main/webapp/WEB-INF/beans.xml @@ -17,7 +17,7 @@ diff --git a/inter-app/pom.xml b/inter-app/pom.xml index fa10d77572..1a71939c44 100644 --- a/inter-app/pom.xml +++ b/inter-app/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -110,9 +110,9 @@ - - UTF-8 @@ -153,7 +153,7 @@ import - org.jboss.quickstarts.eap @@ -166,7 +166,7 @@ - ${project.artifactId} diff --git a/inter-app/shared/pom.xml b/inter-app/shared/pom.xml index 60fa1ab02d..2998068383 100644 --- a/inter-app/shared/pom.xml +++ b/inter-app/shared/pom.xml @@ -26,7 +26,7 @@ jboss-inter-app-shared ejb - + JBoss EAP Quickstart: inter-app - shared Inter-application: Shows how to communicate between two applications using EJB and CDI @@ -53,7 +53,7 @@ ${project.artifactId} - org.wildfly.plugins diff --git a/jaxws-addressing/client/pom.xml b/jaxws-addressing/client/pom.xml index 368ccc0b35..66f9a3a019 100644 --- a/jaxws-addressing/client/pom.xml +++ b/jaxws-addressing/client/pom.xml @@ -58,9 +58,9 @@ - ${project.artifactId} + ${project.artifactId} - + org.codehaus.mojo @@ -69,7 +69,7 @@ org.jboss.quickstarts.ws.jaxws.samples.wsa.AddressingTestCase - + diff --git a/jaxws-addressing/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/AddressingTestCase.java b/jaxws-addressing/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/AddressingTestCase.java index 0a1c2794c3..d0fa4ff38e 100644 --- a/jaxws-addressing/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/AddressingTestCase.java +++ b/jaxws-addressing/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/AddressingTestCase.java @@ -39,7 +39,7 @@ public static void main(String[] args) throws Exception URL wsdlURL = new URL(serviceURL + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); org.jboss.quickstarts.ws.jaxws.samples.wsa.ServiceIface proxy = - (org.jboss.quickstarts.ws.jaxws.samples.wsa.ServiceIface)service.getPort(org.jboss.quickstarts.ws.jaxws.samples.wsa.ServiceIface.class, + (org.jboss.quickstarts.ws.jaxws.samples.wsa.ServiceIface) service.getPort(org.jboss.quickstarts.ws.jaxws.samples.wsa.ServiceIface.class, new AddressingFeature()); // invoke method System.out.println(proxy.sayHello()); diff --git a/jaxws-addressing/pom.xml b/jaxws-addressing/pom.xml index bfe4362daa..fefd5ac59c 100644 --- a/jaxws-addressing/pom.xml +++ b/jaxws-addressing/pom.xml @@ -47,7 +47,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -106,7 +106,7 @@ 1.8 1.2.1 - 7.0.0-build-7 + 7.0.0-build-7 2.1.1 @@ -130,7 +130,7 @@ pom import - + diff --git a/jaxws-addressing/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/ServiceIface.java b/jaxws-addressing/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/ServiceIface.java index 717ceb5f75..1db6a0249a 100644 --- a/jaxws-addressing/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/ServiceIface.java +++ b/jaxws-addressing/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/ServiceIface.java @@ -22,11 +22,9 @@ * * @author rsearls@redhat.com */ -@WebService - ( - name="ServiceIface", - targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing" - ) +@WebService( + name = "ServiceIface", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") public interface ServiceIface { public String sayHello(); } diff --git a/jaxws-addressing/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/ServiceImpl.java b/jaxws-addressing/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/ServiceImpl.java index 7785a68e9d..a498959937 100644 --- a/jaxws-addressing/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/ServiceImpl.java +++ b/jaxws-addressing/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/wsa/ServiceImpl.java @@ -24,15 +24,13 @@ /** * @author rsearls@redhat.com */ -@WebService - ( - portName = "AddressingServicePort", - serviceName = "AddressingService", - wsdlLocation = "WEB-INF/wsdl/AddressingService.wsdl", - targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing", - endpointInterface = "org.jboss.quickstarts.ws.jaxws.samples.wsa.ServiceIface" - ) -@Addressing(enabled=true, required=true) +@WebService( + portName = "AddressingServicePort", + serviceName = "AddressingService", + wsdlLocation = "WEB-INF/wsdl/AddressingService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing", + endpointInterface = "org.jboss.quickstarts.ws.jaxws.samples.wsa.ServiceIface") +@Addressing(enabled = true, required = true) public class ServiceImpl implements ServiceIface { public String sayHello() diff --git a/jaxws-ejb/client/pom.xml b/jaxws-ejb/client/pom.xml index 39d6c63e72..fd84fc8ceb 100644 --- a/jaxws-ejb/client/pom.xml +++ b/jaxws-ejb/client/pom.xml @@ -41,14 +41,14 @@ - + jboss-product-builds http://repository.jboss.org/nexus/content/groups/public/ - - - + + + 1.2.1 2.0.3.GA @@ -61,8 +61,8 @@ jboss-jaxws-ejb-service ${project.version} classes - - + + org.jboss.ws.native jbossws-native-core @@ -71,7 +71,7 @@ org.jboss.logging jboss-logging-spi - + org.jboss.spec.javax.ejb jboss-ejb-api_3.2_spec @@ -93,7 +93,7 @@ org.jboss.quickstarts.ws.client.Client - + diff --git a/jaxws-ejb/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java b/jaxws-ejb/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java index 43a7505733..2da2dda600 100644 --- a/jaxws-ejb/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java +++ b/jaxws-ejb/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java @@ -29,7 +29,7 @@ */ public class Client { - public static void main (String [] args) + public static void main(String[] args) { String endPointAddress = "http://localhost:8080/jboss-jaxws-ejb-endpoint/EJB3Bean01"; QName serviceName = new QName("http://jsr181pojo.samples.jaxws.ws.quickstarts.jboss.org/", "EJB3Bean01Service"); @@ -37,7 +37,7 @@ public static void main (String [] args) try { URL wsdlURL = new URL(endPointAddress + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); - EJB3RemoteInterface proxy = (EJB3RemoteInterface)service.getPort(EJB3RemoteInterface.class); + EJB3RemoteInterface proxy = (EJB3RemoteInterface) service.getPort(EJB3RemoteInterface.class); System.out.println(proxy.echo("ejbClient calling")); } catch (Exception e) { System.out.println(e); diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml index 27b605d4b9..39c3763e51 100644 --- a/jaxws-ejb/pom.xml +++ b/jaxws-ejb/pom.xml @@ -47,7 +47,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -108,7 +108,7 @@ 2.1.1 2.1.0 2.21 - 1.0.0.Final + 1.0.0.Final 1.8 diff --git a/jaxws-ejb/service/pom.xml b/jaxws-ejb/service/pom.xml index f18337903f..594e16b2b7 100644 --- a/jaxws-ejb/service/pom.xml +++ b/jaxws-ejb/service/pom.xml @@ -39,7 +39,7 @@ http://www.apache.org/licenses/LICENSE-2.0.html - + org.jboss.ejb3 @@ -50,7 +50,7 @@ com.sun.istack istack-commons-runtime provided - + org.jboss.spec.javax.ejb jboss-ejb-api_3.2_spec diff --git a/jaxws-ejb/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/EJB3Bean01.java b/jaxws-ejb/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/EJB3Bean01.java index 6fe8ae0d11..49e87258a4 100644 --- a/jaxws-ejb/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/EJB3Bean01.java +++ b/jaxws-ejb/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/EJB3Bean01.java @@ -28,7 +28,6 @@ */ @Stateless @Remote(EJB3RemoteInterface.class) - @WebService @SOAPBinding(style = SOAPBinding.Style.RPC) public class EJB3Bean01 implements EJB3RemoteInterface { diff --git a/jaxws-pojo/README.md b/jaxws-pojo/README.md index 7dd47d0db9..b8617a7bc8 100644 --- a/jaxws-pojo/README.md +++ b/jaxws-pojo/README.md @@ -3,7 +3,7 @@ jaxws-pojo: An POJO JAX-WS Web Service Author: R Searls Level: Beginner Technologies: JAX-WS -Summary: The `jaxws-pojo` quickstart is a working example of the web service endpoint created from a POJO. +Summary: The `jaxws-pojo` quickstart is a working example of the web service endpoint created from a POJO. Target Product: JBoss EAP Source: diff --git a/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java b/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java index 719a6ff476..f0645e0bd4 100644 --- a/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java +++ b/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java @@ -28,7 +28,7 @@ */ public class Client { - public static void main (String [] args) + public static void main(String[] args) { String endPointAddress = "http://localhost:8080/jboss-jaxws-pojo-endpoint/JSEBean01"; QName serviceName = new QName("http://jsr181pojo.samples.jaxws.ws.quickstarts.jboss.org/", "JSEBean01Service"); diff --git a/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/JSEBean01.java b/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/JSEBean01.java index 15d0cc82c3..9393e2c064 100644 --- a/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/JSEBean01.java +++ b/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/JSEBean01.java @@ -35,7 +35,6 @@ public interface JSEBean01 { @WebResult(name = "return", targetNamespace = "http://jsr181pojo.samples.jaxws.ws.quickstarts.jboss.org/", partName = "return") @WebMethod public java.lang.String echo( - @WebParam(partName = "arg0", name = "arg0") - java.lang.String arg0 - ); + @WebParam(partName = "arg0", name = "arg0") java.lang.String arg0 + ); } diff --git a/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/JSEBean01Service.java b/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/JSEBean01Service.java index d86b0e8005..7e4b0d88bb 100644 --- a/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/JSEBean01Service.java +++ b/jaxws-pojo/client/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/jsr181pojo/JSEBean01Service.java @@ -31,8 +31,8 @@ * */ @WebServiceClient(name = "JSEBean01Service", - wsdlLocation = "file:/tmp/JSEBean01Service.wsdl", - targetNamespace = "http://jsr181pojo.samples.jaxws.ws.quickstarts.jboss.org/") + wsdlLocation = "file:/tmp/JSEBean01Service.wsdl", + targetNamespace = "http://jsr181pojo.samples.jaxws.ws.quickstarts.jboss.org/") public class JSEBean01Service extends Service { public final static URL WSDL_LOCATION; @@ -46,7 +46,7 @@ public class JSEBean01Service extends Service { } catch (MalformedURLException e) { java.util.logging.Logger.getLogger(JSEBean01Service.class.getName()) .log(java.util.logging.Level.INFO, - "Can not initialize the default wsdl from {0}", "file:/tmp/JSEBean01Service.wsdl"); + "Can not initialize the default wsdl from {0}", "file:/tmp/JSEBean01Service.wsdl"); } WSDL_LOCATION = url; } @@ -66,21 +66,21 @@ public JSEBean01Service() { //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2 //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1 //compliant code instead. - public JSEBean01Service(WebServiceFeature ... features) { + public JSEBean01Service(WebServiceFeature... features) { super(WSDL_LOCATION, SERVICE, features); } //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2 //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1 //compliant code instead. - public JSEBean01Service(URL wsdlLocation, WebServiceFeature ... features) { + public JSEBean01Service(URL wsdlLocation, WebServiceFeature... features) { super(wsdlLocation, SERVICE, features); } //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2 //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1 //compliant code instead. - public JSEBean01Service(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { + public JSEBean01Service(URL wsdlLocation, QName serviceName, WebServiceFeature... features) { super(wsdlLocation, serviceName, features); } diff --git a/jaxws-pojo/pom.xml b/jaxws-pojo/pom.xml index f3c9b2973b..4b19875a77 100644 --- a/jaxws-pojo/pom.xml +++ b/jaxws-pojo/pom.xml @@ -47,7 +47,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -135,7 +135,7 @@ pom import - + diff --git a/jaxws-retail/README.md b/jaxws-retail/README.md index 311801fccb..49ecb3f364 100644 --- a/jaxws-retail/README.md +++ b/jaxws-retail/README.md @@ -3,7 +3,7 @@ jaxws-retail: A Retail JAX-WS Web Service Author: R Searls Level: Beginner Technologies: JAX-WS -Summary: The `jaxws-retail` quickstart is a working example of a simple web service endpoint. +Summary: The `jaxws-retail` quickstart is a working example of a simple web service endpoint. Target Product: JBoss EAP Source: diff --git a/jaxws-retail/client/pom.xml b/jaxws-retail/client/pom.xml index e4b91ab978..0a568e223b 100644 --- a/jaxws-retail/client/pom.xml +++ b/jaxws-retail/client/pom.xml @@ -44,7 +44,7 @@ 1.2.1 - + org.jboss.quickstarts.eap @@ -65,7 +65,7 @@ org.jboss.quickstarts.ws.client.Client - + diff --git a/jaxws-retail/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java b/jaxws-retail/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java index b411a7108d..5e16bfb271 100644 --- a/jaxws-retail/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java +++ b/jaxws-retail/client/src/main/java/org/jboss/quickstarts/ws/client/Client.java @@ -31,7 +31,7 @@ */ public class Client { - public static void main (String [] args) + public static void main(String[] args) { String endPointAddress = "http://localhost:8080/jboss-jaxws-retail/ProfileMgmtService/ProfileMgmt"; QName serviceName = new QName("http://org.jboss.ws/samples/retail/profile", "ProfileMgmtService"); diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml index 6ed5d7f10d..0367af6667 100644 --- a/jaxws-retail/pom.xml +++ b/jaxws-retail/pom.xml @@ -47,7 +47,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/jaxws-retail/service/pom.xml b/jaxws-retail/service/pom.xml index c25809364a..30c8b37f6f 100644 --- a/jaxws-retail/service/pom.xml +++ b/jaxws-retail/service/pom.xml @@ -26,7 +26,7 @@ 7.0.0-SNAPSHOT ../pom.xml - + jboss-jaxws-retail-service diff --git a/jaxws-retail/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java b/jaxws-retail/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java index bb408b0813..0b1ea1a0ed 100644 --- a/jaxws-retail/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java +++ b/jaxws-retail/service/src/main/java/org/jboss/quickstarts/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java @@ -29,15 +29,14 @@ * @author rsearls@redhat.com */ @Stateless -@WebService ( - name="ProfileMgmt", +@WebService( + name = "ProfileMgmt", targetNamespace = "http://org.jboss.ws/samples/retail/profile", - serviceName = "ProfileMgmtService" -) -@SOAPBinding (parameterStyle = SOAPBinding.ParameterStyle.BARE) + serviceName = "ProfileMgmtService") +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) public class ProfileMgmtBean { @WebMethod - public DiscountResponse getCustomerDiscount(DiscountRequest request){ + public DiscountResponse getCustomerDiscount(DiscountRequest request) { DiscountResponse dResponse = new DiscountResponse(); dResponse.setCustomer(request.getCustomer()); dResponse.setDiscount(10.00); diff --git a/jsonp/pom.xml b/jsonp/pom.xml index 0e4bcbfe82..6ab0c7dea4 100644 --- a/jsonp/pom.xml +++ b/jsonp/pom.xml @@ -43,7 +43,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -92,16 +92,16 @@ - - UTF-8 1.0.2.Final - 7.0.0-build-7 @@ -118,8 +118,8 @@ @@ -135,9 +135,9 @@ - - + org.jboss.spec.javax.json @@ -145,7 +145,7 @@ provided - javax.enterprise @@ -153,7 +153,7 @@ provided - org.jboss.spec.javax.annotation @@ -161,7 +161,7 @@ provided - org.jboss.spec.javax.ws.rs @@ -169,7 +169,7 @@ provided - org.hibernate.javax.persistence @@ -177,7 +177,7 @@ provided - org.jboss.spec.javax.ejb @@ -186,7 +186,7 @@ - org.jboss.spec.javax.faces @@ -205,7 +205,7 @@ - org.jboss.arquillian.junit @@ -222,7 +222,7 @@ - ${project.artifactId} @@ -246,9 +246,9 @@ - - default @@ -299,11 +299,11 @@ - - - openshift diff --git a/jsonp/src/main/java/org/jboss/as/quickstarts/jsonp/JsonController.java b/jsonp/src/main/java/org/jboss/as/quickstarts/jsonp/JsonController.java index b973a2d668..2dd8dee2b5 100644 --- a/jsonp/src/main/java/org/jboss/as/quickstarts/jsonp/JsonController.java +++ b/jsonp/src/main/java/org/jboss/as/quickstarts/jsonp/JsonController.java @@ -55,26 +55,26 @@ public void generateJson() { .build().toString(); } - public void parseJsonStream(){ + public void parseJsonStream() { StringBuilder sb = new StringBuilder(); String json = getJsonString(); try { JsonParser parser = Json.createParser(new StringReader(json)); - while (parser.hasNext()){ + while (parser.hasNext()) { Event event = parser.next(); - if (event.equals(Event.KEY_NAME)){ + if (event.equals(Event.KEY_NAME)) { sb.append(" - - - - > Key: " + parser.getString() + " < - - - - - \n"); } - if (event.equals(Event.VALUE_STRING)){ + if (event.equals(Event.VALUE_STRING)) { sb.append("Value as String: " + parser.getString() + "\n"); } - if (event.equals(Event.VALUE_NUMBER)){ + if (event.equals(Event.VALUE_NUMBER)) { sb.append("Value as Number: " + parser.getInt() + "\n"); } - if (event.equals(Event.VALUE_TRUE)){ + if (event.equals(Event.VALUE_TRUE)) { sb.append("Value as Boolean: true\n"); } - if (event.equals(Event.VALUE_FALSE)){ + if (event.equals(Event.VALUE_FALSE)) { sb.append("Value as Boolean: false \n"); } } diff --git a/jta-crash-rec/pom.xml b/jta-crash-rec/pom.xml index 3ef98c0c14..682f018a2a 100644 --- a/jta-crash-rec/pom.xml +++ b/jta-crash-rec/pom.xml @@ -40,7 +40,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -89,9 +89,9 @@ - - UTF-8 @@ -133,28 +133,28 @@ cdi-api provided - + org.hibernate.javax.persistence hibernate-jpa-2.1-api provided - + org.jboss.spec.javax.ejb jboss-ejb-api_3.2_spec provided - + org.jboss.spec.javax.jms jboss-jms-api_2.0_spec provided - + org.jboss.spec.javax.transaction @@ -163,7 +163,7 @@ - org.jboss.spec.javax.annotation @@ -171,7 +171,7 @@ provided - org.jboss.spec.javax.servlet @@ -181,7 +181,7 @@ - ${project.artifactId} @@ -189,7 +189,7 @@ maven-war-plugin ${version.war.plugin} - false diff --git a/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/DbUpdaterMDB.java b/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/DbUpdaterMDB.java index d11951ed92..964bc7f9d2 100644 --- a/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/DbUpdaterMDB.java +++ b/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/DbUpdaterMDB.java @@ -37,9 +37,9 @@ * */ @MessageDriven(name = "DbUpdaterMDB", activationConfig = { - @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), - @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/jta-crash-rec-quickstart"), - @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") }) + @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), + @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/jta-crash-rec-quickstart"), + @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") }) public class DbUpdaterMDB implements MessageListener { private final static Logger LOGGER = Logger.getLogger(DbUpdaterMDB.class.getName()); diff --git a/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/XAService.java b/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/XAService.java index c4939e6d55..39725c13b1 100644 --- a/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/XAService.java +++ b/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/XAService.java @@ -190,7 +190,7 @@ public String updateKeyValueDatabase(boolean delete, String key, String value) { } finally { try { if (userTransaction.getStatus() == Status.STATUS_ACTIVE - || userTransaction.getStatus() == Status.STATUS_MARKED_ROLLBACK) + || userTransaction.getStatus() == Status.STATUS_MARKED_ROLLBACK) userTransaction.rollback(); } catch (Throwable e) { result.append(" Transaction did not finish: ").append(e.getMessage()); diff --git a/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/XAServlet.java b/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/XAServlet.java index d7d741c25a..3d49cde743 100644 --- a/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/XAServlet.java +++ b/jta-crash-rec/src/main/java/org/jboss/as/quickstarts/xa/XAServlet.java @@ -46,45 +46,45 @@ public class XAServlet extends HttpServlet { // page content describing the quickstart and providing a form to perform basic operations against a database private static String PAGE_CONTENT = "

XA Recovery

" + - "

This quickstart demonstrates how to atomically update multiple resources within one XA transaction. " + - "It updates a relational database table using JPA and sends a message using JMS. " + - "In this example, you can perform the following operations:

" + - "
    " + - "
  • To add a key/value pair, enter values in the input text boxes and click Submit
    • " + - "
  • To update a key/value pair, enter the key and click Submit
    • " + - "
  • To delete a key/value pair, enter the key and click Delete
    • " + - "
  • To delete all key/value pairs, leave the key blank and click Delete
    • " + - "
  • To list the existing key/value pairs, leave the key blank and click Submit
    • " + - "
  • The refresh the list, click the Refresh Table link.
    • " + - "
" + + "

This quickstart demonstrates how to atomically update multiple resources within one XA transaction. " + + "It updates a relational database table using JPA and sends a message using JMS. " + + "In this example, you can perform the following operations:

" + + "
    " + + "
  • To add a key/value pair, enter values in the input text boxes and click Submit
    • " + + "
  • To update a key/value pair, enter the key and click Submit
    • " + + "
  • To delete a key/value pair, enter the key and click Delete
    • " + + "
  • To delete all key/value pairs, leave the key blank and click Delete
    • " + + "
  • To list the existing key/value pairs, leave the key blank and click Submit
    • " + + "
  • The refresh the list, click the Refresh Table link.
    • " + + "
" + - "

To demonstrate XA recovery, you will take the following steps:

" + - "
    " + - "
  1. Add a key/value as described above.
    2. " + - "
  2. Stop the JBoss EAP server.
    3. " + - "
  3. Clear any transaction objectstore data remaining from previous tests.
    4. " + - "
  4. Configure Byteman to halt the JBoss EAP server.
    5. " + - "
  5. Start the JBoss EAP server.
    6. " + - "
  6. Add another key/value. This will cause Byteman to halt the JBoss EAP server.
    7. " + - "
  7. Verify the database record.
    8. " + - "
  8. Disable Byteman.
    9. " + - "
  9. Start the JBoss EAP server.
    10. " + - "
  10. View the resulting recovered row in the table, indicated by the text \"updated via JMS\".
    11. " + - "
"+ - "

" + - "

See the README file located in the root of jta-crash-rec folder in the quickstart distribution " + - "for complete instructions and details about how this quickstart works.

" + + "

To demonstrate XA recovery, you will take the following steps:

" + + "
    " + + "
  1. Add a key/value as described above.
    2. " + + "
  2. Stop the JBoss EAP server.
    3. " + + "
  3. Clear any transaction objectstore data remaining from previous tests.
    4. " + + "
  4. Configure Byteman to halt the JBoss EAP server.
    5. " + + "
  5. Start the JBoss EAP server.
    6. " + + "
  6. Add another key/value. This will cause Byteman to halt the JBoss EAP server.
    7. " + + "
  7. Verify the database record.
    8. " + + "
  8. Disable Byteman.
    9. " + + "
  9. Start the JBoss EAP server.
    10. " + + "
  10. View the resulting recovered row in the table, indicated by the text \"updated via JMS\".
    11. " + + "
" + + "

" + + "

See the README file located in the root of jta-crash-rec folder in the quickstart distribution " + + "for complete instructions and details about how this quickstart works.

" + - "
" + - "Key: " + - " (Leave blank to list all key/value pairs).
" + - "Value:
" + - "" + - " Add or update a pair (or list all pairs if key is blank).
" + - "" + - " Delete a pair (or all pairs if key is blank).
" + - "
" + - "

Refresh Table

"; + "
" + + "Key: " + + " (Leave blank to list all key/value pairs).
" + + "Value:
" + + "" + + " Add or update a pair (or list all pairs if key is blank).
" + + "" + + " Delete a pair (or all pairs if key is blank).
" + + "
" + + "

Refresh Table

"; private static String PAGE_FOOTER = ""; diff --git a/jta-crash-rec/src/main/resources/META-INF/persistence.xml b/jta-crash-rec/src/main/resources/META-INF/persistence.xml index 1ee1c78292..6c4658e15c 100644 --- a/jta-crash-rec/src/main/resources/META-INF/persistence.xml +++ b/jta-crash-rec/src/main/resources/META-INF/persistence.xml @@ -23,7 +23,7 @@ java:jboss/datasources/JTACrashRecQuickstartDS - diff --git a/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml b/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml index 34e3d0824d..4b8daeb212 100644 --- a/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml +++ b/jta-crash-rec/src/main/webapp/WEB-INF/beans.xml @@ -18,6 +18,6 @@ diff --git a/jta-crash-rec/src/main/webapp/WEB-INF/jta-crash-rec-quickstart-ds.xml b/jta-crash-rec/src/main/webapp/WEB-INF/jta-crash-rec-quickstart-ds.xml index 4ae9959165..f7fde18fa0 100644 --- a/jta-crash-rec/src/main/webapp/WEB-INF/jta-crash-rec-quickstart-ds.xml +++ b/jta-crash-rec/src/main/webapp/WEB-INF/jta-crash-rec-quickstart-ds.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/jts/application-component-1/pom.xml b/jts/application-component-1/pom.xml index b44ff2a17b..9a3f4fbc66 100644 --- a/jts/application-component-1/pom.xml +++ b/jts/application-component-1/pom.xml @@ -84,7 +84,7 @@ - ${project.artifactId} @@ -93,7 +93,7 @@ maven-war-plugin ${version.war.plugin} - false diff --git a/jts/application-component-1/src/main/java/org/jboss/as/quickstarts/cmt/controller/CustomerManager.java b/jts/application-component-1/src/main/java/org/jboss/as/quickstarts/cmt/controller/CustomerManager.java index 178fef839f..d16968f381 100644 --- a/jts/application-component-1/src/main/java/org/jboss/as/quickstarts/cmt/controller/CustomerManager.java +++ b/jts/application-component-1/src/main/java/org/jboss/as/quickstarts/cmt/controller/CustomerManager.java @@ -41,7 +41,7 @@ public class CustomerManager { private CustomerManagerEJB customerManager; public List getCustomers() throws SecurityException, IllegalStateException, NamingException, - NotSupportedException, SystemException, RollbackException, HeuristicMixedException, HeuristicRollbackException { + NotSupportedException, SystemException, RollbackException, HeuristicMixedException, HeuristicRollbackException { return customerManager.listCustomers(); } diff --git a/jts/application-component-1/src/main/resources/META-INF/persistence.xml b/jts/application-component-1/src/main/resources/META-INF/persistence.xml index 18befaf7e8..6f095369f7 100644 --- a/jts/application-component-1/src/main/resources/META-INF/persistence.xml +++ b/jts/application-component-1/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - diff --git a/jts/application-component-1/src/main/webapp/WEB-INF/beans.xml b/jts/application-component-1/src/main/webapp/WEB-INF/beans.xml index f2a9ad4a32..5c0dbc2d7d 100644 --- a/jts/application-component-1/src/main/webapp/WEB-INF/beans.xml +++ b/jts/application-component-1/src/main/webapp/WEB-INF/beans.xml @@ -16,6 +16,6 @@ --> diff --git a/jts/application-component-1/src/main/webapp/WEB-INF/jts-quickstart-ds.xml b/jts/application-component-1/src/main/webapp/WEB-INF/jts-quickstart-ds.xml index fb365f7c6f..b849b913e1 100644 --- a/jts/application-component-1/src/main/webapp/WEB-INF/jts-quickstart-ds.xml +++ b/jts/application-component-1/src/main/webapp/WEB-INF/jts-quickstart-ds.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - localhost diff --git a/jts/application-component-2/pom.xml b/jts/application-component-2/pom.xml index 747a421910..5b12048684 100644 --- a/jts/application-component-2/pom.xml +++ b/jts/application-component-2/pom.xml @@ -67,7 +67,7 @@ - ${project.artifactId} diff --git a/jts/application-component-2/src/main/java/org/jboss/as/quickstarts/cmt/jts/ejb/InvoiceManagerEJBImpl.java b/jts/application-component-2/src/main/java/org/jboss/as/quickstarts/cmt/jts/ejb/InvoiceManagerEJBImpl.java index b94d3135e7..21ed21efd9 100644 --- a/jts/application-component-2/src/main/java/org/jboss/as/quickstarts/cmt/jts/ejb/InvoiceManagerEJBImpl.java +++ b/jts/application-component-2/src/main/java/org/jboss/as/quickstarts/cmt/jts/ejb/InvoiceManagerEJBImpl.java @@ -30,15 +30,15 @@ @Stateless public class InvoiceManagerEJBImpl { - @Inject - @JMSConnectionFactory("java:/JmsXA") - private JMSContext jmsContext; - @Resource(lookup = "java:/queue/jts-quickstart") - private Queue queue; + @Inject + @JMSConnectionFactory("java:/JmsXA") + private JMSContext jmsContext; + @Resource(lookup = "java:/queue/jts-quickstart") + private Queue queue; - @TransactionAttribute(TransactionAttributeType.MANDATORY) - public void createInvoice(String name) { - jmsContext.createProducer().send(queue, "Created invoice for customer named: " + name); + @TransactionAttribute(TransactionAttributeType.MANDATORY) + public void createInvoice(String name) { + jmsContext.createProducer().send(queue, "Created invoice for customer named: " + name); - } + } } diff --git a/jts/application-component-2/src/main/java/org/jboss/as/quickstarts/cmt/jts/mdb/HelloWorldMDB.java b/jts/application-component-2/src/main/java/org/jboss/as/quickstarts/cmt/jts/mdb/HelloWorldMDB.java index 36886cfce1..a08eddaa9d 100644 --- a/jts/application-component-2/src/main/java/org/jboss/as/quickstarts/cmt/jts/mdb/HelloWorldMDB.java +++ b/jts/application-component-2/src/main/java/org/jboss/as/quickstarts/cmt/jts/mdb/HelloWorldMDB.java @@ -35,27 +35,27 @@ * */ @MessageDriven(name = "HelloWorldMDB", activationConfig = { - @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), - @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/jts-quickstart"), - @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") }) + @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), + @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/jts-quickstart"), + @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") }) public class HelloWorldMDB implements MessageListener { - private final static Logger LOGGER = Logger.getLogger(HelloWorldMDB.class.toString()); + private final static Logger LOGGER = Logger.getLogger(HelloWorldMDB.class.toString()); - /** - * @see MessageListener#onMessage(Message) - */ - public void onMessage(Message rcvMessage) { - TextMessage msg = null; - try { - if (rcvMessage instanceof TextMessage) { - msg = (TextMessage) rcvMessage; - LOGGER.info("Received Message: " + msg.getText()); - } else { - LOGGER.warning("Message of wrong type: " + rcvMessage.getClass().getName()); - } - } catch (JMSException e) { - throw new RuntimeException(e); - } - } + /** + * @see MessageListener#onMessage(Message) + */ + public void onMessage(Message rcvMessage) { + TextMessage msg = null; + try { + if (rcvMessage instanceof TextMessage) { + msg = (TextMessage) rcvMessage; + LOGGER.info("Received Message: " + msg.getText()); + } else { + LOGGER.warning("Message of wrong type: " + rcvMessage.getClass().getName()); + } + } catch (JMSException e) { + throw new RuntimeException(e); + } + } } diff --git a/jts/application-component-2/src/main/resources/META-INF/beans.xml b/jts/application-component-2/src/main/resources/META-INF/beans.xml index 6cf5f54f2c..5c0dbc2d7d 100644 --- a/jts/application-component-2/src/main/resources/META-INF/beans.xml +++ b/jts/application-component-2/src/main/resources/META-INF/beans.xml @@ -16,6 +16,6 @@ --> - \ No newline at end of file + diff --git a/jts/pom.xml b/jts/pom.xml index 21a9d616e3..06a9059a17 100644 --- a/jts/pom.xml +++ b/jts/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,16 +90,16 @@ - - UTF-8 - + - + 1.0.2.Final - + 1.0.3.Final @@ -112,7 +112,7 @@ - application-component-2 application-component-1 @@ -120,10 +120,10 @@ - org.jboss.spec diff --git a/kitchensink-ear/ear/pom.xml b/kitchensink-ear/ear/pom.xml index 705cc21e7f..a5ad0060c0 100644 --- a/kitchensink-ear/ear/pom.xml +++ b/kitchensink-ear/ear/pom.xml @@ -63,12 +63,12 @@ 6 - lib - - org.wildfly.plugins @@ -95,7 +95,7 @@ - + diff --git a/kitchensink-ear/ear/src/main/application/META-INF/kitchensink-ear-quickstart-ds.xml b/kitchensink-ear/ear/src/main/application/META-INF/kitchensink-ear-quickstart-ds.xml index 689ddda2b7..a16fe747d8 100644 --- a/kitchensink-ear/ear/src/main/application/META-INF/kitchensink-ear-quickstart-ds.xml +++ b/kitchensink-ear/ear/src/main/application/META-INF/kitchensink-ear-quickstart-ds.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - @@ -33,4 +33,4 @@ - + diff --git a/kitchensink-ear/ejb/pom.xml b/kitchensink-ear/ejb/pom.xml index 7a30ad0b2a..e4f954f243 100644 --- a/kitchensink-ear/ejb/pom.xml +++ b/kitchensink-ear/ejb/pom.xml @@ -40,7 +40,7 @@ - @@ -82,18 +82,18 @@ - org.jboss.arquillian.junit arquillian-junit-container test - + org.jboss.arquillian.protocol arquillian-protocol-servlet - test + test @@ -114,9 +114,9 @@ - - default @@ -136,9 +136,9 @@ - - arq-wildfly-managed @@ -152,7 +152,7 @@ - arq-wildfly-remote diff --git a/kitchensink-ear/ejb/src/main/resources/META-INF/beans.xml b/kitchensink-ear/ejb/src/main/resources/META-INF/beans.xml index 1db43fddff..9b84e92316 100644 --- a/kitchensink-ear/ejb/src/main/resources/META-INF/beans.xml +++ b/kitchensink-ear/ejb/src/main/resources/META-INF/beans.xml @@ -16,6 +16,6 @@ limitations under the License. --> diff --git a/kitchensink-ear/ejb/src/main/resources/META-INF/persistence.xml b/kitchensink-ear/ejb/src/main/resources/META-INF/persistence.xml index 56aba4bada..9fa80f2156 100644 --- a/kitchensink-ear/ejb/src/main/resources/META-INF/persistence.xml +++ b/kitchensink-ear/ejb/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - diff --git a/kitchensink-ear/ejb/src/test/java/org/jboss/as/quickstarts/kitchensink_ear/test/MemberRegistrationTest.java b/kitchensink-ear/ejb/src/test/java/org/jboss/as/quickstarts/kitchensink_ear/test/MemberRegistrationTest.java index 69136d463b..b75de5b3b4 100644 --- a/kitchensink-ear/ejb/src/test/java/org/jboss/as/quickstarts/kitchensink_ear/test/MemberRegistrationTest.java +++ b/kitchensink-ear/ejb/src/test/java/org/jboss/as/quickstarts/kitchensink_ear/test/MemberRegistrationTest.java @@ -39,11 +39,11 @@ public class MemberRegistrationTest { @Deployment public static Archive createTestArchive() { return ShrinkWrap.create(WebArchive.class, "test.war") - .addClasses(Member.class, MemberRegistration.class, Resources.class) - .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - // Deploy our test datasource - .addAsWebInfResource("test-ds.xml", "test-ds.xml"); + .addClasses(Member.class, MemberRegistration.class, Resources.class) + .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + // Deploy our test datasource + .addAsWebInfResource("test-ds.xml", "test-ds.xml"); } @Inject diff --git a/kitchensink-ear/ejb/src/test/resources/META-INF/test-persistence.xml b/kitchensink-ear/ejb/src/test/resources/META-INF/test-persistence.xml index 0ca30163a7..a7cdd561b0 100644 --- a/kitchensink-ear/ejb/src/test/resources/META-INF/test-persistence.xml +++ b/kitchensink-ear/ejb/src/test/resources/META-INF/test-persistence.xml @@ -21,10 +21,10 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - - java:jboss/datasources/KitchensinkEarQuickstartTestDS diff --git a/kitchensink-ear/ejb/src/test/resources/test-ds.xml b/kitchensink-ear/ejb/src/test/resources/test-ds.xml index 5702713e67..0a2124a7ae 100644 --- a/kitchensink-ear/ejb/src/test/resources/test-ds.xml +++ b/kitchensink-ear/ejb/src/test/resources/test-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/kitchensink-ear/pom.xml b/kitchensink-ear/pom.xml index 8f229e33bf..e7c296f6a5 100644 --- a/kitchensink-ear/pom.xml +++ b/kitchensink-ear/pom.xml @@ -40,7 +40,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -89,9 +89,9 @@ - - UTF-8 @@ -121,7 +121,7 @@ - org.jboss.quickstarts.eap @@ -129,8 +129,8 @@ ${project.version} ejb - - org.jboss.quickstarts.eap @@ -140,11 +140,11 @@ compile - org.jboss.bom @@ -161,8 +161,8 @@ - org.wildfly.plugins diff --git a/kitchensink-ear/web/pom.xml b/kitchensink-ear/web/pom.xml index bb796dc341..1b55a537e2 100644 --- a/kitchensink-ear/web/pom.xml +++ b/kitchensink-ear/web/pom.xml @@ -61,7 +61,7 @@ cdi-api provided - + org.jboss.spec.javax.faces diff --git a/kitchensink-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/controller/MemberController.java b/kitchensink-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/controller/MemberController.java index aa08536edb..b5d4306866 100644 --- a/kitchensink-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/controller/MemberController.java +++ b/kitchensink-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/controller/MemberController.java @@ -52,7 +52,7 @@ public void register() throws Exception { try { memberRegistration.register(newMember); facesContext.addMessage(null, - new FacesMessage(FacesMessage.SEVERITY_INFO, "Registered!", "Registration successful")); + new FacesMessage(FacesMessage.SEVERITY_INFO, "Registered!", "Registration successful")); initNewMember(); } catch (Exception e) { String errorMessage = getRootErrorMessage(e); diff --git a/kitchensink-ear/web/src/main/webapp/WEB-INF/beans.xml b/kitchensink-ear/web/src/main/webapp/WEB-INF/beans.xml index 10dc724f5f..c82af63645 100644 --- a/kitchensink-ear/web/src/main/webapp/WEB-INF/beans.xml +++ b/kitchensink-ear/web/src/main/webapp/WEB-INF/beans.xml @@ -16,9 +16,9 @@ limitations under the License. --> - diff --git a/kitchensink-ear/web/src/main/webapp/WEB-INF/faces-config.xml b/kitchensink-ear/web/src/main/webapp/WEB-INF/faces-config.xml index 4037c8c00c..c4497af3ed 100644 --- a/kitchensink-ear/web/src/main/webapp/WEB-INF/faces-config.xml +++ b/kitchensink-ear/web/src/main/webapp/WEB-INF/faces-config.xml @@ -24,7 +24,7 @@ - diff --git a/kitchensink-html5-mobile/.cheatsheet.xml b/kitchensink-html5-mobile/.cheatsheet.xml index 054f89e9a6..6dba95b870 100644 --- a/kitchensink-html5-mobile/.cheatsheet.xml +++ b/kitchensink-html5-mobile/.cheatsheet.xml @@ -1,4 +1,4 @@ - + - + - + @@ -700,19 +700,19 @@ required="false" serialization="org.jboss.tools.project.examples.cheatsheet.openFileInEditor(path=/${currentProject}/src/test/java/org/jboss/as/quickstarts/html5_mobile/test/MemberRegistrationTest.java,fromLine=68,toLine=76)"/> - + - + - As you can see, Arquillian has lived up to the promise - the test case is focused on what to test - (the @Deployment method) and how to test (the @Test method). + As you can see, Arquillian has lived up to the promise - the test case is focused on what to test + (the @Deployment method) and how to test (the @Test method). It's also worth noting that this isn't a simplistic unit test - this is a fully fledged integration test that uses the database.

- Now, let's look at how we configure Arquillian. + Now, let's look at how we configure Arquillian. First of all, let's take a look at arquillian.xml in src/test/resources. - + @@ -746,13 +746,13 @@ required="false" serialization="org.jboss.tools.project.examples.cheatsheet.openFileInEditor(path=/${currentProject}/pom.xml,fromLine=325,toLine=347)"/> - + - And that's it! As you can see Arquillian delivers simple and true testing. + And that's it! As you can see Arquillian delivers simple and true testing. You can concentrate on writing your test functionality, and run your tests in the same environment in which you will run your application.

Arquillian also offers other containers, allowing you to run your tests against Weld Embedded (super fast, but your enterprise services are mocked), GlassFish, and more. @@ -763,19 +763,19 @@ required="false" serialization="org.eclipse.ui.browser.openBrowser(url=http://www.jboss.org/arquillian)"/> - + - What we didn't tell you about the kitchensink-html5-mobile quickstart is that it is generated from a Maven archetype. + What we didn't tell you about the kitchensink-html5-mobile quickstart is that it is generated from a Maven archetype. You can use this archetype to generate your own project.

Simply select Help>JBoss Central and click the HTML5 Project wizard.
- You will get a brand new project with the same functionality as kitchensink-html5-mobile, + You will get a brand new project with the same functionality as kitchensink-html5-mobile, but customized with your details. - + diff --git a/kitchensink-html5-mobile/README.md b/kitchensink-html5-mobile/README.md index dffe97d3e0..e399f2cd52 100644 --- a/kitchensink-html5-mobile/README.md +++ b/kitchensink-html5-mobile/README.md @@ -4,8 +4,8 @@ Author: Jay Balunas Level: Beginner Technologies: CDI, HTML5, REST Summary: The `kitchensink-html5-mobile` quickstart is based on `kitchensink`, but uses HTML5 and jQuery Mobile, making it suitable for mobile and tablet computers. -Target Product: JBoss EAP -Source: +Target Product: JBoss EAP +Source: What is it? ----------- diff --git a/kitchensink-html5-mobile/pom.xml b/kitchensink-html5-mobile/pom.xml index c1b3309a67..a56298a837 100644 --- a/kitchensink-html5-mobile/pom.xml +++ b/kitchensink-html5-mobile/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/kitchensink-html5-mobile/src/main/java/org/jboss/as/quickstarts/html5_mobile/util/JSONPRequestFilter.java b/kitchensink-html5-mobile/src/main/java/org/jboss/as/quickstarts/html5_mobile/util/JSONPRequestFilter.java index 03dbadb606..5ee2be6528 100644 --- a/kitchensink-html5-mobile/src/main/java/org/jboss/as/quickstarts/html5_mobile/util/JSONPRequestFilter.java +++ b/kitchensink-html5-mobile/src/main/java/org/jboss/as/quickstarts/html5_mobile/util/JSONPRequestFilter.java @@ -57,7 +57,7 @@ public void init(FilterConfig config) throws ServletException { @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, - ServletException { + ServletException { if (!(request instanceof HttpServletRequest)) { throw new ServletException("Only HttpServletRequest requests are supported"); diff --git a/kitchensink-html5-mobile/src/main/resources/META-INF/persistence.xml b/kitchensink-html5-mobile/src/main/resources/META-INF/persistence.xml index 506e4b0026..4179a2452c 100644 --- a/kitchensink-html5-mobile/src/main/resources/META-INF/persistence.xml +++ b/kitchensink-html5-mobile/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - java:jboss/datasources/KitchensinkHTML5MobileQuickstartDS diff --git a/kitchensink-html5-mobile/src/main/webapp/WEB-INF/beans.xml b/kitchensink-html5-mobile/src/main/webapp/WEB-INF/beans.xml index e392280844..6b2c62fc13 100644 --- a/kitchensink-html5-mobile/src/main/webapp/WEB-INF/beans.xml +++ b/kitchensink-html5-mobile/src/main/webapp/WEB-INF/beans.xml @@ -16,7 +16,7 @@ limitations under the License. --> - - - + diff --git a/kitchensink-html5-mobile/src/test/java/org/jboss/as/quickstarts/html5_mobile/test/MemberRegistrationTest.java b/kitchensink-html5-mobile/src/test/java/org/jboss/as/quickstarts/html5_mobile/test/MemberRegistrationTest.java index 662147ceed..1b1620e780 100644 --- a/kitchensink-html5-mobile/src/test/java/org/jboss/as/quickstarts/html5_mobile/test/MemberRegistrationTest.java +++ b/kitchensink-html5-mobile/src/test/java/org/jboss/as/quickstarts/html5_mobile/test/MemberRegistrationTest.java @@ -51,12 +51,12 @@ public class MemberRegistrationTest { @Deployment public static Archive createTestArchive() { return ShrinkWrap - .create(WebArchive.class, "test.war") - .addClasses(Member.class, MemberService.class, MemberRepository.class, MemberRegistration.class, - Resources.class) - .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - .addAsWebInfResource("arquillian-ds.xml"); + .create(WebArchive.class, "test.war") + .addClasses(Member.class, MemberService.class, MemberRepository.class, MemberRegistration.class, + Resources.class) + .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + .addAsWebInfResource("arquillian-ds.xml"); } @Inject @@ -85,7 +85,7 @@ public void testInvalidRegister() throws Exception { assertEquals("Unexpected response status", 400, response.getStatus()); assertNotNull("response.getEntity() should not null", response.getEntity()); assertEquals("Unexpected response.getEntity(). It contains " + response.getEntity(), 3, - ((Map) response.getEntity()).size()); + ((Map) response.getEntity()).size()); log.info("Invalid member register attempt failed with return code " + response.getStatus()); } @@ -104,7 +104,7 @@ public void testDuplicateEmail() throws Exception { assertEquals("Unexpected response status", 409, response.getStatus()); assertNotNull("response.getEntity() should not null", response.getEntity()); assertEquals("Unexpected response.getEntity(). It contains" + response.getEntity(), 1, - ((Map) response.getEntity()).size()); + ((Map) response.getEntity()).size()); log.info("Duplicate member register attempt failed with return code " + response.getStatus()); } diff --git a/kitchensink-html5-mobile/src/test/resources/META-INF/test-persistence.xml b/kitchensink-html5-mobile/src/test/resources/META-INF/test-persistence.xml index b986ec3b4b..5d0d7d497a 100644 --- a/kitchensink-html5-mobile/src/test/resources/META-INF/test-persistence.xml +++ b/kitchensink-html5-mobile/src/test/resources/META-INF/test-persistence.xml @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/kitchensink-html5-mobile/src/test/resources/arquillian-ds.xml b/kitchensink-html5-mobile/src/test/resources/arquillian-ds.xml index 47b3da3324..0b017d14d5 100644 --- a/kitchensink-html5-mobile/src/test/resources/arquillian-ds.xml +++ b/kitchensink-html5-mobile/src/test/resources/arquillian-ds.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - \ No newline at end of file + diff --git a/kitchensink-jsp/pom.xml b/kitchensink-jsp/pom.xml index ad77c733e8..521a7e6537 100644 --- a/kitchensink-jsp/pom.xml +++ b/kitchensink-jsp/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,16 +90,16 @@ - - UTF-8 - + 1.0.2.Final - + 7.0.0-build-7 @@ -117,11 +117,11 @@ - org.jboss.bom @@ -136,7 +136,7 @@ - @@ -146,7 +146,7 @@ provided - org.jboss.spec.javax.annotation @@ -154,7 +154,7 @@ provided - org.jboss.spec.javax.servlet @@ -208,7 +208,7 @@ - org.hibernate @@ -224,7 +224,7 @@ - org.jboss.arquillian.junit @@ -241,7 +241,7 @@ - ${project.artifactId} @@ -249,12 +249,12 @@ maven-war-plugin ${version.war.plugin} - false - @@ -267,9 +267,9 @@ - - default @@ -289,9 +289,9 @@ - - arq-wildfly-managed @@ -305,7 +305,7 @@ - arq-wildfly-remote @@ -319,11 +319,11 @@ - - - openshift diff --git a/kitchensink-jsp/src/main/resources/META-INF/persistence.xml b/kitchensink-jsp/src/main/resources/META-INF/persistence.xml index fdab101104..5f00feb4ba 100644 --- a/kitchensink-jsp/src/main/resources/META-INF/persistence.xml +++ b/kitchensink-jsp/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - diff --git a/kitchensink-jsp/src/main/webapp/WEB-INF/beans.xml b/kitchensink-jsp/src/main/webapp/WEB-INF/beans.xml index bfb72e3d65..6b2c62fc13 100644 --- a/kitchensink-jsp/src/main/webapp/WEB-INF/beans.xml +++ b/kitchensink-jsp/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - diff --git a/kitchensink-jsp/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml b/kitchensink-jsp/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml index f23e8a4a57..36d9b3a99f 100644 --- a/kitchensink-jsp/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml +++ b/kitchensink-jsp/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/kitchensink-jsp/src/test/java/org/jboss/as/quickstarts/helloworldjsp/test/MemberRegistrationTest.java b/kitchensink-jsp/src/test/java/org/jboss/as/quickstarts/helloworldjsp/test/MemberRegistrationTest.java index 69c6912ac1..9837af6ebd 100644 --- a/kitchensink-jsp/src/test/java/org/jboss/as/quickstarts/helloworldjsp/test/MemberRegistrationTest.java +++ b/kitchensink-jsp/src/test/java/org/jboss/as/quickstarts/helloworldjsp/test/MemberRegistrationTest.java @@ -40,9 +40,9 @@ public class MemberRegistrationTest { @Deployment public static Archive createTestArchive() { return ShrinkWrap.create(WebArchive.class, "test.war") - .addClasses(Member.class, MemberRegistration.class, Resources.class) - .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml").addAsWebInfResource("test-ds.xml", "test-ds.xml"); + .addClasses(Member.class, MemberRegistration.class, Resources.class) + .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml").addAsWebInfResource("test-ds.xml", "test-ds.xml"); } @Inject diff --git a/kitchensink-jsp/src/test/resources/META-INF/test-persistence.xml b/kitchensink-jsp/src/test/resources/META-INF/test-persistence.xml index 2f81b30d62..093c54c124 100644 --- a/kitchensink-jsp/src/test/resources/META-INF/test-persistence.xml +++ b/kitchensink-jsp/src/test/resources/META-INF/test-persistence.xml @@ -21,10 +21,10 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - - java:jboss/datasources/KitchensinkJSPQuickstartTestDS diff --git a/kitchensink-jsp/src/test/resources/test-ds.xml b/kitchensink-jsp/src/test/resources/test-ds.xml index 4aa5885da8..940a6fed24 100644 --- a/kitchensink-jsp/src/test/resources/test-ds.xml +++ b/kitchensink-jsp/src/test/resources/test-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/kitchensink-ml-ear/ear/pom.xml b/kitchensink-ml-ear/ear/pom.xml index bee98421cf..6ef7543cc7 100644 --- a/kitchensink-ml-ear/ear/pom.xml +++ b/kitchensink-ml-ear/ear/pom.xml @@ -63,12 +63,12 @@ 6 - lib - - org.wildfly.plugins @@ -95,7 +95,7 @@ - + diff --git a/kitchensink-ml-ear/ear/src/main/application/META-INF/kitchensink-ear-quickstart-ds.xml b/kitchensink-ml-ear/ear/src/main/application/META-INF/kitchensink-ear-quickstart-ds.xml index fa1a77f082..5f685cf13d 100644 --- a/kitchensink-ml-ear/ear/src/main/application/META-INF/kitchensink-ear-quickstart-ds.xml +++ b/kitchensink-ml-ear/ear/src/main/application/META-INF/kitchensink-ear-quickstart-ds.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - @@ -33,4 +33,4 @@ - + diff --git a/kitchensink-ml-ear/ejb/pom.xml b/kitchensink-ml-ear/ejb/pom.xml index 46117984e1..8a1d8e1cc3 100644 --- a/kitchensink-ml-ear/ejb/pom.xml +++ b/kitchensink-ml-ear/ejb/pom.xml @@ -40,7 +40,7 @@ - @@ -80,7 +80,7 @@ provided - org.jboss.logging @@ -95,7 +95,7 @@ - org.jboss.arquillian.junit @@ -127,9 +127,9 @@ - - default @@ -149,9 +149,9 @@ - - arq-wildfly-managed @@ -165,7 +165,7 @@ - arq-wildfly-remote diff --git a/kitchensink-ml-ear/ejb/src/main/resources/META-INF/beans.xml b/kitchensink-ml-ear/ejb/src/main/resources/META-INF/beans.xml index ff09265764..57419a937d 100644 --- a/kitchensink-ml-ear/ejb/src/main/resources/META-INF/beans.xml +++ b/kitchensink-ml-ear/ejb/src/main/resources/META-INF/beans.xml @@ -17,7 +17,7 @@ --> diff --git a/kitchensink-ml-ear/ejb/src/main/resources/META-INF/persistence.xml b/kitchensink-ml-ear/ejb/src/main/resources/META-INF/persistence.xml index 6763efb500..36862f36c8 100644 --- a/kitchensink-ml-ear/ejb/src/main/resources/META-INF/persistence.xml +++ b/kitchensink-ml-ear/ejb/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - diff --git a/kitchensink-ml-ear/ejb/src/test/java/org/jboss/as/quickstarts/kitchensink_ear/test/MemberRegistrationTest.java b/kitchensink-ml-ear/ejb/src/test/java/org/jboss/as/quickstarts/kitchensink_ear/test/MemberRegistrationTest.java index 69136d463b..b75de5b3b4 100644 --- a/kitchensink-ml-ear/ejb/src/test/java/org/jboss/as/quickstarts/kitchensink_ear/test/MemberRegistrationTest.java +++ b/kitchensink-ml-ear/ejb/src/test/java/org/jboss/as/quickstarts/kitchensink_ear/test/MemberRegistrationTest.java @@ -39,11 +39,11 @@ public class MemberRegistrationTest { @Deployment public static Archive createTestArchive() { return ShrinkWrap.create(WebArchive.class, "test.war") - .addClasses(Member.class, MemberRegistration.class, Resources.class) - .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - // Deploy our test datasource - .addAsWebInfResource("test-ds.xml", "test-ds.xml"); + .addClasses(Member.class, MemberRegistration.class, Resources.class) + .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + // Deploy our test datasource + .addAsWebInfResource("test-ds.xml", "test-ds.xml"); } @Inject diff --git a/kitchensink-ml-ear/ejb/src/test/resources/META-INF/test-persistence.xml b/kitchensink-ml-ear/ejb/src/test/resources/META-INF/test-persistence.xml index 014f5d9ae1..0c5411a813 100644 --- a/kitchensink-ml-ear/ejb/src/test/resources/META-INF/test-persistence.xml +++ b/kitchensink-ml-ear/ejb/src/test/resources/META-INF/test-persistence.xml @@ -21,10 +21,10 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - - java:jboss/datasources/KitchensinkMlEarQuickstartTestDS diff --git a/kitchensink-ml-ear/ejb/src/test/resources/test-ds.xml b/kitchensink-ml-ear/ejb/src/test/resources/test-ds.xml index 993180cb38..d21aa62ff6 100644 --- a/kitchensink-ml-ear/ejb/src/test/resources/test-ds.xml +++ b/kitchensink-ml-ear/ejb/src/test/resources/test-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/kitchensink-ml-ear/pom.xml b/kitchensink-ml-ear/pom.xml index 0281b73700..61fd69c1ed 100644 --- a/kitchensink-ml-ear/pom.xml +++ b/kitchensink-ml-ear/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,9 +90,9 @@ - - UTF-8 @@ -104,7 +104,7 @@ jdt_apt - + 2.8 2.3 @@ -125,7 +125,7 @@ - org.jboss.quickstarts.eap @@ -134,7 +134,7 @@ ejb - org.jboss.quickstarts.eap @@ -144,11 +144,11 @@ compile - org.jboss.bom @@ -166,8 +166,8 @@ - org.wildfly.plugins diff --git a/kitchensink-ml-ear/web/pom.xml b/kitchensink-ml-ear/web/pom.xml index 93ed8e7af6..809aded3c7 100644 --- a/kitchensink-ml-ear/web/pom.xml +++ b/kitchensink-ml-ear/web/pom.xml @@ -61,7 +61,7 @@ cdi-api provided - + org.jboss.spec.javax.faces @@ -83,7 +83,7 @@ provided - org.jboss.logging diff --git a/kitchensink-ml-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/controller/MemberController.java b/kitchensink-ml-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/controller/MemberController.java index 70c91ded2c..a19a064236 100644 --- a/kitchensink-ml-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/controller/MemberController.java +++ b/kitchensink-ml-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/controller/MemberController.java @@ -45,7 +45,7 @@ public class MemberController { private Member newMember; private KitchensinkMessages messages = Messages.getBundle(KitchensinkMessages.class, FacesContext.getCurrentInstance() - .getViewRoot().getLocale()); + .getViewRoot().getLocale()); @Produces @Named @@ -57,7 +57,7 @@ public void register() throws Exception { try { memberRegistration.register(newMember); FacesMessage m = new FacesMessage(FacesMessage.SEVERITY_INFO, (String) messages.registeredMessage(), - messages.registerSuccessfulMessage()); + messages.registerSuccessfulMessage()); facesContext.addMessage(null, m); initNewMember(); } catch (Exception e) { diff --git a/kitchensink-ml-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/util/WebResources.java b/kitchensink-ml-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/util/WebResources.java index 71070a51d0..a765961a4e 100644 --- a/kitchensink-ml-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/util/WebResources.java +++ b/kitchensink-ml-ear/web/src/main/java/org/jboss/as/quickstarts/kitchensink_ear/util/WebResources.java @@ -45,7 +45,7 @@ public FacesContext produceFacesContext() { @Produces public ResourceBundle produceResourceBundle() { return ResourceBundle.getBundle("org.jboss.as.quickstarts.kitchensink-ml.bundle.Resources", FacesContext - .getCurrentInstance().getViewRoot().getLocale()); + .getCurrentInstance().getViewRoot().getLocale()); } } diff --git a/kitchensink-ml-ear/web/src/main/webapp/WEB-INF/beans.xml b/kitchensink-ml-ear/web/src/main/webapp/WEB-INF/beans.xml index bfb72e3d65..6b2c62fc13 100644 --- a/kitchensink-ml-ear/web/src/main/webapp/WEB-INF/beans.xml +++ b/kitchensink-ml-ear/web/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - diff --git a/kitchensink-ml-ear/web/src/main/webapp/WEB-INF/faces-config.xml b/kitchensink-ml-ear/web/src/main/webapp/WEB-INF/faces-config.xml index 779f3148cf..601a8c5fe3 100644 --- a/kitchensink-ml-ear/web/src/main/webapp/WEB-INF/faces-config.xml +++ b/kitchensink-ml-ear/web/src/main/webapp/WEB-INF/faces-config.xml @@ -23,7 +23,7 @@ - diff --git a/kitchensink-ml/pom.xml b/kitchensink-ml/pom.xml index e1d07bdd09..20b3d9bb48 100644 --- a/kitchensink-ml/pom.xml +++ b/kitchensink-ml/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,9 +90,9 @@ - - UTF-8 @@ -105,7 +105,7 @@ jdt_apt - + 2.10 2.1.1 @@ -117,11 +117,11 @@ - org.jboss.bom @@ -135,7 +135,7 @@ - @@ -145,7 +145,7 @@ provided - org.jboss.spec.javax.annotation @@ -198,7 +198,7 @@ - org.hibernate @@ -206,7 +206,7 @@ provided - org.hibernate @@ -221,7 +221,7 @@ provided - org.jboss.logging @@ -237,7 +237,7 @@ - org.jboss.arquillian.junit @@ -254,7 +254,7 @@ - ${project.artifactId} @@ -262,12 +262,12 @@ maven-war-plugin ${version.war.plugin} - false - @@ -280,9 +280,9 @@ - - default @@ -302,9 +302,9 @@ - - arq-wildfly-managed @@ -318,7 +318,7 @@ - arq-wildfly-remote @@ -332,11 +332,11 @@ - - - openshift diff --git a/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/controller/MemberController.java b/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/controller/MemberController.java index faa586f60d..6b8f58944d 100644 --- a/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/controller/MemberController.java +++ b/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/controller/MemberController.java @@ -54,13 +54,13 @@ public void register() throws Exception { try { memberRegistration.register(newMember); FacesMessage m = new FacesMessage(FacesMessage.SEVERITY_INFO, KitchensinkMessages.MESSAGES.registeredMessage(), - KitchensinkMessages.MESSAGES.registerSuccessfulMessage()); + KitchensinkMessages.MESSAGES.registerSuccessfulMessage()); facesContext.addMessage(null, m); initNewMember(); } catch (Exception e) { String errorMessage = getRootErrorMessage(e); FacesMessage m = new FacesMessage(FacesMessage.SEVERITY_ERROR, errorMessage, - KitchensinkMessages.MESSAGES.registerFailMessage()); + KitchensinkMessages.MESSAGES.registerFailMessage()); facesContext.addMessage(null, m); } } diff --git a/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/util/KitchensinkMessages.java b/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/util/KitchensinkMessages.java index 578ac8cdc9..ba1dd37006 100644 --- a/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/util/KitchensinkMessages.java +++ b/kitchensink-ml/src/main/java/org/jboss/as/quickstarts/kitchensink/util/KitchensinkMessages.java @@ -29,7 +29,7 @@ public interface KitchensinkMessages { KitchensinkMessages MESSAGES = Messages.getBundle(KitchensinkMessages.class, FacesContext.getCurrentInstance() - .getViewRoot().getLocale()); + .getViewRoot().getLocale()); @Message("Registered!") String registeredMessage(); diff --git a/kitchensink-ml/src/main/resources/META-INF/persistence.xml b/kitchensink-ml/src/main/resources/META-INF/persistence.xml index bf249403e9..4d3ed7c468 100644 --- a/kitchensink-ml/src/main/resources/META-INF/persistence.xml +++ b/kitchensink-ml/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - diff --git a/kitchensink-ml/src/main/webapp/WEB-INF/beans.xml b/kitchensink-ml/src/main/webapp/WEB-INF/beans.xml index 639207b526..4114ef5dc1 100644 --- a/kitchensink-ml/src/main/webapp/WEB-INF/beans.xml +++ b/kitchensink-ml/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - diff --git a/kitchensink-ml/src/main/webapp/WEB-INF/faces-config.xml b/kitchensink-ml/src/main/webapp/WEB-INF/faces-config.xml index b82d879e20..03a470ee11 100644 --- a/kitchensink-ml/src/main/webapp/WEB-INF/faces-config.xml +++ b/kitchensink-ml/src/main/webapp/WEB-INF/faces-config.xml @@ -24,7 +24,7 @@ - diff --git a/kitchensink-ml/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml b/kitchensink-ml/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml index be134ff85d..57bf48961d 100644 --- a/kitchensink-ml/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml +++ b/kitchensink-ml/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/kitchensink-ml/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationTest.java b/kitchensink-ml/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationTest.java index a26ae7b11f..2f76b6c0ea 100644 --- a/kitchensink-ml/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationTest.java +++ b/kitchensink-ml/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationTest.java @@ -39,11 +39,11 @@ public class MemberRegistrationTest { @Deployment public static Archive createTestArchive() { return ShrinkWrap.create(WebArchive.class, "test.war") - .addClasses(Member.class, MemberRegistration.class, Resources.class) - .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - // Deploy our test datasource - .addAsWebInfResource("test-ds.xml"); + .addClasses(Member.class, MemberRegistration.class, Resources.class) + .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + // Deploy our test datasource + .addAsWebInfResource("test-ds.xml"); } @Inject diff --git a/kitchensink-ml/src/test/resources/META-INF/test-persistence.xml b/kitchensink-ml/src/test/resources/META-INF/test-persistence.xml index 5a2f4d90b6..0d324ec67a 100644 --- a/kitchensink-ml/src/test/resources/META-INF/test-persistence.xml +++ b/kitchensink-ml/src/test/resources/META-INF/test-persistence.xml @@ -21,10 +21,10 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - - java:jboss/datasources/KitchensinkMlQuickstartTestDS diff --git a/kitchensink-ml/src/test/resources/test-ds.xml b/kitchensink-ml/src/test/resources/test-ds.xml index 7e3625e5b5..37c4d14612 100644 --- a/kitchensink-ml/src/test/resources/test-ds.xml +++ b/kitchensink-ml/src/test/resources/test-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/kitchensink/.cheatsheet.xml b/kitchensink/.cheatsheet.xml index 1d34311401..e597c2ac3c 100644 --- a/kitchensink/.cheatsheet.xml +++ b/kitchensink/.cheatsheet.xml @@ -1,4 +1,4 @@ - + - + + param1="${currentProject}" + param2="arq-wildfly-remote"/> - + @@ -616,19 +616,19 @@ We discussed both of these files in detail in The greeter example in depth - + - + - As you can see, Arquillian has lived up to the promise - the test case is focused on what to test - (the @Deployment method) and how to test (the @Test method). + As you can see, Arquillian has lived up to the promise - the test case is focused on what to test + (the @Deployment method) and how to test (the @Test method). It's also worth noting that this isn't a simplistic unit test - this is a fully fledged integration test that uses the database.

- Now, let's look at how we configure Arquillian. + Now, let's look at how we configure Arquillian. First of all, let's take a look at arquillian.xml in src/test/resources. greeter example in depth - + @@ -660,13 +660,13 @@ We discussed both of these files in detail in The greeter example in depth - + - And that's it! As you can see Arquillian delivers simple and true testing. + And that's it! As you can see Arquillian delivers simple and true testing. You can concentrate on writing your test functionality, and run your tests in the same environment in which you will run your application.

Arquillian also offers other containers, allowing you to run your tests against Weld Embedded (super fast, but your enterprise services are mocked), GlassFish, and more. @@ -677,19 +677,19 @@ We discussed both of these files in detail in The greeter example in depth - + - What we didn't tell you about the Kitchensink quickstart is that it is generated from a Maven archetype. + What we didn't tell you about the Kitchensink quickstart is that it is generated from a Maven archetype. Using this archetype offers you the perfect opportunity to generate your own project.

In order to perform that, you should select Help>JBoss Central and click the Java EE Web Project wizard.
- You will get a brand new project with the same functionality as kitchensink, + You will get a brand new project with the same functionality as kitchensink, but customized with your details. - + diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml index 0484602efc..1df1ae367a 100644 --- a/kitchensink/pom.xml +++ b/kitchensink/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,16 +90,16 @@ - - UTF-8 1.0.2.Final - 7.0.0-build-7 @@ -114,11 +114,11 @@ - org.jboss.bom @@ -132,10 +132,10 @@ - - javax.enterprise @@ -143,7 +143,7 @@ provided - org.jboss.spec.javax.annotation @@ -151,7 +151,7 @@ provided - org.jboss.spec.javax.ws.rs @@ -159,7 +159,7 @@ provided - org.hibernate.javax.persistence @@ -167,7 +167,7 @@ provided - org.jboss.spec.javax.ejb @@ -190,7 +190,7 @@ - org.jboss.spec.javax.faces @@ -200,7 +200,7 @@ - org.hibernate @@ -208,7 +208,7 @@ provided - org.hibernate @@ -224,7 +224,7 @@ - org.jboss.arquillian.junit @@ -241,7 +241,7 @@ - ${project.artifactId} @@ -265,9 +265,9 @@ - - default @@ -287,9 +287,9 @@ - - arq-wildfly-managed @@ -303,7 +303,7 @@ - arq-wildfly-remote @@ -317,11 +317,11 @@ - - - openshift diff --git a/kitchensink/src/main/resources/META-INF/persistence.xml b/kitchensink/src/main/resources/META-INF/persistence.xml index 83f9f8aeba..d86ff7b875 100644 --- a/kitchensink/src/main/resources/META-INF/persistence.xml +++ b/kitchensink/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - diff --git a/kitchensink/src/main/webapp/WEB-INF/beans.xml b/kitchensink/src/main/webapp/WEB-INF/beans.xml index 639207b526..4114ef5dc1 100644 --- a/kitchensink/src/main/webapp/WEB-INF/beans.xml +++ b/kitchensink/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - diff --git a/kitchensink/src/main/webapp/WEB-INF/faces-config.xml b/kitchensink/src/main/webapp/WEB-INF/faces-config.xml index f16fe1764d..38421a74ae 100644 --- a/kitchensink/src/main/webapp/WEB-INF/faces-config.xml +++ b/kitchensink/src/main/webapp/WEB-INF/faces-config.xml @@ -24,7 +24,7 @@ - diff --git a/kitchensink/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml b/kitchensink/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml index 30c347bfd5..0bb49c7aa5 100644 --- a/kitchensink/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml +++ b/kitchensink/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationTest.java b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationTest.java index a26ae7b11f..2f76b6c0ea 100644 --- a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationTest.java +++ b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationTest.java @@ -39,11 +39,11 @@ public class MemberRegistrationTest { @Deployment public static Archive createTestArchive() { return ShrinkWrap.create(WebArchive.class, "test.war") - .addClasses(Member.class, MemberRegistration.class, Resources.class) - .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - // Deploy our test datasource - .addAsWebInfResource("test-ds.xml"); + .addClasses(Member.class, MemberRegistration.class, Resources.class) + .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + // Deploy our test datasource + .addAsWebInfResource("test-ds.xml"); } @Inject diff --git a/kitchensink/src/test/resources/META-INF/test-persistence.xml b/kitchensink/src/test/resources/META-INF/test-persistence.xml index 1a035029e8..8bc8338c23 100644 --- a/kitchensink/src/test/resources/META-INF/test-persistence.xml +++ b/kitchensink/src/test/resources/META-INF/test-persistence.xml @@ -21,10 +21,10 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - - java:jboss/datasources/KitchensinkQuickstartTestDS diff --git a/kitchensink/src/test/resources/test-ds.xml b/kitchensink/src/test/resources/test-ds.xml index 3c7eee6663..0d1fbb5f87 100644 --- a/kitchensink/src/test/resources/test-ds.xml +++ b/kitchensink/src/test/resources/test-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/log4j/pom.xml b/log4j/pom.xml index 76c0e415b7..cb7784fe48 100644 --- a/log4j/pom.xml +++ b/log4j/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,7 +91,7 @@ - UTF-8 @@ -119,13 +119,13 @@ log4j ${version.log4j} - - org.jboss.spec @@ -146,7 +146,7 @@ provided - org.jboss.spec.javax.annotation @@ -161,7 +161,7 @@ provided - log4j diff --git a/log4j/src/main/webapp/WEB-INF/beans.xml b/log4j/src/main/webapp/WEB-INF/beans.xml index 955868d46a..460d1cf31b 100644 --- a/log4j/src/main/webapp/WEB-INF/beans.xml +++ b/log4j/src/main/webapp/WEB-INF/beans.xml @@ -19,6 +19,6 @@ diff --git a/log4j/src/main/webapp/WEB-INF/faces-config.xml b/log4j/src/main/webapp/WEB-INF/faces-config.xml index 349df48b23..4db3b03a70 100644 --- a/log4j/src/main/webapp/WEB-INF/faces-config.xml +++ b/log4j/src/main/webapp/WEB-INF/faces-config.xml @@ -21,5 +21,5 @@ xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"> - + diff --git a/log4j/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/log4j/src/main/webapp/WEB-INF/jboss-deployment-structure.xml index 7af0e9bc3a..4ce6253915 100644 --- a/log4j/src/main/webapp/WEB-INF/jboss-deployment-structure.xml +++ b/log4j/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -15,7 +15,7 @@ limitations under the License. --> - + diff --git a/logging-tools/pom.xml b/logging-tools/pom.xml index aec43a9d44..8e8726ed67 100644 --- a/logging-tools/pom.xml +++ b/logging-tools/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -97,13 +97,13 @@ 1.0.2.Final - + - 7.0.0-build-7 + 7.0.0-build-7 jdt_apt - + 3.1 2.1.1 @@ -115,8 +115,8 @@ - org.jboss.spec.javax.ws.rs diff --git a/logging-tools/src/main/java/org/jboss/as/quickstarts/loggingToolsQS/DateService.java b/logging-tools/src/main/java/org/jboss/as/quickstarts/loggingToolsQS/DateService.java index 825bd2cd3c..687ba4970e 100644 --- a/logging-tools/src/main/java/org/jboss/as/quickstarts/loggingToolsQS/DateService.java +++ b/logging-tools/src/main/java/org/jboss/as/quickstarts/loggingToolsQS/DateService.java @@ -65,7 +65,7 @@ public long showDaysUntil(@PathParam("targetdate") String targetDate) { // throw a WebApplicationException (400) with the localized message from nex throw new WebApplicationException(Response.status(400).entity(nex.getLocalizedMessage()).type(MediaType.TEXT_PLAIN) - .build()); + .build()); } return days; diff --git a/logging/pom.xml b/logging/pom.xml index 6cc88d6a26..98dce8354e 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,16 +90,16 @@ - - UTF-8 1.0.2.Final - 7.0.0-build-7 @@ -114,11 +114,11 @@ - org.jboss.bom @@ -141,7 +141,7 @@ org.jboss.spec.javax.servlet jboss-servlet-api_3.1_spec provided - + diff --git a/mail/pom.xml b/mail/pom.xml index ca598757bd..75801f6383 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,13 +91,13 @@ - UTF-8 1.0.2.Final - + 1.0.3.Final @@ -110,8 +110,8 @@ - ${project.artifactId} diff --git a/mail/src/main/webapp/WEB-INF/beans.xml b/mail/src/main/webapp/WEB-INF/beans.xml index 955868d46a..460d1cf31b 100644 --- a/mail/src/main/webapp/WEB-INF/beans.xml +++ b/mail/src/main/webapp/WEB-INF/beans.xml @@ -19,6 +19,6 @@ diff --git a/mail/src/main/webapp/WEB-INF/faces-config.xml b/mail/src/main/webapp/WEB-INF/faces-config.xml index a745c52343..40ec16100c 100644 --- a/mail/src/main/webapp/WEB-INF/faces-config.xml +++ b/mail/src/main/webapp/WEB-INF/faces-config.xml @@ -23,5 +23,5 @@ xsi:schemaLocation=" http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"> - + diff --git a/managedexecutorservice/pom.xml b/managedexecutorservice/pom.xml index cf83f42a68..7379385d70 100644 --- a/managedexecutorservice/pom.xml +++ b/managedexecutorservice/pom.xml @@ -44,7 +44,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -93,16 +93,16 @@ - - UTF-8 1.0.2.Final - 7.0.0-build-7 3.0.10.Final @@ -124,8 +124,8 @@ @@ -151,19 +151,19 @@ - - org.jboss.spec.javax.enterprise.concurrent jboss-concurrency-api_1.0_spec provided - - org.jboss.spec.javax.transaction @@ -171,9 +171,9 @@ provided - - javax.enterprise @@ -181,7 +181,7 @@ provided - org.jboss.spec.javax.annotation @@ -189,7 +189,7 @@ provided - org.jboss.spec.javax.ws.rs @@ -197,7 +197,7 @@ provided - org.hibernate.javax.persistence @@ -205,7 +205,7 @@ provided - org.jboss.spec.javax.ejb @@ -228,7 +228,7 @@ - org.jboss.spec.javax.faces @@ -238,7 +238,7 @@ - org.hibernate @@ -246,7 +246,7 @@ provided - org.hibernate @@ -262,7 +262,7 @@ - org.jboss.arquillian.junit @@ -275,7 +275,7 @@ arquillian-protocol-servlet test - + org.jboss.resteasy @@ -304,7 +304,7 @@ - ${project.artifactId} @@ -328,9 +328,9 @@ - - default diff --git a/managedexecutorservice/src/main/resources/META-INF/persistence.xml b/managedexecutorservice/src/main/resources/META-INF/persistence.xml index a18d1ea231..f0fd8b33e2 100644 --- a/managedexecutorservice/src/main/resources/META-INF/persistence.xml +++ b/managedexecutorservice/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - diff --git a/managedexecutorservice/src/main/webapp/WEB-INF/jboss-managedexecutorservice-ds.xml b/managedexecutorservice/src/main/webapp/WEB-INF/jboss-managedexecutorservice-ds.xml index 6593080500..50b23e1ce7 100644 --- a/managedexecutorservice/src/main/webapp/WEB-INF/jboss-managedexecutorservice-ds.xml +++ b/managedexecutorservice/src/main/webapp/WEB-INF/jboss-managedexecutorservice-ds.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - + diff --git a/numberguess/pom.xml b/numberguess/pom.xml index 8760f0af9a..c9e65ad90d 100644 --- a/numberguess/pom.xml +++ b/numberguess/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,14 +91,14 @@ - UTF-8 - + 1.0.2.Final - + 1.0.3.Final @@ -111,8 +111,8 @@ - org.jboss.spec.javax.annotation @@ -157,7 +157,7 @@ - ${project.artifactId} diff --git a/numberguess/src/main/webapp/WEB-INF/beans.xml b/numberguess/src/main/webapp/WEB-INF/beans.xml index 955868d46a..460d1cf31b 100644 --- a/numberguess/src/main/webapp/WEB-INF/beans.xml +++ b/numberguess/src/main/webapp/WEB-INF/beans.xml @@ -19,6 +19,6 @@ diff --git a/numberguess/src/main/webapp/WEB-INF/faces-config.xml b/numberguess/src/main/webapp/WEB-INF/faces-config.xml index a745c52343..40ec16100c 100644 --- a/numberguess/src/main/webapp/WEB-INF/faces-config.xml +++ b/numberguess/src/main/webapp/WEB-INF/faces-config.xml @@ -23,5 +23,5 @@ xsi:schemaLocation=" http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"> - + diff --git a/payment-cdi-event/pom.xml b/payment-cdi-event/pom.xml index 67a8b56fe4..ac01406b4b 100644 --- a/payment-cdi-event/pom.xml +++ b/payment-cdi-event/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,16 +90,16 @@ - - UTF-8 - + 1.0.2.Final - + 7.0.0-build-7 @@ -115,9 +115,9 @@ - org.jboss.bom @@ -139,7 +139,7 @@ provided - org.jboss.spec.javax.annotation @@ -147,7 +147,7 @@ provided - org.jboss.spec.javax.servlet @@ -169,7 +169,7 @@ - ${project.artifactId} @@ -177,7 +177,7 @@ maven-war-plugin ${version.war.plugin} - false diff --git a/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/events/PaymentTypeEnum.java b/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/events/PaymentTypeEnum.java index 5c63d968ee..9285017d98 100644 --- a/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/events/PaymentTypeEnum.java +++ b/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/events/PaymentTypeEnum.java @@ -21,7 +21,8 @@ public enum PaymentTypeEnum { - CREDIT("1"), DEBIT("2"); + CREDIT("1"), + DEBIT("2"); private final String value; diff --git a/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/qualifiers/Credit.java b/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/qualifiers/Credit.java index 2b3da7c06f..2631c00a88 100644 --- a/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/qualifiers/Credit.java +++ b/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/qualifiers/Credit.java @@ -27,7 +27,7 @@ import static java.lang.annotation.ElementType.PARAMETER; @Qualifier -@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Target({ TYPE, METHOD, FIELD, PARAMETER }) @Retention(RetentionPolicy.RUNTIME) public @interface Credit { } diff --git a/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/qualifiers/Debit.java b/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/qualifiers/Debit.java index 18509132b0..ee5c357436 100644 --- a/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/qualifiers/Debit.java +++ b/payment-cdi-event/src/main/java/org/jboss/as/quickstarts/payment/qualifiers/Debit.java @@ -27,7 +27,7 @@ import static java.lang.annotation.ElementType.PARAMETER; @Qualifier -@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Target({ TYPE, METHOD, FIELD, PARAMETER }) @Retention(RetentionPolicy.RUNTIME) public @interface Debit { } diff --git a/payment-cdi-event/src/main/webapp/WEB-INF/beans.xml b/payment-cdi-event/src/main/webapp/WEB-INF/beans.xml index 34e3d0824d..4b8daeb212 100644 --- a/payment-cdi-event/src/main/webapp/WEB-INF/beans.xml +++ b/payment-cdi-event/src/main/webapp/WEB-INF/beans.xml @@ -18,6 +18,6 @@ diff --git a/picketlink-sts/pom.xml b/picketlink-sts/pom.xml index 0cd32f2817..f5e8b660ca 100644 --- a/picketlink-sts/pom.xml +++ b/picketlink-sts/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,7 +91,7 @@ - UTF-8 @@ -163,7 +163,7 @@ - ${project.artifactId} @@ -183,7 +183,7 @@ wildfly-maven-plugin ${version.wildfly.maven.plugin} - + org.codehaus.mojo diff --git a/picketlink-sts/src/main/java/org/jboss/as/quickstarts/picketlink/WSTrustClientExample.java b/picketlink-sts/src/main/java/org/jboss/as/quickstarts/picketlink/WSTrustClientExample.java index c5646cdd3f..0154c173ee 100644 --- a/picketlink-sts/src/main/java/org/jboss/as/quickstarts/picketlink/WSTrustClientExample.java +++ b/picketlink-sts/src/main/java/org/jboss/as/quickstarts/picketlink/WSTrustClientExample.java @@ -38,7 +38,7 @@ public static void main(String[] args) throws Exception { // Step 1: Create a WS Trust Client WSTrustClient client = new WSTrustClient("PicketLinkSTS", "PicketLinkSTSPort", "http://localhost:8080/picketlink-sts/PicketLinkSTS", - new SecurityInfo(userName, password)); + new SecurityInfo(userName, password)); Element assertionElement = null; try { System.out.println("Invoking token service to get SAML assertion for user:" + userName + " with password:" + password); diff --git a/picketlink-sts/src/main/java/org/picketlink/identity/federation/app/sts/PicketLinkSTService.java b/picketlink-sts/src/main/java/org/picketlink/identity/federation/app/sts/PicketLinkSTService.java index c39a9db48b..730bf58145 100644 --- a/picketlink-sts/src/main/java/org/picketlink/identity/federation/app/sts/PicketLinkSTService.java +++ b/picketlink-sts/src/main/java/org/picketlink/identity/federation/app/sts/PicketLinkSTService.java @@ -33,7 +33,8 @@ * @author Stefan Guilhen * @author Peter Skopek */ -@WebServiceProvider(serviceName = "PicketLinkSTS", portName = "PicketLinkSTSPort", targetNamespace = "urn:picketlink:identity-federation:sts", wsdlLocation = "WEB-INF/wsdl/PicketLinkSTS.wsdl") +@WebServiceProvider(serviceName = "PicketLinkSTS", portName = "PicketLinkSTSPort", targetNamespace = "urn:picketlink:identity-federation:sts", + wsdlLocation = "WEB-INF/wsdl/PicketLinkSTS.wsdl") @ServiceMode(value = Service.Mode.MESSAGE) public class PicketLinkSTService extends PicketLinkSTS { private static Logger log = Logger.getLogger(PicketLinkSTService.class); diff --git a/picketlink-sts/src/main/webapp/WEB-INF/jboss-web.xml b/picketlink-sts/src/main/webapp/WEB-INF/jboss-web.xml index 0c348a4028..9008c97570 100755 --- a/picketlink-sts/src/main/webapp/WEB-INF/jboss-web.xml +++ b/picketlink-sts/src/main/webapp/WEB-INF/jboss-web.xml @@ -17,8 +17,8 @@ --> /picketlink-sts picketlink-sts diff --git a/pom.xml b/pom.xml index 98050e289c..352b4ec486 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -188,7 +188,7 @@ ejb-in-ear ejb-in-war ejb-security - ejb-security-interceptors + ejb-security-interceptors ejb-throws-exception ejb-timer ejb-multi-server @@ -267,7 +267,7 @@ - cluster-ha-singleton + cluster-ha-singleton ejb-remote resteasy-jaxrs-client jts diff --git a/resteasy-jaxrs-client/pom.xml b/resteasy-jaxrs-client/pom.xml index 22b9a1e72f..ba79a0575a 100644 --- a/resteasy-jaxrs-client/pom.xml +++ b/resteasy-jaxrs-client/pom.xml @@ -40,7 +40,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -89,14 +89,14 @@ - - UTF-8 - + 7.0.0-build-7 @@ -179,7 +179,7 @@ default - + true diff --git a/resteasy-jaxrs-client/src/test/java/org/jboss/as/quickstarts/jaxrsclient/JaxRsClientTest.java b/resteasy-jaxrs-client/src/test/java/org/jboss/as/quickstarts/jaxrsclient/JaxRsClientTest.java index cff2e66bd4..8aa0514a42 100644 --- a/resteasy-jaxrs-client/src/test/java/org/jboss/as/quickstarts/jaxrsclient/JaxRsClientTest.java +++ b/resteasy-jaxrs-client/src/test/java/org/jboss/as/quickstarts/jaxrsclient/JaxRsClientTest.java @@ -79,10 +79,10 @@ public static void beforeClass() { @Test public void test() { assertEquals("XML Response", JaxRsClientTest.XML_RESPONSE, - this.runRequest(JaxRsClientTest.XML_URL, MediaType.APPLICATION_XML_TYPE)); + this.runRequest(JaxRsClientTest.XML_URL, MediaType.APPLICATION_XML_TYPE)); assertEquals("JSON Response", JaxRsClientTest.JSON_RESPONSE, - this.runRequest(JaxRsClientTest.JSON_URL, MediaType.APPLICATION_JSON_TYPE)); + this.runRequest(JaxRsClientTest.JSON_URL, MediaType.APPLICATION_JSON_TYPE)); } /** @@ -117,7 +117,7 @@ private String runRequest(String url, MediaType mediaType) { // We have a good response, let's now read it BufferedReader br = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(response.getEntity() - .getBytes()))); + .getBytes()))); // Loop over the br in order to print out the contents System.out.println("\n*** Response from Server ***\n"); diff --git a/servlet-async/pom.xml b/servlet-async/pom.xml index c900ce9fa5..7fbf24a17b 100644 --- a/servlet-async/pom.xml +++ b/servlet-async/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,14 +91,14 @@ - UTF-8 - + 1.0.2.Final - + 1.0.3.Final @@ -137,7 +137,7 @@ provided - org.jboss.spec.javax.annotation @@ -151,7 +151,7 @@ jboss-servlet-api_3.1_spec provided - + org.jboss.spec.javax.ejb diff --git a/servlet-async/src/main/webapp/WEB-INF/beans.xml b/servlet-async/src/main/webapp/WEB-INF/beans.xml index 34e3d0824d..4b8daeb212 100644 --- a/servlet-async/src/main/webapp/WEB-INF/beans.xml +++ b/servlet-async/src/main/webapp/WEB-INF/beans.xml @@ -18,6 +18,6 @@ diff --git a/servlet-filterlistener/pom.xml b/servlet-filterlistener/pom.xml index 1f4e1288d3..d459134cf9 100644 --- a/servlet-filterlistener/pom.xml +++ b/servlet-filterlistener/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,14 +91,14 @@ - UTF-8 - + 1.0.2.Final - + 1.0.3.Final @@ -137,7 +137,7 @@ provided - org.jboss.spec.javax.annotation @@ -155,7 +155,7 @@ - ${project.artifactId} diff --git a/servlet-filterlistener/src/main/java/org/jboss/as/quickstarts/servlet/filterlistener/ParameterDumpingRequestListener.java b/servlet-filterlistener/src/main/java/org/jboss/as/quickstarts/servlet/filterlistener/ParameterDumpingRequestListener.java index 547a36b257..40d4882a87 100644 --- a/servlet-filterlistener/src/main/java/org/jboss/as/quickstarts/servlet/filterlistener/ParameterDumpingRequestListener.java +++ b/servlet-filterlistener/src/main/java/org/jboss/as/quickstarts/servlet/filterlistener/ParameterDumpingRequestListener.java @@ -41,7 +41,7 @@ public void requestInitialized(ServletRequestEvent sre) { // to see log messages at runtime, check the terminal window where you started JBoss EAP. servletContext.log("ParameterDumpingRequestListener: request has been initialized. It has " + paramMap.size() - + " parameters:"); + + " parameters:"); for (Map.Entry entry : paramMap.entrySet()) { for (String val : entry.getValue()) { servletContext.log(" " + entry.getKey() + "=" + val); diff --git a/servlet-filterlistener/src/main/java/org/jboss/as/quickstarts/servlet/filterlistener/VowelRemoverFilter.java b/servlet-filterlistener/src/main/java/org/jboss/as/quickstarts/servlet/filterlistener/VowelRemoverFilter.java index edfdc80ccb..f3aa1ae90e 100644 --- a/servlet-filterlistener/src/main/java/org/jboss/as/quickstarts/servlet/filterlistener/VowelRemoverFilter.java +++ b/servlet-filterlistener/src/main/java/org/jboss/as/quickstarts/servlet/filterlistener/VowelRemoverFilter.java @@ -76,7 +76,7 @@ public void init(FilterConfig filterConfig) throws ServletException { @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, - ServletException { + ServletException { final Map filteredParams = Collections.unmodifiableMap(removeVowels(request.getParameterMap())); diff --git a/servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml b/servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml index 34e3d0824d..4b8daeb212 100644 --- a/servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml +++ b/servlet-filterlistener/src/main/webapp/WEB-INF/beans.xml @@ -18,6 +18,6 @@ diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml index f69a5ba36c..2d488ab19c 100644 --- a/servlet-security/pom.xml +++ b/servlet-security/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,14 +91,14 @@ - UTF-8 - + 1.0.2.Final - + 1.0.3.Final @@ -137,7 +137,7 @@ provided - org.jboss.spec.javax.annotation @@ -151,11 +151,11 @@ jboss-servlet-api_3.1_spec provided - + - ${project.artifactId} diff --git a/servlet-security/src/main/resources/META-INF/persistence.xml b/servlet-security/src/main/resources/META-INF/persistence.xml index 77db881367..c7408e65d1 100644 --- a/servlet-security/src/main/resources/META-INF/persistence.xml +++ b/servlet-security/src/main/resources/META-INF/persistence.xml @@ -21,9 +21,9 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - - java:jboss/datasources/ServletSecurityDS diff --git a/servlet-security/src/main/webapp/WEB-INF/beans.xml b/servlet-security/src/main/webapp/WEB-INF/beans.xml index 34e3d0824d..4b8daeb212 100644 --- a/servlet-security/src/main/webapp/WEB-INF/beans.xml +++ b/servlet-security/src/main/webapp/WEB-INF/beans.xml @@ -18,6 +18,6 @@ diff --git a/servlet-security/src/main/webapp/WEB-INF/jboss-web.xml b/servlet-security/src/main/webapp/WEB-INF/jboss-web.xml index c619e17462..8b52eaf9d5 100644 --- a/servlet-security/src/main/webapp/WEB-INF/jboss-web.xml +++ b/servlet-security/src/main/webapp/WEB-INF/jboss-web.xml @@ -17,8 +17,8 @@ --> servlet-security-quickstart diff --git a/servlet-security/src/main/webapp/WEB-INF/servlet-security-quickstart-ds.xml b/servlet-security/src/main/webapp/WEB-INF/servlet-security-quickstart-ds.xml index 04de4a998c..4ea9e77499 100644 --- a/servlet-security/src/main/webapp/WEB-INF/servlet-security-quickstart-ds.xml +++ b/servlet-security/src/main/webapp/WEB-INF/servlet-security-quickstart-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - diff --git a/settings.xml b/settings.xml index 4cb14cd096..7dc8701bf9 100644 --- a/settings.xml +++ b/settings.xml @@ -1,112 +1,112 @@ - - - - - - - - - - - - - - jboss-ga-repository - - - jboss-ga-repository - http://maven.repository.redhat.com/techpreview/all - - true - - - false - - - - - - jboss-ga-plugin-repository - http://maven.repository.redhat.com/techpreview/all - - true - - - false - - - - - - - jboss-earlyaccess-repository - - - jboss-earlyaccess-repository - http://maven.repository.redhat.com/earlyaccess/all/ - - true - - - false - - - - - - jboss-earlyaccess-plugin-repository - http://maven.repository.redhat.com/earlyaccess/all/ - - true - - - false - - - - - - - - - - jboss-ga-repository - jboss-earlyaccess-repository - - - + + + + + + + + + + + + + + jboss-ga-repository + + + jboss-ga-repository + http://maven.repository.redhat.com/techpreview/all + + true + + + false + + + + + + jboss-ga-plugin-repository + http://maven.repository.redhat.com/techpreview/all + + true + + + false + + + + + + + jboss-earlyaccess-repository + + + jboss-earlyaccess-repository + http://maven.repository.redhat.com/earlyaccess/all/ + + true + + + false + + + + + + jboss-earlyaccess-plugin-repository + http://maven.repository.redhat.com/earlyaccess/all/ + + true + + + false + + + + + + + + + + jboss-ga-repository + jboss-earlyaccess-repository + + + diff --git a/shopping-cart/client/pom.xml b/shopping-cart/client/pom.xml index eabd549806..80b4d0af66 100644 --- a/shopping-cart/client/pom.xml +++ b/shopping-cart/client/pom.xml @@ -45,8 +45,8 @@ ejb - org.wildfly @@ -54,7 +54,7 @@ runtime pom - + org.jboss.spec.javax.ejb @@ -66,7 +66,7 @@ ${project.artifactId} - org.codehaus.mojo diff --git a/shopping-cart/client/src/main/java/org/jboss/as/quickstarts/client/Client.java b/shopping-cart/client/src/main/java/org/jboss/as/quickstarts/client/Client.java index ccbe26e917..14b86da414 100644 --- a/shopping-cart/client/src/main/java/org/jboss/as/quickstarts/client/Client.java +++ b/shopping-cart/client/src/main/java/org/jboss/as/quickstarts/client/Client.java @@ -76,7 +76,7 @@ public static void main(String[] args) throws NamingException { /* Lookup the remote interface of the shopping cart */ String lookupName = "ejb:" + appName + "/" + moduleName + "/" + distinctName + "/" + beanName + "!" + viewClassName - + "?stateful"; + + "?stateful"; final ShoppingCart cart = (ShoppingCart) context.lookup(lookupName); System.out.println("\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"); diff --git a/shopping-cart/pom.xml b/shopping-cart/pom.xml index d4782525f7..1b29861d56 100644 --- a/shopping-cart/pom.xml +++ b/shopping-cart/pom.xml @@ -40,7 +40,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -89,9 +89,9 @@ - - UTF-8 @@ -111,8 +111,8 @@ 1.8 - server @@ -141,16 +141,16 @@ ${project.version} ejb - + ${project.artifactId} - - org.wildfly.plugins diff --git a/shopping-cart/server/pom.xml b/shopping-cart/server/pom.xml index e6bcfff6b2..40a5c796a0 100644 --- a/shopping-cart/server/pom.xml +++ b/shopping-cart/server/pom.xml @@ -38,7 +38,7 @@ - org.jboss.spec.javax.annotation @@ -46,7 +46,7 @@ provided - org.jboss.spec.javax.ejb diff --git a/shrinkwrap-resolver/README.md b/shrinkwrap-resolver/README.md index 18aa66e62f..88988301a4 100644 --- a/shrinkwrap-resolver/README.md +++ b/shrinkwrap-resolver/README.md @@ -4,8 +4,8 @@ Author: Rafael Benevides Level: Intermediate Technologies: CDI, Arquillian, Shrinkwrap Summary: The `shrinkwrap-resolver` quickstart demonstrates 3 common use cases for ShrinkWrap Resolver. -Target Product: JBoss EAP -Source: +Target Product: JBoss EAP +Source: What is it? diff --git a/shrinkwrap-resolver/pom.xml b/shrinkwrap-resolver/pom.xml index 1a1b9f4b4e..d83ced05ff 100644 --- a/shrinkwrap-resolver/pom.xml +++ b/shrinkwrap-resolver/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,9 +90,9 @@ - - UTF-8 @@ -128,22 +128,22 @@ pom import - + org.apache.commons commons-lang3 ${version.org.apache.commons.commons-lang3} - + - - - javax.enterprise @@ -151,7 +151,7 @@ provided - org.jboss.spec.javax.annotation @@ -160,7 +160,7 @@ - org.hibernate.javax.persistence @@ -168,7 +168,7 @@ provided - org.jboss.spec.javax.ejb @@ -177,7 +177,7 @@ - org.jboss.spec.javax.faces @@ -203,7 +203,7 @@ - org.jboss.arquillian.junit @@ -226,7 +226,7 @@ - ${project.artifactId} @@ -250,9 +250,9 @@ - - default @@ -272,9 +272,9 @@ - - arq-wildfly-managed @@ -288,7 +288,7 @@ - arq-wildfly-remote @@ -302,11 +302,11 @@ - - - openshift diff --git a/shrinkwrap-resolver/src/main/resources/META-INF/persistence.xml b/shrinkwrap-resolver/src/main/resources/META-INF/persistence.xml index f047723de6..a13413c9a8 100644 --- a/shrinkwrap-resolver/src/main/resources/META-INF/persistence.xml +++ b/shrinkwrap-resolver/src/main/resources/META-INF/persistence.xml @@ -21,7 +21,7 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - diff --git a/shrinkwrap-resolver/src/main/webapp/WEB-INF/beans.xml b/shrinkwrap-resolver/src/main/webapp/WEB-INF/beans.xml index a49766551e..4114ef5dc1 100644 --- a/shrinkwrap-resolver/src/main/webapp/WEB-INF/beans.xml +++ b/shrinkwrap-resolver/src/main/webapp/WEB-INF/beans.xml @@ -16,7 +16,7 @@ limitations under the License. --> - - - + diff --git a/shrinkwrap-resolver/src/test/java/org/jboss/as/quickstarts/shrinkwrap/resolver/ShrinkwrapResolveGAPCVCustomRepoWithoutCentralTest.java b/shrinkwrap-resolver/src/test/java/org/jboss/as/quickstarts/shrinkwrap/resolver/ShrinkwrapResolveGAPCVCustomRepoWithoutCentralTest.java index 81ef0a014e..46a37910fa 100644 --- a/shrinkwrap-resolver/src/test/java/org/jboss/as/quickstarts/shrinkwrap/resolver/ShrinkwrapResolveGAPCVCustomRepoWithoutCentralTest.java +++ b/shrinkwrap-resolver/src/test/java/org/jboss/as/quickstarts/shrinkwrap/resolver/ShrinkwrapResolveGAPCVCustomRepoWithoutCentralTest.java @@ -55,10 +55,10 @@ public static Archive createTestArchive() { }; File[] libs = Maven.configureResolver() - // disabled Maven Central repository - .withMavenCentralRepo(false) - // use repository specified on a maven custom settings file - .fromClassloaderResource("custom-settings.xml") + // disabled Maven Central repository + .withMavenCentralRepo(false) + // use repository specified on a maven custom settings file + .fromClassloaderResource("custom-settings.xml") .resolve(deps) .withoutTransitivity().asFile(); diff --git a/shrinkwrap-resolver/src/test/resources/META-INF/test-persistence.xml b/shrinkwrap-resolver/src/test/resources/META-INF/test-persistence.xml index 76899b1a97..7a561d93b9 100644 --- a/shrinkwrap-resolver/src/test/resources/META-INF/test-persistence.xml +++ b/shrinkwrap-resolver/src/test/resources/META-INF/test-persistence.xml @@ -21,10 +21,10 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - - java:jboss/datasources/jboss-as-shrinkwrap-resolverTestDS diff --git a/shrinkwrap-resolver/src/test/resources/test-ds.xml b/shrinkwrap-resolver/src/test/resources/test-ds.xml index 190c1e14a7..0f7db22ace 100644 --- a/shrinkwrap-resolver/src/test/resources/test-ds.xml +++ b/shrinkwrap-resolver/src/test/resources/test-ds.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - + diff --git a/spring-greeter/pom.xml b/spring-greeter/pom.xml index cd1eefa0c8..7b8dfd67a7 100644 --- a/spring-greeter/pom.xml +++ b/spring-greeter/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -132,7 +132,7 @@ pom import - + org.jboss.bom jboss-javaee-7.0-eap-with-tools @@ -262,11 +262,11 @@ - - - openshift diff --git a/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/domain/UserDaoImpl.java b/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/domain/UserDaoImpl.java index 6c668af5be..5e325566d1 100644 --- a/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/domain/UserDaoImpl.java +++ b/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/domain/UserDaoImpl.java @@ -34,7 +34,7 @@ public class UserDaoImpl implements UserDao { public User getForUsername(String username) { try { Query query = entityManager - .createQuery("select u from User u where u.username = ?"); + .createQuery("select u from User u where u.username = ?"); query.setParameter(1, username); return (User) query.getSingleResult(); } catch (NoResultException e) { diff --git a/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/web/CreateController.java b/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/web/CreateController.java index ea3b300c3e..64bac790ab 100644 --- a/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/web/CreateController.java +++ b/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/web/CreateController.java @@ -37,12 +37,11 @@ void getInitialMessage() { } @RequestMapping(method = RequestMethod.POST) - public - @ModelAttribute("message") + public @ModelAttribute("message") String create(User user) { try { userDao.createUser(user); - return "A new user with id "+user.getId()+" has been created successfully"; + return "A new user with id " + user.getId() + " has been created successfully"; } catch (Exception e) { return "An error has occured while creating the user (see log for details)"; } diff --git a/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/web/GreetController.java b/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/web/GreetController.java index ebb3d3b519..d2dbedce30 100644 --- a/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/web/GreetController.java +++ b/spring-greeter/src/main/java/org/jboss/spring/quickstarts/greeter/greeter_spring/web/GreetController.java @@ -33,15 +33,13 @@ public class GreetController { private UserDao userDao; @RequestMapping(method = RequestMethod.GET) - public - @ModelAttribute("message") + public @ModelAttribute("message") String getInitialMessage() { return "Enter a valid name"; } @RequestMapping(method = RequestMethod.POST) - public - @ModelAttribute("message") + public @ModelAttribute("message") String getGreeting(@RequestParam("username") String username) { User user = userDao.getForUsername(username); if (user != null) { diff --git a/spring-greeter/src/main/webapp/WEB-INF/greeter-spring-quickstart-ds.xml b/spring-greeter/src/main/webapp/WEB-INF/greeter-spring-quickstart-ds.xml index e09b6883a1..423887dbca 100644 --- a/spring-greeter/src/main/webapp/WEB-INF/greeter-spring-quickstart-ds.xml +++ b/spring-greeter/src/main/webapp/WEB-INF/greeter-spring-quickstart-ds.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - + diff --git a/spring-greeter/src/main/webapp/WEB-INF/spring-mvc-context.xml b/spring-greeter/src/main/webapp/WEB-INF/spring-mvc-context.xml index 09a339d185..3a31ee6a4d 100644 --- a/spring-greeter/src/main/webapp/WEB-INF/spring-mvc-context.xml +++ b/spring-greeter/src/main/webapp/WEB-INF/spring-mvc-context.xml @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java b/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java index 0b3f95cafc..43dc3bfc4b 100644 --- a/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java +++ b/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java @@ -55,14 +55,19 @@ public void setPhoneNumber(String phoneNumber) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Member member = (Member) o; - if (email != null ? !email.equals(member.email) : member.email != null) return false; - if (name != null ? !name.equals(member.name) : member.name != null) return false; - if (phoneNumber != null ? !phoneNumber.equals(member.phoneNumber) : member.phoneNumber != null) return false; + if (email != null ? !email.equals(member.email) : member.email != null) + return false; + if (name != null ? !name.equals(member.name) : member.name != null) + return false; + if (phoneNumber != null ? !phoneNumber.equals(member.phoneNumber) : member.phoneNumber != null) + return false; return true; } diff --git a/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java b/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java index befac7acee..70cee97dfa 100644 --- a/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java +++ b/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java @@ -28,7 +28,6 @@ public class MembersTablePageFragment { @FindByJQuery("tbody tr") private List members; - public Member getLatestMember() { return members.get(0).getMember(); } diff --git a/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java b/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java index 9cf4aadd9c..47a1b2ca39 100644 --- a/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java +++ b/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java @@ -75,7 +75,6 @@ public class RegistrationFormPageFragment { @FindBy(id = "phoneNumber.errors") private WebElement phoneNumberErrorMessage; - public void register(Member member) { nameField.clear(); nameField.sendKeys(member.getName()); diff --git a/spring-kitchensink-asyncrequestmapping/pom.xml b/spring-kitchensink-asyncrequestmapping/pom.xml index 1485b1a7f3..f54ef9c972 100644 --- a/spring-kitchensink-asyncrequestmapping/pom.xml +++ b/spring-kitchensink-asyncrequestmapping/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/spring-kitchensink-asyncrequestmapping/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/asyncrequestmapping/controller/MemberRestController.java b/spring-kitchensink-asyncrequestmapping/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/asyncrequestmapping/controller/MemberRestController.java index c7ab7f5da3..91c512a2b7 100644 --- a/spring-kitchensink-asyncrequestmapping/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/asyncrequestmapping/controller/MemberRestController.java +++ b/spring-kitchensink-asyncrequestmapping/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/asyncrequestmapping/controller/MemberRestController.java @@ -36,12 +36,14 @@ public class MemberRestController { private MemberDao memberDao; @RequestMapping(method = RequestMethod.GET, produces = "application/json") - public @ResponseBody List listAllMembers() { + public @ResponseBody + List listAllMembers() { return memberDao.findAllOrderedByName(); } @RequestMapping(value = "/{id}", method = RequestMethod.GET, produces = "application/json") - @ResponseBody public Callable lookupMemberById(@PathVariable("id") final Long id) { + @ResponseBody + public Callable lookupMemberById(@PathVariable("id") final Long id) { return new Callable() { public Member call() { try { diff --git a/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/persistence.xml b/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/persistence.xml index 3d7dc2c333..37607cda9b 100644 --- a/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/persistence.xml +++ b/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/persistence.xml @@ -19,17 +19,17 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - java:jboss/datasources/SpringQuickstartDSAsync - - \ No newline at end of file + diff --git a/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/spring/applicationContext.xml b/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/spring/applicationContext.xml index a2781586a2..27b17292b6 100644 --- a/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/spring/applicationContext.xml +++ b/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/spring/applicationContext.xml @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/spring/infrastructure.xml b/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/spring/infrastructure.xml index f162541cde..56b421cd60 100644 --- a/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/spring/infrastructure.xml +++ b/spring-kitchensink-asyncrequestmapping/src/main/resources/META-INF/spring/infrastructure.xml @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml b/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml index 72ebe4c23e..8b7fed27e3 100644 --- a/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml +++ b/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/spring-quickstart-ds.xml b/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/spring-quickstart-ds.xml index a91b36e581..8cb1b674a2 100644 --- a/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/spring-quickstart-ds.xml +++ b/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/spring-quickstart-ds.xml @@ -15,8 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + diff --git a/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/web.xml b/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/web.xml index 7066675e87..6dd7c96cb1 100644 --- a/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/web.xml +++ b/spring-kitchensink-asyncrequestmapping/src/main/webapp/WEB-INF/web.xml @@ -18,7 +18,7 @@ @@ -50,4 +50,4 @@ jboss-as-kitchensink / - \ No newline at end of file + diff --git a/spring-kitchensink-asyncrequestmapping/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/asyncrequestmapping/test/MemberDaoTest.java b/spring-kitchensink-asyncrequestmapping/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/asyncrequestmapping/test/MemberDaoTest.java index b3b497a952..f608db8bf9 100644 --- a/spring-kitchensink-asyncrequestmapping/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/asyncrequestmapping/test/MemberDaoTest.java +++ b/spring-kitchensink-asyncrequestmapping/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/asyncrequestmapping/test/MemberDaoTest.java @@ -32,8 +32,8 @@ import org.springframework.transaction.annotation.Transactional; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:test-context.xml", - "classpath:/META-INF/spring/applicationContext.xml"}) +@ContextConfiguration(locations = { "classpath:test-context.xml", + "classpath:/META-INF/spring/applicationContext.xml" }) @Transactional @TransactionConfiguration(defaultRollback = true) public class MemberDaoTest { diff --git a/spring-kitchensink-asyncrequestmapping/src/test/resources/META-INF/test-persistence.xml b/spring-kitchensink-asyncrequestmapping/src/test/resources/META-INF/test-persistence.xml index e01d164a36..af608f4a5f 100644 --- a/spring-kitchensink-asyncrequestmapping/src/test/resources/META-INF/test-persistence.xml +++ b/spring-kitchensink-asyncrequestmapping/src/test/resources/META-INF/test-persistence.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-asyncrequestmapping/src/test/resources/test-context.xml b/spring-kitchensink-asyncrequestmapping/src/test/resources/test-context.xml index 65c586e59f..4f1294269b 100644 --- a/spring-kitchensink-asyncrequestmapping/src/test/resources/test-context.xml +++ b/spring-kitchensink-asyncrequestmapping/src/test/resources/test-context.xml @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-basic/functional-tests/pom.xml b/spring-kitchensink-basic/functional-tests/pom.xml index fee5d58251..550e24feea 100644 --- a/spring-kitchensink-basic/functional-tests/pom.xml +++ b/spring-kitchensink-basic/functional-tests/pom.xml @@ -32,7 +32,7 @@ http://www.apache.org/licenses/LICENSE-2.0.html - + diff --git a/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java b/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java index 0b3f95cafc..43dc3bfc4b 100644 --- a/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java +++ b/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java @@ -55,14 +55,19 @@ public void setPhoneNumber(String phoneNumber) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Member member = (Member) o; - if (email != null ? !email.equals(member.email) : member.email != null) return false; - if (name != null ? !name.equals(member.name) : member.name != null) return false; - if (phoneNumber != null ? !phoneNumber.equals(member.phoneNumber) : member.phoneNumber != null) return false; + if (email != null ? !email.equals(member.email) : member.email != null) + return false; + if (name != null ? !name.equals(member.name) : member.name != null) + return false; + if (phoneNumber != null ? !phoneNumber.equals(member.phoneNumber) : member.phoneNumber != null) + return false; return true; } diff --git a/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java b/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java index befac7acee..70cee97dfa 100644 --- a/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java +++ b/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java @@ -28,7 +28,6 @@ public class MembersTablePageFragment { @FindByJQuery("tbody tr") private List members; - public Member getLatestMember() { return members.get(0).getMember(); } diff --git a/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java b/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java index 9cf4aadd9c..47a1b2ca39 100644 --- a/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java +++ b/spring-kitchensink-basic/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java @@ -75,7 +75,6 @@ public class RegistrationFormPageFragment { @FindBy(id = "phoneNumber.errors") private WebElement phoneNumberErrorMessage; - public void register(Member member) { nameField.clear(); nameField.sendKeys(member.getName()); diff --git a/spring-kitchensink-basic/pom.xml b/spring-kitchensink-basic/pom.xml index 70b9c43d68..7ac527c00f 100644 --- a/spring-kitchensink-basic/pom.xml +++ b/spring-kitchensink-basic/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/spring-kitchensink-basic/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/basic/controller/MemberRestController.java b/spring-kitchensink-basic/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/basic/controller/MemberRestController.java index b6d2699d8a..af8b7cd0eb 100644 --- a/spring-kitchensink-basic/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/basic/controller/MemberRestController.java +++ b/spring-kitchensink-basic/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/basic/controller/MemberRestController.java @@ -35,12 +35,14 @@ public class MemberRestController { private MemberDao memberDao; @RequestMapping(method = RequestMethod.GET, produces = "application/json") - public @ResponseBody List listAllMembers() { + public @ResponseBody + List listAllMembers() { return memberDao.findAllOrderedByName(); } @RequestMapping(value = "/{id}", method = RequestMethod.GET, produces = "application/json") - public @ResponseBody Member lookupMemberById(@PathVariable("id") Long id) { + public @ResponseBody + Member lookupMemberById(@PathVariable("id") Long id) { return memberDao.findById(id); } } diff --git a/spring-kitchensink-basic/src/main/resources/META-INF/persistence.xml b/spring-kitchensink-basic/src/main/resources/META-INF/persistence.xml index a7b0a4a033..98b39566af 100644 --- a/spring-kitchensink-basic/src/main/resources/META-INF/persistence.xml +++ b/spring-kitchensink-basic/src/main/resources/META-INF/persistence.xml @@ -19,17 +19,17 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - java:jboss/datasources/SpringQuickstartDSBasic - - \ No newline at end of file + diff --git a/spring-kitchensink-basic/src/main/resources/META-INF/spring/applicationContext.xml b/spring-kitchensink-basic/src/main/resources/META-INF/spring/applicationContext.xml index 0686e26cbb..61c767d30b 100644 --- a/spring-kitchensink-basic/src/main/resources/META-INF/spring/applicationContext.xml +++ b/spring-kitchensink-basic/src/main/resources/META-INF/spring/applicationContext.xml @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-basic/src/main/resources/META-INF/spring/infrastructure.xml b/spring-kitchensink-basic/src/main/resources/META-INF/spring/infrastructure.xml index 5b34f7e973..b1b7434fc7 100644 --- a/spring-kitchensink-basic/src/main/resources/META-INF/spring/infrastructure.xml +++ b/spring-kitchensink-basic/src/main/resources/META-INF/spring/infrastructure.xml @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-basic/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml b/spring-kitchensink-basic/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml index 616bdee59b..c8d20359f9 100644 --- a/spring-kitchensink-basic/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml +++ b/spring-kitchensink-basic/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-basic/src/main/webapp/WEB-INF/spring-quickstart-ds.xml b/spring-kitchensink-basic/src/main/webapp/WEB-INF/spring-quickstart-ds.xml index 57d87ab28d..72ac189f6d 100644 --- a/spring-kitchensink-basic/src/main/webapp/WEB-INF/spring-quickstart-ds.xml +++ b/spring-kitchensink-basic/src/main/webapp/WEB-INF/spring-quickstart-ds.xml @@ -15,8 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + diff --git a/spring-kitchensink-basic/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/basic/test/MemberDaoTest.java b/spring-kitchensink-basic/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/basic/test/MemberDaoTest.java index 292ced410e..d099a0e853 100644 --- a/spring-kitchensink-basic/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/basic/test/MemberDaoTest.java +++ b/spring-kitchensink-basic/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/basic/test/MemberDaoTest.java @@ -32,8 +32,8 @@ import org.springframework.transaction.annotation.Transactional; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:test-context.xml", - "classpath:/META-INF/spring/applicationContext.xml"}) +@ContextConfiguration(locations = { "classpath:test-context.xml", + "classpath:/META-INF/spring/applicationContext.xml" }) @Transactional @TransactionConfiguration(defaultRollback = true) public class MemberDaoTest { diff --git a/spring-kitchensink-basic/src/test/resources/META-INF/test-persistence.xml b/spring-kitchensink-basic/src/test/resources/META-INF/test-persistence.xml index f5e346c315..cd57528b93 100644 --- a/spring-kitchensink-basic/src/test/resources/META-INF/test-persistence.xml +++ b/spring-kitchensink-basic/src/test/resources/META-INF/test-persistence.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-basic/src/test/resources/test-context.xml b/spring-kitchensink-basic/src/test/resources/test-context.xml index 65c586e59f..4f1294269b 100644 --- a/spring-kitchensink-basic/src/test/resources/test-context.xml +++ b/spring-kitchensink-basic/src/test/resources/test-context.xml @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/KitchensinkSpringControllerAdviceTest.java b/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/KitchensinkSpringControllerAdviceTest.java index 09fe794f65..194382baf8 100644 --- a/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/KitchensinkSpringControllerAdviceTest.java +++ b/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/KitchensinkSpringControllerAdviceTest.java @@ -46,7 +46,6 @@ @RunWith(Arquillian.class) public class KitchensinkSpringControllerAdviceTest { - @FindBy(id = "reg") RegistrationFormPageFragment form; @@ -75,7 +74,6 @@ public static WebArchive deployment() { return Deployments.kitchensink(); } - /** * Name of the member to register in the right format. */ diff --git a/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java b/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java index 0b3f95cafc..43dc3bfc4b 100644 --- a/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java +++ b/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java @@ -55,14 +55,19 @@ public void setPhoneNumber(String phoneNumber) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Member member = (Member) o; - if (email != null ? !email.equals(member.email) : member.email != null) return false; - if (name != null ? !name.equals(member.name) : member.name != null) return false; - if (phoneNumber != null ? !phoneNumber.equals(member.phoneNumber) : member.phoneNumber != null) return false; + if (email != null ? !email.equals(member.email) : member.email != null) + return false; + if (name != null ? !name.equals(member.name) : member.name != null) + return false; + if (phoneNumber != null ? !phoneNumber.equals(member.phoneNumber) : member.phoneNumber != null) + return false; return true; } diff --git a/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java b/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java index 5137ac7777..e66efced8e 100644 --- a/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java +++ b/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java @@ -31,7 +31,6 @@ public class MemberPageFragment { @FindByJQuery("td:nth-child(4)") private WebElement phoneNumber; - public Member getMember() { return new Member(name.getText(), email.getText(), phoneNumber.getText()); } diff --git a/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java b/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java index c1ad6df151..a6fefb6314 100644 --- a/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java +++ b/spring-kitchensink-controlleradvice/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java @@ -103,7 +103,6 @@ public class RegistrationFormPageFragment { @FindByJQuery("a.ui-state-highlight") private WebElement today; - public void register(Member member, boolean fillDate) { nameField.clear(); nameField.sendKeys(member.getName()); diff --git a/spring-kitchensink-controlleradvice/pom.xml b/spring-kitchensink-controlleradvice/pom.xml index c3b8e3bb89..129376a329 100644 --- a/spring-kitchensink-controlleradvice/pom.xml +++ b/spring-kitchensink-controlleradvice/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/spring-kitchensink-controlleradvice/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/controller/MemberControllerAdvice.java b/spring-kitchensink-controlleradvice/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/controller/MemberControllerAdvice.java index 85df4bcec5..c779d5271d 100644 --- a/spring-kitchensink-controlleradvice/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/controller/MemberControllerAdvice.java +++ b/spring-kitchensink-controlleradvice/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/controller/MemberControllerAdvice.java @@ -49,7 +49,6 @@ private String getStackTrace(Exception e) { return stringWriter.toString(); } - //Global Exception Handler, removing the need for an extra Exception Handler Controller @ExceptionHandler(value = IOException.class) public ModelAndView exception(IOException e) { diff --git a/spring-kitchensink-controlleradvice/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/controller/MemberRestController.java b/spring-kitchensink-controlleradvice/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/controller/MemberRestController.java index 1c7df404a5..a7772aadf2 100644 --- a/spring-kitchensink-controlleradvice/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/controller/MemberRestController.java +++ b/spring-kitchensink-controlleradvice/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/controller/MemberRestController.java @@ -35,12 +35,14 @@ public class MemberRestController { private MemberDao memberDao; @RequestMapping(method = RequestMethod.GET, produces = "application/json") - public @ResponseBody List listAllMembers() { + public @ResponseBody + List listAllMembers() { return memberDao.findAllOrderedByName(); } @RequestMapping(value = "/{id}", method = RequestMethod.GET, produces = "application/json") - public @ResponseBody Member lookupMemberById(@PathVariable("id") Long id) { + public @ResponseBody + Member lookupMemberById(@PathVariable("id") Long id) { return memberDao.findById(id); } } diff --git a/spring-kitchensink-controlleradvice/src/main/resources/META-INF/persistence.xml b/spring-kitchensink-controlleradvice/src/main/resources/META-INF/persistence.xml index 48e918809b..d3bae9d792 100644 --- a/spring-kitchensink-controlleradvice/src/main/resources/META-INF/persistence.xml +++ b/spring-kitchensink-controlleradvice/src/main/resources/META-INF/persistence.xml @@ -19,17 +19,17 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - java:jboss/datasources/SpringQuickstartDSController - - \ No newline at end of file + diff --git a/spring-kitchensink-controlleradvice/src/main/resources/META-INF/spring/applicationContext.xml b/spring-kitchensink-controlleradvice/src/main/resources/META-INF/spring/applicationContext.xml index 02afe63c47..7fc350e977 100644 --- a/spring-kitchensink-controlleradvice/src/main/resources/META-INF/spring/applicationContext.xml +++ b/spring-kitchensink-controlleradvice/src/main/resources/META-INF/spring/applicationContext.xml @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-controlleradvice/src/main/resources/META-INF/spring/infrastructure.xml b/spring-kitchensink-controlleradvice/src/main/resources/META-INF/spring/infrastructure.xml index 7179345a4b..e355ec92b7 100644 --- a/spring-kitchensink-controlleradvice/src/main/resources/META-INF/spring/infrastructure.xml +++ b/spring-kitchensink-controlleradvice/src/main/resources/META-INF/spring/infrastructure.xml @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml b/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml index f141819fc8..ff954c2ace 100644 --- a/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml +++ b/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/spring-quickstart-ds.xml b/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/spring-quickstart-ds.xml index 80b51c87ec..c0f47025bf 100644 --- a/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/spring-quickstart-ds.xml +++ b/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/spring-quickstart-ds.xml @@ -15,8 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + diff --git a/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/web.xml b/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/web.xml index de4d475336..b8d79ce7fc 100644 --- a/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/web.xml +++ b/spring-kitchensink-controlleradvice/src/main/webapp/WEB-INF/web.xml @@ -18,7 +18,7 @@ @@ -49,4 +49,4 @@ jboss-as-kitchensink / - \ No newline at end of file + diff --git a/spring-kitchensink-controlleradvice/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/test/MemberDaoTest.java b/spring-kitchensink-controlleradvice/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/test/MemberDaoTest.java index fc539e2cdb..0b1e19d526 100644 --- a/spring-kitchensink-controlleradvice/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/test/MemberDaoTest.java +++ b/spring-kitchensink-controlleradvice/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/controlleradvice/test/MemberDaoTest.java @@ -33,8 +33,8 @@ import org.springframework.transaction.annotation.Transactional; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:test-context.xml", - "classpath:/META-INF/spring/applicationContext.xml"}) +@ContextConfiguration(locations = { "classpath:test-context.xml", + "classpath:/META-INF/spring/applicationContext.xml" }) @Transactional @TransactionConfiguration(defaultRollback = true) public class MemberDaoTest { diff --git a/spring-kitchensink-controlleradvice/src/test/resources/META-INF/test-persistence.xml b/spring-kitchensink-controlleradvice/src/test/resources/META-INF/test-persistence.xml index 94ab3c20a7..6241ec7975 100644 --- a/spring-kitchensink-controlleradvice/src/test/resources/META-INF/test-persistence.xml +++ b/spring-kitchensink-controlleradvice/src/test/resources/META-INF/test-persistence.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-controlleradvice/src/test/resources/test-context.xml b/spring-kitchensink-controlleradvice/src/test/resources/test-context.xml index 65c586e59f..4f1294269b 100644 --- a/spring-kitchensink-controlleradvice/src/test/resources/test-context.xml +++ b/spring-kitchensink-controlleradvice/src/test/resources/test-context.xml @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/KitchensinkSpringMatrixVariablesTest.java b/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/KitchensinkSpringMatrixVariablesTest.java index fe0ed341ca..b807e19f98 100644 --- a/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/KitchensinkSpringMatrixVariablesTest.java +++ b/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/KitchensinkSpringMatrixVariablesTest.java @@ -145,7 +145,6 @@ public static WebArchive deployment() { */ private static final String DEFAULT_PHONE = "2125551212"; - @Before public void loadPage() { browser.get(contextPath.toString()); diff --git a/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java b/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java index 0b3f95cafc..43dc3bfc4b 100644 --- a/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java +++ b/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java @@ -55,14 +55,19 @@ public void setPhoneNumber(String phoneNumber) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Member member = (Member) o; - if (email != null ? !email.equals(member.email) : member.email != null) return false; - if (name != null ? !name.equals(member.name) : member.name != null) return false; - if (phoneNumber != null ? !phoneNumber.equals(member.phoneNumber) : member.phoneNumber != null) return false; + if (email != null ? !email.equals(member.email) : member.email != null) + return false; + if (name != null ? !name.equals(member.name) : member.name != null) + return false; + if (phoneNumber != null ? !phoneNumber.equals(member.phoneNumber) : member.phoneNumber != null) + return false; return true; } diff --git a/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java b/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java index 5137ac7777..e66efced8e 100644 --- a/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java +++ b/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java @@ -31,7 +31,6 @@ public class MemberPageFragment { @FindByJQuery("td:nth-child(4)") private WebElement phoneNumber; - public Member getMember() { return new Member(name.getText(), email.getText(), phoneNumber.getText()); } diff --git a/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java b/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java index bd64edf183..aa1be08765 100644 --- a/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java +++ b/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java @@ -28,7 +28,6 @@ public class MembersTablePageFragment { @FindByJQuery("tbody tr") private List members; - public Member getLatestMember() { return members.get(0).getMember(); } @@ -39,7 +38,8 @@ public int getMemberCount() { public boolean containsMember(Member member) { for (MemberPageFragment memberPF : members) { - if (memberPF.getMember().equals(member)) return true; + if (memberPF.getMember().equals(member)) + return true; } return false; } diff --git a/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java b/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java index 9cf4aadd9c..47a1b2ca39 100644 --- a/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java +++ b/spring-kitchensink-matrixvariables/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java @@ -75,7 +75,6 @@ public class RegistrationFormPageFragment { @FindBy(id = "phoneNumber.errors") private WebElement phoneNumberErrorMessage; - public void register(Member member) { nameField.clear(); nameField.sendKeys(member.getName()); diff --git a/spring-kitchensink-matrixvariables/pom.xml b/spring-kitchensink-matrixvariables/pom.xml index 8e5da8159c..323d18e3d8 100644 --- a/spring-kitchensink-matrixvariables/pom.xml +++ b/spring-kitchensink-matrixvariables/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> diff --git a/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/config/WebConfig.java b/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/config/WebConfig.java index 39da1c5ff2..83cfa517d9 100644 --- a/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/config/WebConfig.java +++ b/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/config/WebConfig.java @@ -23,7 +23,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; @Configuration -public class WebConfig extends WebMvcConfigurationSupport{ +public class WebConfig extends WebMvcConfigurationSupport { @Bean public RequestMappingHandlerMapping requestMappingHandlerMapping() { RequestMappingHandlerMapping handlerMapping = super.requestMappingHandlerMapping(); diff --git a/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/controller/MemberController.java b/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/controller/MemberController.java index 2d9f507b5e..006deb8684 100644 --- a/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/controller/MemberController.java +++ b/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/controller/MemberController.java @@ -67,7 +67,7 @@ public String displaySortedMembers(Model model) { // This was done by creating a Configuration class and pointing to it in the jboss-as-spring-mvc-context.xml. @RequestMapping(value = "/mv/{filter}", method = RequestMethod.GET) public ModelAndView filteredMembers(@MatrixVariable(value = "n", pathVar = "filter", required = false, defaultValue = "") String n, - @MatrixVariable(value = "e", pathVar = "filter", required = false, defaultValue = "") String e) { + @MatrixVariable(value = "e", pathVar = "filter", required = false, defaultValue = "") String e) { log.fine("filteredMembers @MatrixVariable n = " + n + ", e = " + e); ModelAndView model = new ModelAndView("index"); model.addObject("newMember", new Member()); @@ -77,7 +77,6 @@ public ModelAndView filteredMembers(@MatrixVariable(value = "n", pathVar = "filt return model; } - @RequestMapping(method = RequestMethod.POST) public String registerNewMember(@Valid @ModelAttribute("newMember") Member newMember, BindingResult result, Model model) { if (!result.hasErrors()) { diff --git a/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/controller/MemberRestController.java b/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/controller/MemberRestController.java index 8a48b4a979..aa56abc206 100644 --- a/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/controller/MemberRestController.java +++ b/spring-kitchensink-matrixvariables/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/controller/MemberRestController.java @@ -35,12 +35,14 @@ public class MemberRestController { private MemberDao memberDao; @RequestMapping(method = RequestMethod.GET, produces = "application/json") - public @ResponseBody List listAllMembers() { + public @ResponseBody + List listAllMembers() { return memberDao.findAllOrderedByName(); } @RequestMapping(value = "/{id}", method = RequestMethod.GET, produces = "application/json") - public @ResponseBody Member lookupMemberById(@PathVariable("id") Long id) { + public @ResponseBody + Member lookupMemberById(@PathVariable("id") Long id) { return memberDao.findById(id); } } diff --git a/spring-kitchensink-matrixvariables/src/main/resources/META-INF/persistence.xml b/spring-kitchensink-matrixvariables/src/main/resources/META-INF/persistence.xml index 80f4502bba..c1a3d5811e 100644 --- a/spring-kitchensink-matrixvariables/src/main/resources/META-INF/persistence.xml +++ b/spring-kitchensink-matrixvariables/src/main/resources/META-INF/persistence.xml @@ -20,13 +20,13 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - java:jboss/datasources/SpringQuickstartDSMatrix - @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-matrixvariables/src/main/resources/META-INF/spring/applicationContext.xml b/spring-kitchensink-matrixvariables/src/main/resources/META-INF/spring/applicationContext.xml index 4db6507e09..ecac41c0fd 100644 --- a/spring-kitchensink-matrixvariables/src/main/resources/META-INF/spring/applicationContext.xml +++ b/spring-kitchensink-matrixvariables/src/main/resources/META-INF/spring/applicationContext.xml @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-matrixvariables/src/main/resources/META-INF/spring/infrastructure.xml b/spring-kitchensink-matrixvariables/src/main/resources/META-INF/spring/infrastructure.xml index 4dbd9f8ab3..db4a1cb9e0 100644 --- a/spring-kitchensink-matrixvariables/src/main/resources/META-INF/spring/infrastructure.xml +++ b/spring-kitchensink-matrixvariables/src/main/resources/META-INF/spring/infrastructure.xml @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml b/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml index edf600a3fa..ac8a9743b4 100644 --- a/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml +++ b/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml @@ -26,7 +26,7 @@ - @@ -40,4 +40,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/spring-quickstart-ds.xml b/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/spring-quickstart-ds.xml index a6fe9e0cd2..1765c376bc 100644 --- a/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/spring-quickstart-ds.xml +++ b/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/spring-quickstart-ds.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + diff --git a/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/web.xml b/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/web.xml index de4d475336..b8d79ce7fc 100644 --- a/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/web.xml +++ b/spring-kitchensink-matrixvariables/src/main/webapp/WEB-INF/web.xml @@ -18,7 +18,7 @@ @@ -49,4 +49,4 @@ jboss-as-kitchensink / - \ No newline at end of file + diff --git a/spring-kitchensink-matrixvariables/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/test/MemberDaoTest.java b/spring-kitchensink-matrixvariables/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/test/MemberDaoTest.java index 7898ac5df3..37180e1936 100644 --- a/spring-kitchensink-matrixvariables/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/test/MemberDaoTest.java +++ b/spring-kitchensink-matrixvariables/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/matrixvariables/test/MemberDaoTest.java @@ -32,8 +32,8 @@ import org.springframework.transaction.annotation.Transactional; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:test-context.xml", - "classpath:/META-INF/spring/applicationContext.xml"}) +@ContextConfiguration(locations = { "classpath:test-context.xml", + "classpath:/META-INF/spring/applicationContext.xml" }) @Transactional @TransactionConfiguration(defaultRollback = true) public class MemberDaoTest { diff --git a/spring-kitchensink-matrixvariables/src/test/resources/META-INF/test-persistence.xml b/spring-kitchensink-matrixvariables/src/test/resources/META-INF/test-persistence.xml index d8a860cea9..f559036d50 100644 --- a/spring-kitchensink-matrixvariables/src/test/resources/META-INF/test-persistence.xml +++ b/spring-kitchensink-matrixvariables/src/test/resources/META-INF/test-persistence.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-matrixvariables/src/test/resources/test-context.xml b/spring-kitchensink-matrixvariables/src/test/resources/test-context.xml index 65c586e59f..4f1294269b 100644 --- a/spring-kitchensink-matrixvariables/src/test/resources/test-context.xml +++ b/spring-kitchensink-matrixvariables/src/test/resources/test-context.xml @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java b/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java index 0b3f95cafc..43dc3bfc4b 100644 --- a/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java +++ b/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/Member.java @@ -55,14 +55,19 @@ public void setPhoneNumber(String phoneNumber) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Member member = (Member) o; - if (email != null ? !email.equals(member.email) : member.email != null) return false; - if (name != null ? !name.equals(member.name) : member.name != null) return false; - if (phoneNumber != null ? !phoneNumber.equals(member.phoneNumber) : member.phoneNumber != null) return false; + if (email != null ? !email.equals(member.email) : member.email != null) + return false; + if (name != null ? !name.equals(member.name) : member.name != null) + return false; + if (phoneNumber != null ? !phoneNumber.equals(member.phoneNumber) : member.phoneNumber != null) + return false; return true; } diff --git a/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java b/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java index 5137ac7777..e66efced8e 100644 --- a/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java +++ b/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MemberPageFragment.java @@ -31,7 +31,6 @@ public class MemberPageFragment { @FindByJQuery("td:nth-child(4)") private WebElement phoneNumber; - public Member getMember() { return new Member(name.getText(), email.getText(), phoneNumber.getText()); } diff --git a/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java b/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java index befac7acee..70cee97dfa 100644 --- a/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java +++ b/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/MembersTablePageFragment.java @@ -28,7 +28,6 @@ public class MembersTablePageFragment { @FindByJQuery("tbody tr") private List members; - public Member getLatestMember() { return members.get(0).getMember(); } diff --git a/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java b/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java index 9cf4aadd9c..47a1b2ca39 100644 --- a/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java +++ b/spring-kitchensink-springmvctest/functional-tests/src/test/java/org/jboss/as/quickstarts/kitchensink/test/page/RegistrationFormPageFragment.java @@ -75,7 +75,6 @@ public class RegistrationFormPageFragment { @FindBy(id = "phoneNumber.errors") private WebElement phoneNumberErrorMessage; - public void register(Member member) { nameField.clear(); nameField.sendKeys(member.getName()); diff --git a/spring-kitchensink-springmvctest/pom.xml b/spring-kitchensink-springmvctest/pom.xml index c144cf99d4..f2668952a0 100644 --- a/spring-kitchensink-springmvctest/pom.xml +++ b/spring-kitchensink-springmvctest/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -183,7 +183,7 @@ jackson-databind ${version.jackson} - + org.slf4j slf4j-simple diff --git a/spring-kitchensink-springmvctest/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/controller/MemberRestController.java b/spring-kitchensink-springmvctest/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/controller/MemberRestController.java index 862fbbc055..6788f8c422 100644 --- a/spring-kitchensink-springmvctest/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/controller/MemberRestController.java +++ b/spring-kitchensink-springmvctest/src/main/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/controller/MemberRestController.java @@ -35,12 +35,14 @@ public class MemberRestController { private MemberDao memberDao; @RequestMapping(method = RequestMethod.GET, produces = "application/json") - public @ResponseBody List listAllMembers() { + public @ResponseBody + List listAllMembers() { return memberDao.findAllOrderedByName(); } @RequestMapping(value = "/{id}", method = RequestMethod.GET, produces = "application/json") - public @ResponseBody Member lookupMemberById(@PathVariable("id") Long id) { + public @ResponseBody + Member lookupMemberById(@PathVariable("id") Long id) { return memberDao.findById(id); } } diff --git a/spring-kitchensink-springmvctest/src/main/resources/META-INF/persistence.xml b/spring-kitchensink-springmvctest/src/main/resources/META-INF/persistence.xml index b343e5aa3d..7d0baaf766 100644 --- a/spring-kitchensink-springmvctest/src/main/resources/META-INF/persistence.xml +++ b/spring-kitchensink-springmvctest/src/main/resources/META-INF/persistence.xml @@ -20,17 +20,17 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - java:jboss/datasources/SpringQuickstartDSTest - - \ No newline at end of file + diff --git a/spring-kitchensink-springmvctest/src/main/resources/META-INF/spring/applicationContext.xml b/spring-kitchensink-springmvctest/src/main/resources/META-INF/spring/applicationContext.xml index 4171eab1ad..930a25c211 100644 --- a/spring-kitchensink-springmvctest/src/main/resources/META-INF/spring/applicationContext.xml +++ b/spring-kitchensink-springmvctest/src/main/resources/META-INF/spring/applicationContext.xml @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-springmvctest/src/main/resources/META-INF/spring/infrastructure.xml b/spring-kitchensink-springmvctest/src/main/resources/META-INF/spring/infrastructure.xml index 5c3df72839..f68d536ce4 100644 --- a/spring-kitchensink-springmvctest/src/main/resources/META-INF/spring/infrastructure.xml +++ b/spring-kitchensink-springmvctest/src/main/resources/META-INF/spring/infrastructure.xml @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml b/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml index c3d529e9f7..d87791358d 100644 --- a/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml +++ b/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/jboss-as-spring-mvc-context.xml @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/spring-quickstart-ds.xml b/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/spring-quickstart-ds.xml index 3939c31f69..42b4fcb65b 100644 --- a/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/spring-quickstart-ds.xml +++ b/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/spring-quickstart-ds.xml @@ -15,8 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + diff --git a/spring-kitchensink-springmvctest/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/test/MemberDaoTest.java b/spring-kitchensink-springmvctest/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/test/MemberDaoTest.java index 52197fd39e..717a8b00de 100644 --- a/spring-kitchensink-springmvctest/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/test/MemberDaoTest.java +++ b/spring-kitchensink-springmvctest/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/test/MemberDaoTest.java @@ -32,8 +32,8 @@ import org.springframework.transaction.annotation.Transactional; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:test-context.xml", - "classpath:/META-INF/spring/applicationContext.xml"}) +@ContextConfiguration(locations = { "classpath:test-context.xml", + "classpath:/META-INF/spring/applicationContext.xml" }) @Transactional @TransactionConfiguration(defaultRollback = true) public class MemberDaoTest { diff --git a/spring-kitchensink-springmvctest/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/test/MemberMockMVCTest.java b/spring-kitchensink-springmvctest/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/test/MemberMockMVCTest.java index 719e84a2e8..451a805aff 100644 --- a/spring-kitchensink-springmvctest/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/test/MemberMockMVCTest.java +++ b/spring-kitchensink-springmvctest/src/test/java/org/jboss/as/quickstarts/kitchensink/spring/springmvctest/test/MemberMockMVCTest.java @@ -42,8 +42,8 @@ @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration -@ContextConfiguration(locations = {"classpath:test-context.xml", - "classpath:/META-INF/spring/applicationContext.xml"}) +@ContextConfiguration(locations = { "classpath:test-context.xml", + "classpath:/META-INF/spring/applicationContext.xml" }) public class MemberMockMVCTest { @Autowired @@ -76,7 +76,7 @@ public void getAccountClient() throws Exception { @Test public void getAccount() throws Exception { this.mockMvc.perform(get("/rest/members/0").accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk()) - .andExpect(content().contentType("application/json")) - .andExpect(jsonPath("$.name").value("John Smith")); + .andExpect(content().contentType("application/json")) + .andExpect(jsonPath("$.name").value("John Smith")); } } diff --git a/spring-kitchensink-springmvctest/src/test/resources/META-INF/test-persistence.xml b/spring-kitchensink-springmvctest/src/test/resources/META-INF/test-persistence.xml index 4c8f1c029a..f77a321230 100644 --- a/spring-kitchensink-springmvctest/src/test/resources/META-INF/test-persistence.xml +++ b/spring-kitchensink-springmvctest/src/test/resources/META-INF/test-persistence.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/spring-kitchensink-springmvctest/src/test/resources/test-context.xml b/spring-kitchensink-springmvctest/src/test/resources/test-context.xml index a7957eede2..6479ac7250 100644 --- a/spring-kitchensink-springmvctest/src/test/resources/test-context.xml +++ b/spring-kitchensink-springmvctest/src/test/resources/test-context.xml @@ -46,4 +46,4 @@ - \ No newline at end of file + diff --git a/spring-petclinic/functional-tests/pom.xml b/spring-petclinic/functional-tests/pom.xml index 9609fbc780..62ef5395cf 100644 --- a/spring-petclinic/functional-tests/pom.xml +++ b/spring-petclinic/functional-tests/pom.xml @@ -35,9 +35,9 @@ - - UTF-8 diff --git a/spring-petclinic/functional-tests/src/test/java/org/jboss/as/quickstarts/spring/petclinic/test/webdriver/PetclinicTest.java b/spring-petclinic/functional-tests/src/test/java/org/jboss/as/quickstarts/spring/petclinic/test/webdriver/PetclinicTest.java index 67ef150e67..7bc1f406eb 100644 --- a/spring-petclinic/functional-tests/src/test/java/org/jboss/as/quickstarts/spring/petclinic/test/webdriver/PetclinicTest.java +++ b/spring-petclinic/functional-tests/src/test/java/org/jboss/as/quickstarts/spring/petclinic/test/webdriver/PetclinicTest.java @@ -191,7 +191,7 @@ public void addVisit() { waitModel().withMessage("Pets and visits page should be loaded").until().element(PETS_AND_VISITS).is().visible(); // TODO: fix the date Assert.assertTrue(SAMANTHA_THIRD_VISIT.getText().contains("Check paws!") && - SAMANTHA_THIRD_VISIT.getText().contains("2009-03-2")); + SAMANTHA_THIRD_VISIT.getText().contains("2009-03-2")); } @Test @@ -248,7 +248,7 @@ public void addOwner() { waitModel().until().element(OWNER_FORM).is().visible(); Assert.assertEquals(newOwner[0] + " " + newOwner[1], - OWNER_FORM.findElement(ByJQuery.selector("tr:contains('Name') td b")).getText()); + OWNER_FORM.findElement(ByJQuery.selector("tr:contains('Name') td b")).getText()); Assert.assertEquals(newOwner[2], OWNER_FORM.findElement(ByJQuery.selector("tr:contains('Address') td")).getText()); Assert.assertEquals(newOwner[3], OWNER_FORM.findElement(ByJQuery.selector("tr:contains('City') td")).getText()); Assert.assertEquals("486351729", OWNER_FORM.findElement(ByJQuery.selector("tr:contains('Telephone') td")).getText()); diff --git a/spring-petclinic/functional-tests/src/test/java/org/jboss/as/quickstarts/spring/petclinic/test/webdriver/Vet.java b/spring-petclinic/functional-tests/src/test/java/org/jboss/as/quickstarts/spring/petclinic/test/webdriver/Vet.java index bff0962383..db318d5829 100644 --- a/spring-petclinic/functional-tests/src/test/java/org/jboss/as/quickstarts/spring/petclinic/test/webdriver/Vet.java +++ b/spring-petclinic/functional-tests/src/test/java/org/jboss/as/quickstarts/spring/petclinic/test/webdriver/Vet.java @@ -3,9 +3,6 @@ */ package org.jboss.as.quickstarts.spring.petclinic.test.webdriver; - - - /** * @author mjobanek * @@ -72,6 +69,4 @@ public void setSpecialties(String[] specialties) { this.specialties = specialties; } - - } diff --git a/spring-petclinic/functional-tests/src/test/resources/arquillian.xml b/spring-petclinic/functional-tests/src/test/resources/arquillian.xml index a44ecd2d48..d9282b6903 100644 --- a/spring-petclinic/functional-tests/src/test/resources/arquillian.xml +++ b/spring-petclinic/functional-tests/src/test/resources/arquillian.xml @@ -23,7 +23,7 @@ - firefox - encodingFilter @@ -108,13 +108,13 @@ see here: http://static.springsource.org/spring/docs/current/spring-framework-re encodingFilter /* - + datatablesFilter com.github.dandelion.datatables.extras.servlet2.filter.DatatablesFilter - + datatablesFilter diff --git a/spring-petclinic/license.txt b/spring-petclinic/license.txt index f49a4e16e6..261eeb9e9f 100644 --- a/spring-petclinic/license.txt +++ b/spring-petclinic/license.txt @@ -198,4 +198,4 @@ 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. \ No newline at end of file + limitations under the License. diff --git a/spring-petclinic/pom.xml b/spring-petclinic/pom.xml index ca4bf0a0d1..c6b47d9b87 100644 --- a/spring-petclinic/pom.xml +++ b/spring-petclinic/pom.xml @@ -1,37 +1,37 @@ - 4.0.0 - org.jboss.quickstarts.eap - jboss-spring-petclinic - 7.0.0-SNAPSHOT + 4.0.0 + org.jboss.quickstarts.eap + jboss-spring-petclinic + 7.0.0-SNAPSHOT - JBoss EAP Quickstart: spring-petclinic - war + JBoss EAP Quickstart: spring-petclinic + war - JBoss EAP Quickstart: PetClinic - http://www.jboss.org/products/eap + JBoss EAP Quickstart: PetClinic + http://www.jboss.org/products/eap - - - Apache License, Version 2.0 - repo - http://www.apache.org/licenses/LICENSE-2.0.html - - + + + Apache License, Version 2.0 + repo + http://www.apache.org/licenses/LICENSE-2.0.html + + @@ -110,64 +110,64 @@ - + - - 1.0.2.Final + + 1.0.2.Final 7.0.0-build-7 - - UTF-8 - UTF-8 + + UTF-8 + UTF-8 - - 1.1.3.RELEASE - 1.1.0.RELEASE + + 1.1.3.RELEASE + 1.1.0.RELEASE - - 7.0.59 + + 7.0.59 - - 2.1.0 + + 2.1.0 - - 1.3 - 1.1.1 - 3.2.0.GA + + 1.3 + 1.1.1 + 3.2.0.GA - - 2.3.0 - 1.10.3 - 2.0.3-1 - 1.0.1 + + 2.3.0 + 1.10.3 + 2.0.3-1 + 1.0.1 - 2.7 + 2.7 - 2.4 - 2.9 - 2.0 - 2.13 - 2.0 - 2.3 + 2.4 + 2.9 + 2.0 + 2.13 + 2.0 + 2.3 - - 1.8 - 1.8 + + 1.8 + 1.8 - + - - - - - io.spring.platform - platform-bom - ${spring-io-platform.version} - pom - import - + + + + + io.spring.platform + platform-bom + ${spring-io-platform.version} + pom + import + - - com.jayway.jsonpath - json-path - test - - - com.googlecode.json-simple - json-simple - 1.1 - - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - org.springframework.data - spring-data-jdbc-core - ${spring-data-jdbc.version} - - - org.springframework - * - - - - - - - org.springframework - spring-jdbc - - - org.springframework - spring-webmvc - - - - org.springframework - spring-context-support - - - org.springframework - spring-oxm - - - - org.aspectj - aspectjrt - - - org.aspectj - aspectjweaver - runtime - - - - - org.apache.tomcat - tomcat-jdbc - runtime - - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - runtime - - - - - joda-time - joda-time - - - joda-time - joda-time-hibernate - ${jodatime-hibernate.version} - - - joda-time - joda-time-jsptags - ${jodatime-jsptags.version} - - - - - org.hsqldb - hsqldb - runtime - - - - - org.hibernate - hibernate-entitymanager - - - org.hibernate - hibernate-validator - - - - org.hibernate - hibernate-ehcache - - - net.sf.ehcache - ehcache-core - - - commons-logging - commons-logging - - - - - - org.webjars - bootstrap - ${webjars-bootstrap.version} - - - org.webjars - jquery-ui - ${webjars-jquery-ui.version} - - - org.webjars - jquery - ${webjars-jquery.version} - - - - - org.springframework - spring-test - test - - - junit - junit - test - - - org.assertj - assertj-core - ${assertj.version} - test - - - - - com.github.dandelion - datatables-jsp - ${dandelion.version} - - - com.github.dandelion - datatables-export-itext - ${dandelion.version} - - - - - - install - - - - ${project.basedir}/src/test/java - - - ${project.basedir}/src/test/resources - - - ${project.artifactId} - - - org.apache.maven.plugins - maven-surefire-plugin - ${version.maven.surefire} - - - **/*Tests.java - - - - - org.apache.maven.plugins - maven-war-plugin - ${version.war.plugin} - - ${project.artifactId} - - - - org.apache.maven.plugins - maven-eclipse-plugin - ${version.maven.eclipse} - - true - true - ${version.maven.eclipse.wtp} - - **/*.* - - - - org.springframework.ide.eclipse.core.springbuilder - - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.jdt.core.javanature - org.springframework.ide.eclipse.core.springnature - org.eclipse.m2e.core.maven2Nature - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${version.maven.assembly} - - - jar-with-dependencies - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - ${version.tomcat.maven} - - tomcat-development-server - 9966 - /petclinic - - - - org.codehaus.mojo - cobertura-maven-plugin - ${cobertura.version} - - - - - - - clean - check - - - - - - - - org.wildfly.plugins - wildfly-maven-plugin - ${version.wildfly.maven.plugin} - - - - - - - - - org.codehaus.mojo - cobertura-maven-plugin - ${cobertura.version} - - - html - - - - - - - - - - eap - - true - - - - - - - - - openshift - - - - maven-war-plugin - ${version.war.plugin} - - deployments - ROOT - - - - - - + + org.jboss.bom + jboss-javaee-7.0-eap-with-spring4 + ${version.jboss.bom.eap} + pom + import + + + + + + + + org.jadira.usertype + usertype.core + ${jadira-usertype-core.version} + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.1_spec + provided + + + javax.servlet.jsp + javax.servlet.jsp-api + + + org.apache.tomcat + tomcat-jasper-el + ${tomcat.version} + + + + org.jboss.spec.javax.servlet.jstl + jboss-jstl-api_1.2_spec + provided + + + org.apache.taglibs + taglibs-standard-jstlel + + + + + com.jayway.jsonpath + json-path + test + + + com.googlecode.json-simple + json-simple + 1.1 + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.springframework.data + spring-data-jdbc-core + ${spring-data-jdbc.version} + + + org.springframework + * + + + + + + + org.springframework + spring-jdbc + + + org.springframework + spring-webmvc + + + + org.springframework + spring-context-support + + + org.springframework + spring-oxm + + + + org.aspectj + aspectjrt + + + org.aspectj + aspectjweaver + runtime + + + + + org.apache.tomcat + tomcat-jdbc + runtime + + + + + org.slf4j + slf4j-api + + + ch.qos.logback + logback-classic + runtime + + + + + joda-time + joda-time + + + joda-time + joda-time-hibernate + ${jodatime-hibernate.version} + + + joda-time + joda-time-jsptags + ${jodatime-jsptags.version} + + + + + org.hsqldb + hsqldb + runtime + + + + + org.hibernate + hibernate-entitymanager + + + org.hibernate + hibernate-validator + + + + org.hibernate + hibernate-ehcache + + + net.sf.ehcache + ehcache-core + + + commons-logging + commons-logging + + + + + + org.webjars + bootstrap + ${webjars-bootstrap.version} + + + org.webjars + jquery-ui + ${webjars-jquery-ui.version} + + + org.webjars + jquery + ${webjars-jquery.version} + + + + + org.springframework + spring-test + test + + + junit + junit + test + + + org.assertj + assertj-core + ${assertj.version} + test + + + + + com.github.dandelion + datatables-jsp + ${dandelion.version} + + + com.github.dandelion + datatables-export-itext + ${dandelion.version} + + + + + + install + + + + ${project.basedir}/src/test/java + + + ${project.basedir}/src/test/resources + + + ${project.artifactId} + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.maven.surefire} + + + **/*Tests.java + + + + + org.apache.maven.plugins + maven-war-plugin + ${version.war.plugin} + + ${project.artifactId} + + + + org.apache.maven.plugins + maven-eclipse-plugin + ${version.maven.eclipse} + + true + true + ${version.maven.eclipse.wtp} + + **/*.* + + + + org.springframework.ide.eclipse.core.springbuilder + + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.springframework.ide.eclipse.core.springnature + org.eclipse.m2e.core.maven2Nature + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${version.maven.assembly} + + + jar-with-dependencies + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + ${version.tomcat.maven} + + tomcat-development-server + 9966 + /petclinic + + + + org.codehaus.mojo + cobertura-maven-plugin + ${cobertura.version} + + + + + + + clean + check + + + + + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.wildfly.maven.plugin} + + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + ${cobertura.version} + + + html + + + + + + + + + + eap + + true + + + + + + + + + openshift + + + + maven-war-plugin + ${version.war.plugin} + + deployments + ROOT + + + + + + diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java index 8dfbfe90b4..babc48ae94 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java @@ -32,7 +32,6 @@ public class BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) protected Integer id; - public void setId(Integer id) { this.id = id; } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java index cb36a6267a..351e8b232a 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java @@ -18,7 +18,6 @@ import javax.persistence.Column; import javax.persistence.MappedSuperclass; - /** * Simple JavaBean domain object adds a name property to BaseEntity. Used as a base class for objects * needing these properties. @@ -32,7 +31,6 @@ public class NamedEntity extends BaseEntity { @Column(name = "name") private String name; - public void setName(String name) { this.name = name; } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Owner.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Owner.java index ca7c97ec27..3a21d514bc 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Owner.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Owner.java @@ -60,7 +60,6 @@ public class Owner extends Person { @OneToMany(cascade = CascadeType.ALL, mappedBy = "owner") private Set pets; - public String getAddress() { return this.address; } @@ -141,13 +140,13 @@ public Pet getPet(String name, boolean ignoreNew) { public String toString() { return new ToStringCreator(this) - .append("id", this.getId()) - .append("new", this.isNew()) - .append("lastName", this.getLastName()) - .append("firstName", this.getFirstName()) - .append("address", this.address) - .append("city", this.city) - .append("telephone", this.telephone) - .toString(); + .append("id", this.getId()) + .append("new", this.isNew()) + .append("lastName", this.getLastName()) + .append("firstName", this.getFirstName()) + .append("address", this.address) + .append("city", this.city) + .append("telephone", this.telephone) + .toString(); } } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Person.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Person.java index d3e03c0ddf..4784ed05dc 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Person.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Person.java @@ -52,5 +52,4 @@ public void setLastName(String lastName) { this.lastName = lastName; } - } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Pet.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Pet.java index 536fe07e69..b9ef10d099 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Pet.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Pet.java @@ -63,7 +63,6 @@ public class Pet extends NamedEntity { @OneToMany(cascade = CascadeType.ALL, mappedBy = "pet", fetch = FetchType.EAGER) private Set visits; - public void setBirthDate(DateTime birthDate) { this.birthDate = birthDate; } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Vet.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Vet.java index 61c5187863..90fa0b9c70 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Vet.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Vet.java @@ -46,10 +46,9 @@ public class Vet extends Person { @ManyToMany(fetch = FetchType.EAGER) @JoinTable(name = "vet_specialties", joinColumns = @JoinColumn(name = "vet_id"), - inverseJoinColumns = @JoinColumn(name = "specialty_id")) + inverseJoinColumns = @JoinColumn(name = "specialty_id")) private Set specialties; - protected void setSpecialtiesInternal(Set specialties) { this.specialties = specialties; } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Visit.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Visit.java index ea03bde74b..24515fcb5d 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Visit.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Visit.java @@ -57,7 +57,6 @@ public class Visit extends BaseEntity { @JoinColumn(name = "pet_id") private Pet pet; - /** * Creates a new instance of Visit for the current date */ @@ -65,7 +64,6 @@ public Visit() { this.date = new DateTime(); } - /** * Getter for property date. * diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java index a4209ed17d..c9780ae384 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java @@ -52,7 +52,6 @@ public interface OwnerRepository { */ Owner findById(int id) throws DataAccessException; - /** * Save an Owner to the data store, either inserting or updating it. * @@ -61,5 +60,4 @@ public interface OwnerRepository { */ void save(Owner owner) throws DataAccessException; - } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java index 923c3c23df..4f80519331 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java @@ -38,5 +38,4 @@ public interface VetRepository { */ Collection findAll() throws DataAccessException; - } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java index 63aec2a1f6..81f07b6584 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java @@ -58,14 +58,13 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository { public JdbcOwnerRepositoryImpl(DataSource dataSource, NamedParameterJdbcTemplate namedParameterJdbcTemplate) { this.insertOwner = new SimpleJdbcInsert(dataSource) - .withTableName("owners") - .usingGeneratedKeyColumns("id"); + .withTableName("owners") + .usingGeneratedKeyColumns("id"); this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource); } - /** * Loads {@link Owner Owners} from the data store by last name, returning all owners whose last name starts with * the given name; also loads the {@link Pet Pets} and {@link Visit Visits} for the corresponding owners, if not @@ -76,10 +75,10 @@ public Collection findByLastName(String lastName) throws DataAccessExcept Map params = new HashMap<>(); params.put("lastName", lastName + "%"); List owners = this.namedParameterJdbcTemplate.query( - "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE last_name like :lastName", - params, - BeanPropertyRowMapper.newInstance(Owner.class) - ); + "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE last_name like :lastName", + params, + BeanPropertyRowMapper.newInstance(Owner.class) + ); loadOwnersPetsAndVisits(owners); return owners; } @@ -95,10 +94,10 @@ public Owner findById(int id) throws DataAccessException { Map params = new HashMap<>(); params.put("id", id); owner = this.namedParameterJdbcTemplate.queryForObject( - "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE id= :id", - params, - BeanPropertyRowMapper.newInstance(Owner.class) - ); + "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE id= :id", + params, + BeanPropertyRowMapper.newInstance(Owner.class) + ); } catch (EmptyResultDataAccessException ex) { throw new ObjectRetrievalFailureException(Owner.class, id); } @@ -109,11 +108,13 @@ public Owner findById(int id) throws DataAccessException { public void loadPetsAndVisits(final Owner owner) { Map params = new HashMap<>(); params.put("id", owner.getId()); - final List pets = this.namedParameterJdbcTemplate.query( - "SELECT pets.id, name, birth_date, type_id, owner_id, visits.id, visit_date, description, pet_id FROM pets LEFT OUTER JOIN visits ON pets.id = pet_id WHERE owner_id=:id", - params, - new JdbcPetVisitExtractor() - ); + final List pets = + this.namedParameterJdbcTemplate + .query( + "SELECT pets.id, name, birth_date, type_id, owner_id, visits.id, visit_date, description, pet_id FROM pets LEFT OUTER JOIN visits ON pets.id = pet_id WHERE owner_id=:id", + params, + new JdbcPetVisitExtractor() + ); for (JdbcPet pet : pets) { owner.addPet(pet); } @@ -127,16 +128,16 @@ public void save(Owner owner) throws DataAccessException { owner.setId(newKey.intValue()); } else { this.namedParameterJdbcTemplate.update( - "UPDATE owners SET first_name=:firstName, last_name=:lastName, address=:address, " + - "city=:city, telephone=:telephone WHERE id=:id", - parameterSource); + "UPDATE owners SET first_name=:firstName, last_name=:lastName, address=:address, " + + "city=:city, telephone=:telephone WHERE id=:id", + parameterSource); } } public Collection getPetTypes() throws DataAccessException { return this.namedParameterJdbcTemplate.query( - "SELECT id, name FROM types ORDER BY name", new HashMap(), - BeanPropertyRowMapper.newInstance(PetType.class)); + "SELECT id, name FROM types ORDER BY name", new HashMap(), + BeanPropertyRowMapper.newInstance(PetType.class)); } /** @@ -151,5 +152,4 @@ private void loadOwnersPetsAndVisits(List owners) { } } - } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java index 39ba53b83a..94900a43fe 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java @@ -29,7 +29,6 @@ class JdbcPet extends Pet { private int ownerId; - public void setTypeId(int typeId) { this.typeId = typeId; } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java index e3c02fc93f..a0980f3bb6 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java @@ -58,14 +58,13 @@ public class JdbcPetRepositoryImpl implements PetRepository { private VisitRepository visitRepository; - @Autowired public JdbcPetRepositoryImpl(DataSource dataSource, OwnerRepository ownerRepository, VisitRepository visitRepository) { this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource); this.insertPet = new SimpleJdbcInsert(dataSource) - .withTableName("pets") - .usingGeneratedKeyColumns("id"); + .withTableName("pets") + .usingGeneratedKeyColumns("id"); this.ownerRepository = ownerRepository; this.visitRepository = visitRepository; @@ -75,9 +74,9 @@ public JdbcPetRepositoryImpl(DataSource dataSource, OwnerRepository ownerReposit public List findPetTypes() throws DataAccessException { Map params = new HashMap<>(); return this.namedParameterJdbcTemplate.query( - "SELECT id, name FROM types ORDER BY name", - params, - BeanPropertyRowMapper.newInstance(PetType.class)); + "SELECT id, name FROM types ORDER BY name", + params, + BeanPropertyRowMapper.newInstance(PetType.class)); } @Override @@ -87,9 +86,9 @@ public Pet findById(int id) throws DataAccessException { Map params = new HashMap<>(); params.put("id", id); pet = this.namedParameterJdbcTemplate.queryForObject( - "SELECT id, name, birth_date, type_id, owner_id FROM pets WHERE id=:id", - params, - new JdbcPetRowMapper()); + "SELECT id, name, birth_date, type_id, owner_id FROM pets WHERE id=:id", + params, + new JdbcPetRowMapper()); } catch (EmptyResultDataAccessException ex) { throw new ObjectRetrievalFailureException(Pet.class, id); } @@ -108,13 +107,13 @@ public Pet findById(int id) throws DataAccessException { public void save(Pet pet) throws DataAccessException { if (pet.isNew()) { Number newKey = this.insertPet.executeAndReturnKey( - createPetParameterSource(pet)); + createPetParameterSource(pet)); pet.setId(newKey.intValue()); } else { this.namedParameterJdbcTemplate.update( - "UPDATE pets SET name=:name, birth_date=:birth_date, type_id=:type_id, " + - "owner_id=:owner_id WHERE id=:id", - createPetParameterSource(pet)); + "UPDATE pets SET name=:name, birth_date=:birth_date, type_id=:type_id, " + + "owner_id=:owner_id WHERE id=:id", + createPetParameterSource(pet)); } } @@ -123,11 +122,11 @@ public void save(Pet pet) throws DataAccessException { */ private MapSqlParameterSource createPetParameterSource(Pet pet) { return new MapSqlParameterSource() - .addValue("id", pet.getId()) - .addValue("name", pet.getName()) - .addValue("birth_date", pet.getBirthDate().toDate()) - .addValue("type_id", pet.getType().getId()) - .addValue("owner_id", pet.getOwner().getId()); + .addValue("id", pet.getId()) + .addValue("name", pet.getName()) + .addValue("birth_date", pet.getBirthDate().toDate()) + .addValue("type_id", pet.getType().getId()) + .addValue("owner_id", pet.getOwner().getId()); } } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java index e43f1a3981..6a4ba62c3e 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java @@ -27,7 +27,7 @@ * {@link OneToManyResultSetExtractor} of Spring Data Core JDBC Extensions. */ public class JdbcPetVisitExtractor extends - OneToManyResultSetExtractor { + OneToManyResultSetExtractor { public JdbcPetVisitExtractor() { super(new JdbcPetRowMapper(), new JdbcVisitRowMapper()); diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java index 79db917f9c..0231275c1c 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java @@ -60,25 +60,25 @@ public Collection findAll() throws DataAccessException { List vets = new ArrayList<>(); // Retrieve the list of all vets. vets.addAll(this.jdbcTemplate.query( - "SELECT id, first_name, last_name FROM vets ORDER BY last_name,first_name", - BeanPropertyRowMapper.newInstance(Vet.class))); + "SELECT id, first_name, last_name FROM vets ORDER BY last_name,first_name", + BeanPropertyRowMapper.newInstance(Vet.class))); // Retrieve the list of all possible specialties. final List specialties = this.jdbcTemplate.query( - "SELECT id, name FROM specialties", - BeanPropertyRowMapper.newInstance(Specialty.class)); + "SELECT id, name FROM specialties", + BeanPropertyRowMapper.newInstance(Specialty.class)); // Build each vet's list of specialties. for (Vet vet : vets) { final List vetSpecialtiesIds = this.jdbcTemplate.query( - "SELECT specialty_id FROM vet_specialties WHERE vet_id=?", - new BeanPropertyRowMapper() { - @Override - public Integer mapRow(ResultSet rs, int row) throws SQLException { - return rs.getInt(1); - } - }, - vet.getId()); + "SELECT specialty_id FROM vet_specialties WHERE vet_id=?", + new BeanPropertyRowMapper() { + @Override + public Integer mapRow(ResultSet rs, int row) throws SQLException { + return rs.getInt(1); + } + }, + vet.getId()); for (int specialtyId : vetSpecialtiesIds) { Specialty specialty = EntityUtils.getById(specialties, Specialty.class, specialtyId); vet.addSpecialty(specialty); diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java index a923b7652b..d2478cf34b 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java @@ -50,39 +50,37 @@ public JdbcVisitRepositoryImpl(DataSource dataSource) { this.jdbcTemplate = new JdbcTemplate(dataSource); this.insertVisit = new SimpleJdbcInsert(dataSource) - .withTableName("visits") - .usingGeneratedKeyColumns("id"); + .withTableName("visits") + .usingGeneratedKeyColumns("id"); } - @Override public void save(Visit visit) throws DataAccessException { if (visit.isNew()) { Number newKey = this.insertVisit.executeAndReturnKey( - createVisitParameterSource(visit)); + createVisitParameterSource(visit)); visit.setId(newKey.intValue()); } else { throw new UnsupportedOperationException("Visit update not supported"); } } - /** * Creates a {@link MapSqlParameterSource} based on data values from the supplied {@link Visit} instance. */ private MapSqlParameterSource createVisitParameterSource(Visit visit) { return new MapSqlParameterSource() - .addValue("id", visit.getId()) - .addValue("visit_date", visit.getDate().toDate()) - .addValue("description", visit.getDescription()) - .addValue("pet_id", visit.getPet().getId()); + .addValue("id", visit.getId()) + .addValue("visit_date", visit.getDate().toDate()) + .addValue("description", visit.getDescription()) + .addValue("pet_id", visit.getPet().getId()); } @Override public List findByPetId(Integer petId) { return this.jdbcTemplate.query( - "SELECT id as visit_id, visit_date, description FROM visits WHERE pet_id=?", - new JdbcVisitRowMapper(), petId); + "SELECT id as visit_id, visit_date, description FROM visits WHERE pet_id=?", + new JdbcVisitRowMapper(), petId); } } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRowMapper.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRowMapper.java index d6dd0cbf8b..8fbf32ccf6 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRowMapper.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRowMapper.java @@ -15,7 +15,6 @@ */ package org.springframework.samples.petclinic.repository.jdbc; - import org.joda.time.DateTime; import org.springframework.jdbc.core.RowMapper; import org.springframework.samples.petclinic.model.Visit; diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java index 9a56bca75b..8b8b0e796d 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java @@ -41,7 +41,6 @@ public class JpaOwnerRepositoryImpl implements OwnerRepository { @PersistenceContext private EntityManager em; - /** * Important: in the current version of this method, we load Owners with all their Pets and Visits while * we do not need Visits at all and we only need one property from the Pet objects (the 'name' property). @@ -67,15 +66,14 @@ public Owner findById(int id) { return (Owner) query.getSingleResult(); } - @Override public void save(Owner owner) { - if (owner.getId() == null) { - this.em.persist(owner); - } - else { - this.em.merge(owner); - } + if (owner.getId() == null) { + this.em.persist(owner); + } + else { + this.em.merge(owner); + } } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java index 7d7d5cc3d1..605375a67f 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java @@ -53,12 +53,12 @@ public Pet findById(int id) { @Override public void save(Pet pet) { - if (pet.getId() == null) { - this.em.persist(pet); - } - else { - this.em.merge(pet); - } + if (pet.getId() == null) { + this.em.persist(pet); + } + else { + this.em.merge(pet); + } } } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java index e4c222b65a..7dc00ff956 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java @@ -40,7 +40,6 @@ public class JpaVetRepositoryImpl implements VetRepository { @PersistenceContext private EntityManager em; - @Override @Cacheable(value = "vets") @SuppressWarnings("unchecked") diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java index 40e44a01e8..e668374f75 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java @@ -42,18 +42,16 @@ public class JpaVisitRepositoryImpl implements VisitRepository { @PersistenceContext private EntityManager em; - @Override public void save(Visit visit) { - if (visit.getId() == null) { - this.em.persist(visit); - } - else { - this.em.merge(visit); - } + if (visit.getId() == null) { + this.em.persist(visit); + } + else { + this.em.merge(visit); + } } - @Override @SuppressWarnings("unchecked") public List findByPetId(Integer petId) { diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java index 3b55f6dba6..24c573eb7d 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java @@ -31,11 +31,11 @@ */ public interface SpringDataOwnerRepository extends OwnerRepository, Repository { - @Override - @Query("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName%") - public Collection findByLastName(@Param("lastName") String lastName); + @Override + @Query("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName%") + public Collection findByLastName(@Param("lastName") String lastName); - @Override - @Query("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.id =:id") - public Owner findById(@Param("id") int id); + @Override + @Query("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.id =:id") + public Owner findById(@Param("id") int id); } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java index 9365821293..23069f11f9 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java @@ -24,7 +24,6 @@ import org.springframework.samples.petclinic.model.Vet; import org.springframework.samples.petclinic.model.Visit; - /** * Mostly used as a facade so all controllers have a single point of entry * diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java index 0d7ff4d0c7..03faf4bc37 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java @@ -78,14 +78,12 @@ public void saveOwner(Owner owner) throws DataAccessException { ownerRepository.save(owner); } - @Override @Transactional public void saveVisit(Visit visit) throws DataAccessException { visitRepository.save(visit); } - @Override @Transactional(readOnly = true) public Pet findPetById(int id) throws DataAccessException { @@ -105,5 +103,4 @@ public Collection findVets() throws DataAccessException { return vetRepository.findAll(); } - } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java index f4bbc6406f..0dab65c4fa 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java @@ -42,10 +42,9 @@ public class CallMonitoringAspect { private long accumulatedCallTime = 0; - @ManagedAttribute public void setEnabled(boolean enabled) { - this.enabled = enabled; + this.enabled = enabled; } @ManagedAttribute @@ -66,13 +65,12 @@ public int getCallCount() { @ManagedAttribute public long getCallTime() { - if (this.callCount > 0) - return this.accumulatedCallTime / this.callCount; - else - return 0; + if (this.callCount > 0) + return this.accumulatedCallTime / this.callCount; + else + return 0; } - @Around("within(@org.springframework.stereotype.Repository *)") public Object invoke(ProceedingJoinPoint joinPoint) throws Throwable { if (this.enabled) { diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java index 41486a5a76..12b3bc3071 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java @@ -43,7 +43,7 @@ public abstract class EntityUtils { * if the entity was not found */ public static T getById(Collection entities, Class entityClass, int entityId) - throws ObjectRetrievalFailureException { + throws ObjectRetrievalFailureException { for (T entity : entities) { if (entity.getId() == entityId && entityClass.isInstance(entity)) { return entity; diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/CrashController.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/CrashController.java index e413f3f3b8..1664846550 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/CrashController.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/CrashController.java @@ -33,8 +33,7 @@ public class CrashController { @RequestMapping(value = "/oups", method = RequestMethod.GET) public String triggerException() { throw new RuntimeException("Expected: controller used to showcase what " + - "happens when an exception is thrown"); + "happens when an exception is thrown"); } - } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java index bc8c6363a4..b720dcabef 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java @@ -47,7 +47,6 @@ public class OwnerController { private final ClinicService clinicService; - @Autowired public OwnerController(ClinicService clinicService) { this.clinicService = clinicService; @@ -98,9 +97,9 @@ public String processFindForm(Owner owner, BindingResult result, Map { private final ClinicService clinicService; - @Autowired public PetTypeFormatter(ClinicService clinicService) { this.clinicService = clinicService; diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java index 3144dac1c6..4b2127bad2 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java @@ -48,7 +48,7 @@ public void validate(Object obj, Errors errors) { } // birth date validation - if (pet.getBirthDate()==null) { + if (pet.getBirthDate() == null) { errors.rejectValue("birthDate", "required", "required"); } } @@ -61,5 +61,4 @@ public boolean supports(Class clazz) { return Pet.class.equals(clazz); } - } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VetController.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VetController.java index 6365fe4581..85a4f3efa5 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VetController.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VetController.java @@ -35,13 +35,12 @@ public class VetController { private final ClinicService clinicService; - @Autowired public VetController(ClinicService clinicService) { this.clinicService = clinicService; } - @RequestMapping(value={"/vets.xml","/vets.html"}) + @RequestMapping(value = { "/vets.xml", "/vets.html" }) public String showVetList(Map model) { // Here we are returning an object of type 'Vets' rather than a collection of Vet objects // so it is simpler for Object-Xml mapping @@ -52,7 +51,8 @@ public String showVetList(Map model) { } @RequestMapping("/vets.json") - public @ResponseBody Vets showResourcesVetList() { + public @ResponseBody + Vets showResourcesVetList() { // Here we are returning an object of type 'Vets' rather than a collection of Vet objects // so it is simpler for JSon/Object mapping Vets vets = new Vets(); @@ -60,5 +60,4 @@ public String showVetList(Map model) { return vets; } - } diff --git a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VisitController.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VisitController.java index faa2ed4873..e0e98d6008 100644 --- a/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VisitController.java +++ b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VisitController.java @@ -43,7 +43,6 @@ public class VisitController { private final ClinicService clinicService; - @Autowired public VisitController(ClinicService clinicService) { this.clinicService = clinicService; @@ -71,13 +70,13 @@ public Visit loadPetWithVisit(@PathVariable("petId") int petId) { return visit; } - // Spring MVC calls method loadPetWithVisit(...) before initNewVisitForm is called + // Spring MVC calls method loadPetWithVisit(...) before initNewVisitForm is called @RequestMapping(value = "/owners/*/pets/{petId}/visits/new", method = RequestMethod.GET) public String initNewVisitForm(@PathVariable("petId") int petId, Map model) { return "pets/createOrUpdateVisitForm"; } - // Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is called + // Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is called @RequestMapping(value = "/owners/{ownerId}/pets/{petId}/visits/new", method = RequestMethod.POST) public String processNewVisitForm(@Valid Visit visit, BindingResult result) { if (result.hasErrors()) { diff --git a/spring-petclinic/src/main/resources/logback.xml b/spring-petclinic/src/main/resources/logback.xml index ddba53cef5..f135a5ee1f 100644 --- a/spring-petclinic/src/main/resources/logback.xml +++ b/spring-petclinic/src/main/resources/logback.xml @@ -31,9 +31,9 @@ - + - + diff --git a/spring-petclinic/src/main/resources/spring/business-config.xml b/spring-petclinic/src/main/resources/spring/business-config.xml index b477369047..77382041d8 100644 --- a/spring-petclinic/src/main/resources/spring/business-config.xml +++ b/spring-petclinic/src/main/resources/spring/business-config.xml @@ -19,13 +19,13 @@ Repository and Service layers --> - + xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context" + xmlns:tx="http://www.springframework.org/schema/tx" xmlns:jpa="http://www.springframework.org/schema/data/jpa" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + @@ -40,14 +40,14 @@ - - - - + + + + @@ -109,4 +109,4 @@ - \ No newline at end of file + diff --git a/spring-petclinic/src/main/resources/spring/datasource-config.xml b/spring-petclinic/src/main/resources/spring/datasource-config.xml index 7128714a7b..e91c5c61d3 100644 --- a/spring-petclinic/src/main/resources/spring/datasource-config.xml +++ b/spring-petclinic/src/main/resources/spring/datasource-config.xml @@ -1,59 +1,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-petclinic/src/main/resources/spring/mvc-core-config.xml b/spring-petclinic/src/main/resources/spring/mvc-core-config.xml index 8dcb2a03b3..96c75b5791 100644 --- a/spring-petclinic/src/main/resources/spring/mvc-core-config.xml +++ b/spring-petclinic/src/main/resources/spring/mvc-core-config.xml @@ -49,7 +49,7 @@ - @@ -69,7 +69,7 @@ p:basename="messages/messages"/> diff --git a/spring-petclinic/src/main/resources/spring/mvc-view-config.xml b/spring-petclinic/src/main/resources/spring/mvc-view-config.xml index 1c6edf75ae..34952c299b 100644 --- a/spring-petclinic/src/main/resources/spring/mvc-view-config.xml +++ b/spring-petclinic/src/main/resources/spring/mvc-view-config.xml @@ -16,32 +16,32 @@ --> + xmlns:oxm="http://www.springframework.org/schema/oxm" xmlns:mvc="http://www.springframework.org/schema/mvc" + xsi:schemaLocation="http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm.xsd + http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/spring-petclinic/src/main/resources/spring/tools-config.xml b/spring-petclinic/src/main/resources/spring/tools-config.xml index 79f44715f9..bdcb99235e 100644 --- a/spring-petclinic/src/main/resources/spring/tools-config.xml +++ b/spring-petclinic/src/main/resources/spring/tools-config.xml @@ -16,7 +16,7 @@ --> - \ No newline at end of file + diff --git a/spring-petclinic/src/main/webapp/WEB-INF/no-spring-config-files-there.txt b/spring-petclinic/src/main/webapp/WEB-INF/no-spring-config-files-there.txt index 45fb7bf0a6..43e45a4578 100644 --- a/spring-petclinic/src/main/webapp/WEB-INF/no-spring-config-files-there.txt +++ b/spring-petclinic/src/main/webapp/WEB-INF/no-spring-config-files-there.txt @@ -1,4 +1,4 @@ All Spring config files (including Spring MVC ones) are inside src/main/resource. There are mostly 2 reasons to that: - All Spring config files are grouped into one single place -- It is simpler to reference them from inside JUnit tests \ No newline at end of file +- It is simpler to reference them from inside JUnit tests diff --git a/spring-petclinic/src/main/webapp/WEB-INF/web.xml b/spring-petclinic/src/main/webapp/WEB-INF/web.xml index 054b7953e8..7e745565fc 100644 --- a/spring-petclinic/src/main/webapp/WEB-INF/web.xml +++ b/spring-petclinic/src/main/webapp/WEB-INF/web.xml @@ -1,145 +1,145 @@ - - - - - - Spring PetClinic - Spring PetClinic sample application - - - spring.profiles.active - jpa - - - - - - - - - - - contextConfigLocation - classpath:spring/business-config.xml, classpath:spring/tools-config.xml - - - - org.springframework.web.context.ContextLoaderListener - - - - - petclinic - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - classpath:spring/mvc-core-config.xml - - 1 - - - - petclinic - / - - - - - dandelionServlet - com.github.dandelion.core.web.DandelionServlet - 2 - - - dandelionServlet - /dandelion-assets/* - - - - - encodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - forceEncoding - true - - - - - encodingFilter - /* - - - - - dandelionFilter - com.github.dandelion.core.web.DandelionFilter - - - dandelionFilter - /* - - - - - httpMethodFilter - org.springframework.web.filter.HiddenHttpMethodFilter - - - - httpMethodFilter - petclinic - - - - - datatables - com.github.dandelion.datatables.core.web.filter.DatatablesFilter - - - datatables - /* - - - - - \ No newline at end of file + + + + + + Spring PetClinic + Spring PetClinic sample application + + + spring.profiles.active + jpa + + + + + + + + + + + contextConfigLocation + classpath:spring/business-config.xml, classpath:spring/tools-config.xml + + + + org.springframework.web.context.ContextLoaderListener + + + + + petclinic + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + classpath:spring/mvc-core-config.xml + + 1 + + + + petclinic + / + + + + + dandelionServlet + com.github.dandelion.core.web.DandelionServlet + 2 + + + dandelionServlet + /dandelion-assets/* + + + + + encodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + + encodingFilter + /* + + + + + dandelionFilter + com.github.dandelion.core.web.DandelionFilter + + + dandelionFilter + /* + + + + + httpMethodFilter + org.springframework.web.filter.HiddenHttpMethodFilter + + + + httpMethodFilter + petclinic + + + + + datatables + com.github.dandelion.datatables.core.web.filter.DatatablesFilter + + + datatables + /* + + + + + diff --git a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java index d1cf1762b9..f1b7058146 100644 --- a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java +++ b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java @@ -21,16 +21,16 @@ */ public class ValidatorTests { - private Validator createValidator() { - LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean(); - localValidatorFactoryBean.afterPropertiesSet(); - return localValidatorFactoryBean; - } + private Validator createValidator() { + LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean(); + localValidatorFactoryBean.afterPropertiesSet(); + return localValidatorFactoryBean; + } - @Test + @Test public void shouldNotValidateWhenFirstNameEmpty() { - LocaleContextHolder.setLocale(Locale.ENGLISH); + LocaleContextHolder.setLocale(Locale.ENGLISH); Person person = new Person(); person.setFirstName(""); person.setLastName("smith"); @@ -39,7 +39,7 @@ public void shouldNotValidateWhenFirstNameEmpty() { Set> constraintViolations = validator.validate(person); assertThat(constraintViolations.size()).isEqualTo(1); - ConstraintViolation violation = constraintViolations.iterator().next(); + ConstraintViolation violation = constraintViolations.iterator().next(); assertThat(violation.getPropertyPath().toString()).isEqualTo("firstName"); assertThat(violation.getMessage()).isEqualTo("may not be empty"); } diff --git a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java index f18adf118a..c8dd2af490 100644 --- a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java +++ b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java @@ -92,7 +92,7 @@ public void shouldInsertOwner() { @Test @Transactional - public void shouldUpdateOwner() { + public void shouldUpdateOwner() { Owner owner = this.clinicService.findOwnerById(1); String oldLastName = owner.getLastName(); String newLastName = oldLastName + "X"; @@ -105,87 +105,86 @@ public void shouldUpdateOwner() { assertThat(owner.getLastName()).isEqualTo(newLastName); } - @Test - public void shouldFindPetWithCorrectId() { - Pet pet7 = this.clinicService.findPetById(7); - assertThat(pet7.getName()).startsWith("Samantha"); - assertThat(pet7.getOwner().getFirstName()).isEqualTo("Jean"); - - } - - @Test - public void shouldFindAllPetTypes() { - Collection petTypes = this.clinicService.findPetTypes(); - - PetType petType1 = EntityUtils.getById(petTypes, PetType.class, 1); - assertThat(petType1.getName()).isEqualTo("cat"); - PetType petType4 = EntityUtils.getById(petTypes, PetType.class, 4); - assertThat(petType4.getName()).isEqualTo("snake"); - } - - @Test - @Transactional - public void shouldInsertPetIntoDatabaseAndGenerateId() { - Owner owner6 = this.clinicService.findOwnerById(6); - int found = owner6.getPets().size(); - - Pet pet = new Pet(); - pet.setName("bowser"); - Collection types = this.clinicService.findPetTypes(); - pet.setType(EntityUtils.getById(types, PetType.class, 2)); - pet.setBirthDate(new DateTime()); - owner6.addPet(pet); - assertThat(owner6.getPets().size()).isEqualTo(found + 1); - - this.clinicService.savePet(pet); - this.clinicService.saveOwner(owner6); - - owner6 = this.clinicService.findOwnerById(6); - assertThat(owner6.getPets().size()).isEqualTo(found + 1); - // checks that id has been generated - assertThat(pet.getId()).isNotNull(); - } - - @Test - @Transactional - public void shouldUpdatePetName() throws Exception { - Pet pet7 = this.clinicService.findPetById(7); - String oldName = pet7.getName(); - - String newName = oldName + "X"; - pet7.setName(newName); - this.clinicService.savePet(pet7); - - pet7 = this.clinicService.findPetById(7); - assertThat(pet7.getName()).isEqualTo(newName); - } - - @Test - public void shouldFindVets() { - Collection vets = this.clinicService.findVets(); - - Vet vet = EntityUtils.getById(vets, Vet.class, 3); - assertThat(vet.getLastName()).isEqualTo("Douglas"); - assertThat(vet.getNrOfSpecialties()).isEqualTo(2); - assertThat(vet.getSpecialties().get(0).getName()).isEqualTo("dentistry"); - assertThat(vet.getSpecialties().get(1).getName()).isEqualTo("surgery"); - } - - @Test - @Transactional - public void shouldAddNewVisitForPet() { - Pet pet7 = this.clinicService.findPetById(7); - int found = pet7.getVisits().size(); - Visit visit = new Visit(); - pet7.addVisit(visit); - visit.setDescription("test"); - this.clinicService.saveVisit(visit); - this.clinicService.savePet(pet7); - - pet7 = this.clinicService.findPetById(7); - assertThat(pet7.getVisits().size()).isEqualTo(found + 1); - assertThat(visit.getId()).isNotNull(); - } + @Test + public void shouldFindPetWithCorrectId() { + Pet pet7 = this.clinicService.findPetById(7); + assertThat(pet7.getName()).startsWith("Samantha"); + assertThat(pet7.getOwner().getFirstName()).isEqualTo("Jean"); + + } + + @Test + public void shouldFindAllPetTypes() { + Collection petTypes = this.clinicService.findPetTypes(); + + PetType petType1 = EntityUtils.getById(petTypes, PetType.class, 1); + assertThat(petType1.getName()).isEqualTo("cat"); + PetType petType4 = EntityUtils.getById(petTypes, PetType.class, 4); + assertThat(petType4.getName()).isEqualTo("snake"); + } + + @Test + @Transactional + public void shouldInsertPetIntoDatabaseAndGenerateId() { + Owner owner6 = this.clinicService.findOwnerById(6); + int found = owner6.getPets().size(); + + Pet pet = new Pet(); + pet.setName("bowser"); + Collection types = this.clinicService.findPetTypes(); + pet.setType(EntityUtils.getById(types, PetType.class, 2)); + pet.setBirthDate(new DateTime()); + owner6.addPet(pet); + assertThat(owner6.getPets().size()).isEqualTo(found + 1); + + this.clinicService.savePet(pet); + this.clinicService.saveOwner(owner6); + + owner6 = this.clinicService.findOwnerById(6); + assertThat(owner6.getPets().size()).isEqualTo(found + 1); + // checks that id has been generated + assertThat(pet.getId()).isNotNull(); + } + @Test + @Transactional + public void shouldUpdatePetName() throws Exception { + Pet pet7 = this.clinicService.findPetById(7); + String oldName = pet7.getName(); + + String newName = oldName + "X"; + pet7.setName(newName); + this.clinicService.savePet(pet7); + + pet7 = this.clinicService.findPetById(7); + assertThat(pet7.getName()).isEqualTo(newName); + } + + @Test + public void shouldFindVets() { + Collection vets = this.clinicService.findVets(); + + Vet vet = EntityUtils.getById(vets, Vet.class, 3); + assertThat(vet.getLastName()).isEqualTo("Douglas"); + assertThat(vet.getNrOfSpecialties()).isEqualTo(2); + assertThat(vet.getSpecialties().get(0).getName()).isEqualTo("dentistry"); + assertThat(vet.getSpecialties().get(1).getName()).isEqualTo("surgery"); + } + + @Test + @Transactional + public void shouldAddNewVisitForPet() { + Pet pet7 = this.clinicService.findPetById(7); + int found = pet7.getVisits().size(); + Visit visit = new Visit(); + pet7.addVisit(visit); + visit.setDescription("test"); + this.clinicService.saveVisit(visit); + this.clinicService.savePet(pet7); + + pet7 = this.clinicService.findPetById(7); + assertThat(pet7.getVisits().size()).isEqualTo(found + 1); + assertThat(visit.getId()).isNotNull(); + } } diff --git a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java index 7eaad1e24f..57ca1454f4 100644 --- a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java +++ b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java @@ -27,10 +27,9 @@ * @author Thomas Risberg * @author Michael Isvy */ -@ContextConfiguration(locations = {"classpath:spring/business-config.xml"}) +@ContextConfiguration(locations = { "classpath:spring/business-config.xml" }) @RunWith(SpringJUnit4ClassRunner.class) @ActiveProfiles("jdbc") public class ClinicServiceJdbcTests extends AbstractClinicServiceTests { - } diff --git a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java index 5c97acadc4..71a6fe1972 100644 --- a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java +++ b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java @@ -29,7 +29,7 @@ * @author Michael Isvy */ -@ContextConfiguration(locations = {"classpath:spring/business-config.xml"}) +@ContextConfiguration(locations = { "classpath:spring/business-config.xml" }) @RunWith(SpringJUnit4ClassRunner.class) @ActiveProfiles("jpa") public class ClinicServiceJpaTests extends AbstractClinicServiceTests { diff --git a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java index 216e20fd50..8fe6ff7ce4 100644 --- a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java +++ b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java @@ -26,7 +26,7 @@ * @author Michael Isvy */ -@ContextConfiguration(locations = {"classpath:spring/business-config.xml"}) +@ContextConfiguration(locations = { "classpath:spring/business-config.xml" }) @RunWith(SpringJUnit4ClassRunner.class) @ActiveProfiles("spring-data-jpa") public class ClinicServiceSpringDataJpaTests extends AbstractClinicServiceTests { diff --git a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java index 7630d3f075..fd4436474d 100644 --- a/spring-petclinic/src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java +++ b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java @@ -38,7 +38,7 @@ * Test class for the UserResource REST controller. */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration({"classpath:spring/business-config.xml", "classpath:spring/tools-config.xml", "classpath:spring/mvc-core-config.xml"}) +@ContextConfiguration({ "classpath:spring/business-config.xml", "classpath:spring/tools-config.xml", "classpath:spring/mvc-core-config.xml" }) @WebAppConfiguration @ActiveProfiles("spring-data-jpa") public class VetControllerTests { @@ -55,9 +55,9 @@ public void setup() { @Test public void testGetExistingUser() throws Exception { - ResultActions actions = mockMvc.perform(get("/vets.json").accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()); - actions.andExpect(content().contentType("application/json;charset=UTF-8")) - .andExpect(jsonPath("$.vetList[0].id").value(1)); + ResultActions actions = mockMvc.perform(get("/vets.json").accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + actions.andExpect(content().contentType("application/json;charset=UTF-8")) + .andExpect(jsonPath("$.vetList[0].id").value(1)); } } diff --git a/spring-resteasy/pom.xml b/spring-resteasy/pom.xml index 9c9a856d6e..3d0a54a307 100644 --- a/spring-resteasy/pom.xml +++ b/spring-resteasy/pom.xml @@ -42,7 +42,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,17 +91,17 @@ - - UTF-8 - + 7.0.0-build-7 - + 3.1 @@ -151,7 +151,7 @@ commons-logging ${version.commons.logging} - + commons-httpclient commons-httpclient @@ -169,7 +169,7 @@ - + @@ -220,7 +220,7 @@ commons-httpclient test - + org.springframework @@ -232,7 +232,7 @@ spring-web - + org.jboss.spec.javax.servlet @@ -250,7 +250,7 @@ - ${project.artifactId} diff --git a/spring-resteasy/src/main/java/org/jboss/as/quickstarts/resteasyspring/HelloSpringResource.java b/spring-resteasy/src/main/java/org/jboss/as/quickstarts/resteasyspring/HelloSpringResource.java index e5e129486f..a4579d1d1f 100644 --- a/spring-resteasy/src/main/java/org/jboss/as/quickstarts/resteasyspring/HelloSpringResource.java +++ b/spring-resteasy/src/main/java/org/jboss/as/quickstarts/resteasyspring/HelloSpringResource.java @@ -27,6 +27,7 @@ import javax.ws.rs.QueryParam; import org.springframework.beans.factory.annotation.Autowired; + /** * * @author Joshua Wilson @@ -47,15 +48,15 @@ public class HelloSpringResource { @Produces("text/html") public Response getDefault() { String msg = "Hello.
Please try jboss-spring-resteasy/hello?name=yourname" - + "
Or try jboss-spring-resteasy/basic" - + "
Or try jboss-spring-resteasy/queryParam?param=query" - + "
Or try jboss-spring-resteasy/matrixParam;param=matrix" - + "
Or try jboss-spring-resteasy/uriParam/789" - + "
Or try jboss-spring-resteasy/locating/hello?name=yourname" - + "
Or try jboss-spring-resteasy/locating/basic" - + "
Or try jboss-spring-resteasy/locating/queryParam?param=query" - + "
Or try jboss-spring-resteasy/locating/matrixParam;param=matrix" - + "
Or try jboss-spring-resteasy/locating/uriParam/789"; + + "
Or try jboss-spring-resteasy/basic" + + "
Or try jboss-spring-resteasy/queryParam?param=query" + + "
Or try jboss-spring-resteasy/matrixParam;param=matrix" + + "
Or try jboss-spring-resteasy/uriParam/789" + + "
Or try jboss-spring-resteasy/locating/hello?name=yourname" + + "
Or try jboss-spring-resteasy/locating/basic" + + "
Or try jboss-spring-resteasy/locating/queryParam?param=query" + + "
Or try jboss-spring-resteasy/locating/matrixParam;param=matrix" + + "
Or try jboss-spring-resteasy/locating/uriParam/789"; System.out.println("getDefault()"); return Response.ok(msg).build(); } diff --git a/spring-resteasy/src/main/webapp/WEB-INF/applicationContext.xml b/spring-resteasy/src/main/webapp/WEB-INF/applicationContext.xml index 250b83ff50..335f6994e2 100644 --- a/spring-resteasy/src/main/webapp/WEB-INF/applicationContext.xml +++ b/spring-resteasy/src/main/webapp/WEB-INF/applicationContext.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - + diff --git a/spring-resteasy/src/main/webapp/WEB-INF/web.xml b/spring-resteasy/src/main/webapp/WEB-INF/web.xml index 236d4bcb63..1a14e85ad7 100644 --- a/spring-resteasy/src/main/webapp/WEB-INF/web.xml +++ b/spring-resteasy/src/main/webapp/WEB-INF/web.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + Archetype Created Web Application diff --git a/spring-resteasy/src/test/resources/log4j.xml b/spring-resteasy/src/test/resources/log4j.xml index 23b74aec48..0df86985bf 100644 --- a/spring-resteasy/src/test/resources/log4j.xml +++ b/spring-resteasy/src/test/resources/log4j.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - diff --git a/tasks-jsf/pom.xml b/tasks-jsf/pom.xml index e1af21c5dd..67221cc894 100644 --- a/tasks-jsf/pom.xml +++ b/tasks-jsf/pom.xml @@ -40,7 +40,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -94,11 +94,11 @@ UTF-8 - + - + 1.0.2.Final - + 7.0.0-build-7 @@ -130,14 +130,14 @@ - + org.jboss.spec.javax.faces jboss-jsf-api_2.2_spec provided - + javax.enterprise diff --git a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/AuthController.java b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/AuthController.java index 23c145f8a6..4f20304328 100644 --- a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/AuthController.java +++ b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/AuthController.java @@ -24,7 +24,6 @@ import javax.inject.Inject; import javax.inject.Named; - /** * Provides authentication operations with current user store: {@link Authentication}. * diff --git a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/Authentication.java b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/Authentication.java index c389c8e7a3..4a5e617627 100644 --- a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/Authentication.java +++ b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/Authentication.java @@ -20,7 +20,6 @@ import javax.enterprise.context.ConversationScoped; - /** * Store for current authenticated user * diff --git a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/CurrentTaskStore.java b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/CurrentTaskStore.java index 945c0abcaa..20c6541b1c 100644 --- a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/CurrentTaskStore.java +++ b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/CurrentTaskStore.java @@ -22,7 +22,6 @@ import javax.enterprise.inject.Produces; import javax.inject.Named; - /** *

* Holds current task in context of conversation diff --git a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskDaoImpl.java b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskDaoImpl.java index c8e17b8d4a..bea7ef1bc5 100644 --- a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskDaoImpl.java +++ b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskDaoImpl.java @@ -64,7 +64,7 @@ public List getRange(User user, int offset, int count) { public List getForTitle(User user, String title) { String lowerCaseTitle = "%" + title.toLowerCase() + "%"; return em.createQuery("SELECT t FROM Task t WHERE t.owner = ?1 AND LOWER(t.title) LIKE ?2", Task.class) - .setParameter(1, user).setParameter(2, lowerCaseTitle).getResultList(); + .setParameter(1, user).setParameter(2, lowerCaseTitle).getResultList(); } @Override diff --git a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskList.java b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskList.java index 47f6d530db..2a959a4f24 100644 --- a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskList.java +++ b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskList.java @@ -18,7 +18,6 @@ import java.util.List; - /** *

* Operations with cached list of tasks for current user. diff --git a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskListBean.java b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskListBean.java index 9e63424b7a..60ae00bd8f 100644 --- a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskListBean.java +++ b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/TaskListBean.java @@ -22,7 +22,6 @@ import javax.inject.Inject; import javax.inject.Named; - /** *

* Operations with cached list of tasks for current user. diff --git a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/UserDaoImpl.java b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/UserDaoImpl.java index 3e610d3910..578fe337a6 100644 --- a/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/UserDaoImpl.java +++ b/tasks-jsf/src/main/java/org/jboss/as/quickstarts/tasksJsf/UserDaoImpl.java @@ -37,7 +37,7 @@ public class UserDaoImpl implements UserDao { public User getForUsername(String username) { List result = em.createQuery("select u from User u where u.username = ?1", User.class).setParameter(1, username) - .getResultList(); + .getResultList(); if (result.isEmpty()) { return null; diff --git a/tasks-jsf/src/main/resources/META-INF/persistence.xml b/tasks-jsf/src/main/resources/META-INF/persistence.xml index 6b4d2bbd34..a3a6d67781 100644 --- a/tasks-jsf/src/main/resources/META-INF/persistence.xml +++ b/tasks-jsf/src/main/resources/META-INF/persistence.xml @@ -21,10 +21,10 @@ http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - - java:jboss/datasources/TasksJsfQuickstartDS diff --git a/tasks-jsf/src/main/webapp/WEB-INF/beans.xml b/tasks-jsf/src/main/webapp/WEB-INF/beans.xml index bfb72e3d65..6b2c62fc13 100644 --- a/tasks-jsf/src/main/webapp/WEB-INF/beans.xml +++ b/tasks-jsf/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - diff --git a/tasks-jsf/src/main/webapp/WEB-INF/faces-config.xml b/tasks-jsf/src/main/webapp/WEB-INF/faces-config.xml index 249b8d8373..0dd296f5b2 100644 --- a/tasks-jsf/src/main/webapp/WEB-INF/faces-config.xml +++ b/tasks-jsf/src/main/webapp/WEB-INF/faces-config.xml @@ -17,7 +17,7 @@ --> - + /index.xhtml @@ -27,7 +27,7 @@ - + /tasks.xhtml @@ -37,5 +37,5 @@ - + diff --git a/tasks-jsf/src/main/webapp/WEB-INF/tasks-jsf-ds.xml b/tasks-jsf/src/main/webapp/WEB-INF/tasks-jsf-ds.xml index 8a0443e88d..25e8a41911 100644 --- a/tasks-jsf/src/main/webapp/WEB-INF/tasks-jsf-ds.xml +++ b/tasks-jsf/src/main/webapp/WEB-INF/tasks-jsf-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/ResourcesTest.java b/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/ResourcesTest.java index 70b221c775..201939d6c0 100644 --- a/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/ResourcesTest.java +++ b/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/ResourcesTest.java @@ -45,7 +45,7 @@ public class ResourcesTest { @Deployment public static WebArchive deployment() throws IllegalArgumentException, FileNotFoundException { return new DefaultDeployment().withPersistence().withFaces().getArchive() - .addClasses(Resources.class, FacesContextStub.class); + .addClasses(Resources.class, FacesContextStub.class); } @Inject diff --git a/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/TaskDaoTest.java b/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/TaskDaoTest.java index 544a449de4..52c5b6dc6a 100644 --- a/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/TaskDaoTest.java +++ b/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/TaskDaoTest.java @@ -49,7 +49,7 @@ public class TaskDaoTest { @Deployment public static WebArchive deployment() throws IllegalArgumentException, FileNotFoundException { return new DefaultDeployment().withPersistence().withImportedData().getArchive() - .addClasses(Resources.class, User.class, UserDao.class, Task.class, TaskDao.class, TaskDaoImpl.class); + .addClasses(Resources.class, User.class, UserDao.class, Task.class, TaskDao.class, TaskDaoImpl.class); } @Inject @@ -77,7 +77,7 @@ public void user_should_be_created_with_one_task_attached() throws Exception { em.persist(user); taskDao.createTask(user, task); List userTasks = em.createQuery("SELECT t FROM Task t WHERE t.owner = :owner", Task.class) - .setParameter("owner", user).getResultList(); + .setParameter("owner", user).getResultList(); // then assertEquals(1, userTasks.size()); diff --git a/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/TaskListBeanTest.java b/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/TaskListBeanTest.java index a9ed154ca6..9b9e95d711 100644 --- a/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/TaskListBeanTest.java +++ b/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/TaskListBeanTest.java @@ -44,7 +44,7 @@ public class TaskListBeanTest { @Deployment public static WebArchive deployment() throws IllegalArgumentException, FileNotFoundException { return new DefaultDeployment(true).withPersistence().withImportedData().getArchive() - .addClasses(User.class, Task.class, TaskList.class, TaskListBean.class, TaskDao.class, TaskDaoStub.class, Testing.class); + .addClasses(User.class, Task.class, TaskList.class, TaskListBean.class, TaskDao.class, TaskDaoStub.class, Testing.class); } @Inject diff --git a/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/UserDaoTest.java b/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/UserDaoTest.java index 05f89ec738..3189a8c761 100644 --- a/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/UserDaoTest.java +++ b/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/UserDaoTest.java @@ -47,7 +47,7 @@ public class UserDaoTest { @Deployment public static WebArchive deployment() throws IllegalArgumentException, FileNotFoundException { return new DefaultDeployment().withPersistence().withImportedData().getArchive() - .addClasses(Resources.class, User.class, UserDao.class, Task.class, TaskDao.class, UserDaoImpl.class); + .addClasses(Resources.class, User.class, UserDao.class, Task.class, TaskDao.class, UserDaoImpl.class); } @Inject diff --git a/tasks-jsf/src/test/resources/META-INF/test-persistence.xml b/tasks-jsf/src/test/resources/META-INF/test-persistence.xml index ac8e57cf7d..fa4764e613 100644 --- a/tasks-jsf/src/test/resources/META-INF/test-persistence.xml +++ b/tasks-jsf/src/test/resources/META-INF/test-persistence.xml @@ -21,10 +21,10 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - - java:jboss/datasources/TasksJsfQuickstartTestDS diff --git a/tasks-jsf/src/test/resources/test-ds.xml b/tasks-jsf/src/test/resources/test-ds.xml index 1dbc1f8d38..6968390886 100644 --- a/tasks-jsf/src/test/resources/test-ds.xml +++ b/tasks-jsf/src/test/resources/test-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/tasks-rs/pom.xml b/tasks-rs/pom.xml index 1fa6e0be68..4f70875b66 100644 --- a/tasks-rs/pom.xml +++ b/tasks-rs/pom.xml @@ -40,7 +40,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -96,7 +96,7 @@ 1.0.2.Final - + 7.0.0-build-7 diff --git a/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/Task.java b/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/Task.java index 039b871ab7..72ebbe5dc7 100644 --- a/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/Task.java +++ b/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/Task.java @@ -73,8 +73,9 @@ public void setId(Long id) { @XmlTransient // JSON: uncomment to include json support (note json is not part of the JAX-RS standard) -// @JsonIgnore - public User getOwner() { + // @JsonIgnore + public + User getOwner() { return owner; } diff --git a/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/TaskDaoImpl.java b/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/TaskDaoImpl.java index 4c23da55b5..607872424b 100644 --- a/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/TaskDaoImpl.java +++ b/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/TaskDaoImpl.java @@ -64,7 +64,7 @@ public List getRange(User user, int offset, int count) { public List getForTitle(User user, String title) { String lowerCaseTitle = "%" + title.toLowerCase() + "%"; return em.createQuery("SELECT t FROM Task t WHERE t.owner = ?1 AND LOWER(t.title) LIKE ?2", Task.class) - .setParameter(1, user).setParameter(2, lowerCaseTitle).getResultList(); + .setParameter(1, user).setParameter(2, lowerCaseTitle).getResultList(); } @Override diff --git a/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/UserDaoImpl.java b/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/UserDaoImpl.java index 3e0e015a1b..0579431364 100644 --- a/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/UserDaoImpl.java +++ b/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/model/UserDaoImpl.java @@ -37,7 +37,7 @@ public class UserDaoImpl implements UserDao { public User getForUsername(String username) { List result = em.createQuery("select u from User u where u.username = ?1", User.class).setParameter(1, username) - .getResultList(); + .getResultList(); if (result.isEmpty()) { return null; diff --git a/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/service/TaskResource.java b/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/service/TaskResource.java index 544d9b5c63..41aae0f1be 100644 --- a/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/service/TaskResource.java +++ b/tasks-rs/src/main/java/org/jboss/as/quickstarts/tasksrs/service/TaskResource.java @@ -54,7 +54,7 @@ public class TaskResource { @POST @Path("tasks/{title}") public Response createTask(@Context UriInfo info, @Context SecurityContext context, - @PathParam("title") @DefaultValue("task") String taskTitle) { + @PathParam("title") @DefaultValue("task") String taskTitle) { User user = getUser(context); Task task = new Task(taskTitle); @@ -82,8 +82,9 @@ public void deleteTaskById(@Context SecurityContext context, @PathParam("id") Lo @Path("tasks/{id}") // JSON: include "application/json" in the @Produces annotation to include json support //@Produces({ "application/xml", "application/json" }) - @Produces({ "application/xml" }) - public Task getTaskById(@Context SecurityContext context, @PathParam("id") Long id) { + @Produces({ "application/xml" }) + public + Task getTaskById(@Context SecurityContext context, @PathParam("id") Long id) { User user = getUser(context); return getTask(user, id); @@ -93,8 +94,9 @@ public Task getTaskById(@Context SecurityContext context, @PathParam("id") Long @Path("tasks/{title}") // JSON: include "application/json" in the @Produces annotation to include json support //@Produces({ "application/xml", "application/json" }) - @Produces({ "application/xml" }) - public List getTasksByTitle(@Context SecurityContext context, @PathParam("title") String title) { + @Produces({ "application/xml" }) + public + List getTasksByTitle(@Context SecurityContext context, @PathParam("title") String title) { return getTasks(getUser(context), title); } @@ -102,12 +104,12 @@ public List getTasksByTitle(@Context SecurityContext context, @PathParam(" @Path("tasks") // JSON: include "application/json" in the @Produces annotation to include json support //@Produces({ "application/xml", "application/json" }) - @Produces({ "application/xml" }) - public List getTasks(@Context SecurityContext context) { + @Produces({ "application/xml" }) + public + List getTasks(@Context SecurityContext context) { return getTasks(getUser(context)); } - // Utility Methods private List getTasks(User user, String title) { diff --git a/tasks-rs/src/main/webapp/WEB-INF/beans.xml b/tasks-rs/src/main/webapp/WEB-INF/beans.xml index 5ee09977e5..20615254d2 100644 --- a/tasks-rs/src/main/webapp/WEB-INF/beans.xml +++ b/tasks-rs/src/main/webapp/WEB-INF/beans.xml @@ -16,6 +16,6 @@ --> - \ No newline at end of file + diff --git a/tasks-rs/src/main/webapp/WEB-INF/tasks-rs-ds.xml b/tasks-rs/src/main/webapp/WEB-INF/tasks-rs-ds.xml index 113a6392b6..56ca169109 100644 --- a/tasks-rs/src/main/webapp/WEB-INF/tasks-rs-ds.xml +++ b/tasks-rs/src/main/webapp/WEB-INF/tasks-rs-ds.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/DefaultDeployment.java b/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/DefaultDeployment.java index b9bed69255..8e05bcc230 100644 --- a/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/DefaultDeployment.java +++ b/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/DefaultDeployment.java @@ -35,12 +35,12 @@ public class DefaultDeployment { public DefaultDeployment() { webArchive = ShrinkWrap.create(WebArchive.class, "test.war").addAsWebInfResource( - new File(WEBAPP_SRC, "WEB-INF/beans.xml")); + new File(WEBAPP_SRC, "WEB-INF/beans.xml")); } public DefaultDeployment withPersistence() { webArchive = webArchive.addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml").addAsWebInfResource( - "test-ds.xml", "test-ds.xml"); + "test-ds.xml", "test-ds.xml"); return this; } diff --git a/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/TaskDaoTest.java b/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/TaskDaoTest.java index df0aaac8c1..dc0c9ed7f4 100644 --- a/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/TaskDaoTest.java +++ b/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/TaskDaoTest.java @@ -44,7 +44,7 @@ public class TaskDaoTest { @Deployment public static WebArchive deployment() throws IllegalArgumentException, FileNotFoundException { return new DefaultDeployment().withPersistence().withImportedData().getArchive() - .addClasses(Resources.class, User.class, UserDao.class, Task.class, TaskDao.class, TaskDaoImpl.class); + .addClasses(Resources.class, User.class, UserDao.class, Task.class, TaskDao.class, TaskDaoImpl.class); } @Inject @@ -72,7 +72,7 @@ public void user_should_be_created_with_one_task_attached() throws Exception { em.persist(user); taskDao.createTask(user, task); List userTasks = em.createQuery("SELECT t FROM Task t WHERE t.owner = :owner", Task.class) - .setParameter("owner", user).getResultList(); + .setParameter("owner", user).getResultList(); // then assertEquals(1, userTasks.size()); diff --git a/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/UserDaoTest.java b/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/UserDaoTest.java index 7004f4c137..22edaf05c3 100644 --- a/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/UserDaoTest.java +++ b/tasks-rs/src/test/java/org/jboss/as/quickstarts/tasksrs/UserDaoTest.java @@ -42,7 +42,7 @@ public class UserDaoTest { @Deployment public static WebArchive deployment() throws IllegalArgumentException, FileNotFoundException { return new DefaultDeployment().withPersistence().withImportedData().getArchive() - .addClasses(Resources.class, User.class, UserDao.class, Task.class, TaskDao.class, UserDaoImpl.class); + .addClasses(Resources.class, User.class, UserDao.class, Task.class, TaskDao.class, UserDaoImpl.class); } @Inject diff --git a/tasks-rs/src/test/resources/test-ds.xml b/tasks-rs/src/test/resources/test-ds.xml index 29ae56fa14..0bf80986c8 100644 --- a/tasks-rs/src/test/resources/test-ds.xml +++ b/tasks-rs/src/test/resources/test-ds.xml @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/tasks/pom.xml b/tasks/pom.xml index 3b92f04a41..a1120f60f1 100644 --- a/tasks/pom.xml +++ b/tasks/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,9 +90,9 @@ - - UTF-8 @@ -113,11 +113,11 @@ - org.jboss.bom @@ -174,7 +174,7 @@ - ${project.artifactId} @@ -182,7 +182,7 @@ maven-war-plugin ${version.war.plugin} - false @@ -192,10 +192,10 @@ maven-surefire-plugin ${version.surefire.plugin} - - org.wildfly.plugins @@ -210,9 +210,9 @@ - - default @@ -232,9 +232,9 @@ - - arq-wildfly-managed @@ -248,7 +248,7 @@ - arq-wildfly-remote diff --git a/tasks/src/main/java/org/jboss/as/quickstarts/tasks/TaskDaoImpl.java b/tasks/src/main/java/org/jboss/as/quickstarts/tasks/TaskDaoImpl.java index 98c9c72542..e55eda3fc8 100644 --- a/tasks/src/main/java/org/jboss/as/quickstarts/tasks/TaskDaoImpl.java +++ b/tasks/src/main/java/org/jboss/as/quickstarts/tasks/TaskDaoImpl.java @@ -64,7 +64,7 @@ public List getRange(User user, int offset, int count) { public List getForTitle(User user, String title) { String lowerCaseTitle = "%" + title.toLowerCase() + "%"; return em.createQuery("SELECT t FROM Task t WHERE t.owner = ?1 AND LOWER(t.title) LIKE ?2", Task.class) - .setParameter(1, user).setParameter(2, lowerCaseTitle).getResultList(); + .setParameter(1, user).setParameter(2, lowerCaseTitle).getResultList(); } @Override diff --git a/tasks/src/main/java/org/jboss/as/quickstarts/tasks/User.java b/tasks/src/main/java/org/jboss/as/quickstarts/tasks/User.java index 927f4f1bba..aadc194718 100644 --- a/tasks/src/main/java/org/jboss/as/quickstarts/tasks/User.java +++ b/tasks/src/main/java/org/jboss/as/quickstarts/tasks/User.java @@ -37,7 +37,7 @@ public class User implements Serializable { @GeneratedValue(strategy = IDENTITY) private Long id; - @Column(unique=true) + @Column(unique = true) private String username; @OneToMany(cascade = ALL, mappedBy = "owner") diff --git a/tasks/src/main/java/org/jboss/as/quickstarts/tasks/UserDaoImpl.java b/tasks/src/main/java/org/jboss/as/quickstarts/tasks/UserDaoImpl.java index 148e16b7a8..0964b7c946 100644 --- a/tasks/src/main/java/org/jboss/as/quickstarts/tasks/UserDaoImpl.java +++ b/tasks/src/main/java/org/jboss/as/quickstarts/tasks/UserDaoImpl.java @@ -37,7 +37,7 @@ public class UserDaoImpl implements UserDao { public User getForUsername(String username) { List result = em.createQuery("select u from User u where u.username = ?1", User.class).setParameter(1, username) - .getResultList(); + .getResultList(); if (result.isEmpty()) { return null; diff --git a/tasks/src/test/java/META-INF/beans.xml b/tasks/src/test/java/META-INF/beans.xml index 8c5ac6eaa9..4114ef5dc1 100644 --- a/tasks/src/test/java/META-INF/beans.xml +++ b/tasks/src/test/java/META-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - - \ No newline at end of file + diff --git a/tasks/src/test/java/org/jboss/as/quickstarts/tasks/DefaultDeployment.java b/tasks/src/test/java/org/jboss/as/quickstarts/tasks/DefaultDeployment.java index fae6a85145..3501db746d 100644 --- a/tasks/src/test/java/org/jboss/as/quickstarts/tasks/DefaultDeployment.java +++ b/tasks/src/test/java/org/jboss/as/quickstarts/tasks/DefaultDeployment.java @@ -24,11 +24,11 @@ public class DefaultDeployment { public static WebArchive deployment() { return ShrinkWrap.create(WebArchive.class, "test.war") - .addPackages(true, Task.class.getPackage().getName()) - .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") - .addAsWebInfResource("test-ds.xml", "test-ds.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - .addAsResource("import.sql"); + .addPackages(true, Task.class.getPackage().getName()) + .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource("test-ds.xml", "test-ds.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + .addAsResource("import.sql"); } } diff --git a/tasks/src/test/java/org/jboss/as/quickstarts/tasks/TaskDaoTest.java b/tasks/src/test/java/org/jboss/as/quickstarts/tasks/TaskDaoTest.java index c733b64715..30e566bb78 100644 --- a/tasks/src/test/java/org/jboss/as/quickstarts/tasks/TaskDaoTest.java +++ b/tasks/src/test/java/org/jboss/as/quickstarts/tasks/TaskDaoTest.java @@ -70,7 +70,7 @@ public void user_should_be_created_with_one_task_attached() throws Exception { em.persist(user); taskDao.createTask(user, task); List userTasks = em.createQuery("SELECT t FROM Task t WHERE t.owner = :owner", Task.class).setParameter("owner", user) - .getResultList(); + .getResultList(); // then assertEquals(1, userTasks.size()); diff --git a/tasks/src/test/resources/META-INF/test-persistence.xml b/tasks/src/test/resources/META-INF/test-persistence.xml index aeb81bfabe..cef0c5914d 100644 --- a/tasks/src/test/resources/META-INF/test-persistence.xml +++ b/tasks/src/test/resources/META-INF/test-persistence.xml @@ -21,10 +21,10 @@ http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"> - - java:jboss/datasources/TasksQuickstartTestDS diff --git a/tasks/src/test/resources/test-ds.xml b/tasks/src/test/resources/test-ds.xml index 62a9403f1a..b6d353e7ff 100644 --- a/tasks/src/test/resources/test-ds.xml +++ b/tasks/src/test/resources/test-ds.xml @@ -15,14 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - + diff --git a/temperature-converter/pom.xml b/temperature-converter/pom.xml index 7d77f057d9..5c4a367c88 100644 --- a/temperature-converter/pom.xml +++ b/temperature-converter/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -91,14 +91,14 @@ - UTF-8 - + 1.0.2.Final - + 1.0.3.Final @@ -111,8 +111,8 @@ - org.jboss.spec.javax.annotation @@ -163,7 +163,7 @@ - ${project.artifactId} diff --git a/temperature-converter/src/main/java/org/jboss/as/quickstarts/temperatureconverter/ejb/Scale.java b/temperature-converter/src/main/java/org/jboss/as/quickstarts/temperatureconverter/ejb/Scale.java index 4bab9e95ac..a101b4fc75 100644 --- a/temperature-converter/src/main/java/org/jboss/as/quickstarts/temperatureconverter/ejb/Scale.java +++ b/temperature-converter/src/main/java/org/jboss/as/quickstarts/temperatureconverter/ejb/Scale.java @@ -24,7 +24,8 @@ */ public enum Scale { - CELSIUS("\u2103"), FAHRENHEIT("\u2109"); + CELSIUS("\u2103"), + FAHRENHEIT("\u2109"); private final String symbol; diff --git a/temperature-converter/src/main/webapp/WEB-INF/beans.xml b/temperature-converter/src/main/webapp/WEB-INF/beans.xml index 955868d46a..460d1cf31b 100644 --- a/temperature-converter/src/main/webapp/WEB-INF/beans.xml +++ b/temperature-converter/src/main/webapp/WEB-INF/beans.xml @@ -19,6 +19,6 @@ diff --git a/temperature-converter/src/main/webapp/WEB-INF/faces-config.xml b/temperature-converter/src/main/webapp/WEB-INF/faces-config.xml index a745c52343..40ec16100c 100644 --- a/temperature-converter/src/main/webapp/WEB-INF/faces-config.xml +++ b/temperature-converter/src/main/webapp/WEB-INF/faces-config.xml @@ -23,5 +23,5 @@ xsi:schemaLocation=" http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"> - + diff --git a/template/pom.xml b/template/pom.xml index a551d5f97f..5c3ae5e035 100644 --- a/template/pom.xml +++ b/template/pom.xml @@ -36,7 +36,7 @@ - UTF-8 @@ -56,7 +56,7 @@ - org.jboss.spec.javax.annotation @@ -122,7 +122,7 @@ - ${project.artifactId} diff --git a/websocket-endpoint/pom.xml b/websocket-endpoint/pom.xml index 1af883ca81..dff5b05687 100644 --- a/websocket-endpoint/pom.xml +++ b/websocket-endpoint/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,16 +90,16 @@ - - UTF-8 1.0.2.Final - 7.0.0-build-7 8.0.0.Final @@ -116,8 +116,8 @@ @@ -133,10 +133,10 @@ - - - org.jboss.spec.javax.json @@ -144,7 +144,7 @@ provided - javax.enterprise @@ -153,7 +153,7 @@ - org.jboss.spec.javax.websocket @@ -161,7 +161,7 @@ provided - org.jboss.spec.javax.annotation @@ -169,7 +169,7 @@ provided - org.jboss.spec.javax.ws.rs @@ -177,7 +177,7 @@ provided - org.jboss.spec.javax.ejb @@ -186,7 +186,7 @@ - org.jboss.spec.javax.faces @@ -196,7 +196,7 @@ - org.hibernate @@ -204,7 +204,7 @@ provided - org.hibernate @@ -220,7 +220,7 @@ - org.jboss.arquillian.junit @@ -237,7 +237,7 @@ - ${project.artifactId} @@ -261,9 +261,9 @@ - - default @@ -316,11 +316,11 @@ - - - openshift diff --git a/websocket-endpoint/src/main/webapp/WEB-INF/beans.xml b/websocket-endpoint/src/main/webapp/WEB-INF/beans.xml index 89750cdf9e..90b89d4fd9 100644 --- a/websocket-endpoint/src/main/webapp/WEB-INF/beans.xml +++ b/websocket-endpoint/src/main/webapp/WEB-INF/beans.xml @@ -16,7 +16,7 @@ limitations under the License. --> - @@ -93,13 +93,13 @@ 1.0.2.Final 1.0.0.Final - + 2.1.1 - + 1.8 - 1.8 + 1.8 @@ -122,7 +122,7 @@ false - + org.wildfly.plugins diff --git a/websocket-hello/src/main/java/org/jboss/as/quickstarts/websocket_hello/HelloName.java b/websocket-hello/src/main/java/org/jboss/as/quickstarts/websocket_hello/HelloName.java index 9b96cd4307..e63b8c9061 100644 --- a/websocket-hello/src/main/java/org/jboss/as/quickstarts/websocket_hello/HelloName.java +++ b/websocket-hello/src/main/java/org/jboss/as/quickstarts/websocket_hello/HelloName.java @@ -39,6 +39,6 @@ public void helloOnOpen(Session session) { @OnClose public void helloOnClose(CloseReason reason) { - System.out.println("WebSocket connection closed with CloseCode: " + reason.getCloseCode()); + System.out.println("WebSocket connection closed with CloseCode: " + reason.getCloseCode()); } } diff --git a/websocket-hello/src/main/webapp/WEB-INF/jboss-web.xml b/websocket-hello/src/main/webapp/WEB-INF/jboss-web.xml index 83a0aef5ee..3b7fdfcf16 100644 --- a/websocket-hello/src/main/webapp/WEB-INF/jboss-web.xml +++ b/websocket-hello/src/main/webapp/WEB-INF/jboss-web.xml @@ -17,8 +17,8 @@ --> true diff --git a/wsat-simple/pom.xml b/wsat-simple/pom.xml index ad3838ebb6..7aa4376730 100644 --- a/wsat-simple/pom.xml +++ b/wsat-simple/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -96,9 +96,9 @@ UTF-8 - + 1.0.2.Final - + 7.0.0-build-7 @@ -148,7 +148,7 @@ cdi-api provided - + org.jboss.spec.javax.servlet @@ -213,9 +213,9 @@ - - default diff --git a/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/RestaurantParticipant.java b/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/RestaurantParticipant.java index eafb2112f6..796779a55b 100644 --- a/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/RestaurantParticipant.java +++ b/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/RestaurantParticipant.java @@ -90,7 +90,7 @@ public void rollback() throws WrongStateException, SystemException { // Log the event and invoke the rollback operation // on the backend business logic. System.out - .println("[SERVICE] one or more participants voted 'aborted' or a failure occurred, so coordinator tells the participant to rollback"); + .println("[SERVICE] one or more participants voted 'aborted' or a failure occurred, so coordinator tells the participant to rollback"); mockRestaurantManager.rollback(txID); } diff --git a/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/RestaurantServiceATImpl.java b/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/RestaurantServiceATImpl.java index 89562be0a7..7f5f2f80c7 100644 --- a/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/RestaurantServiceATImpl.java +++ b/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/RestaurantServiceATImpl.java @@ -35,7 +35,8 @@ * @author paul.robinson@redhat.com, 2012-01-04 * */ -@WebService(serviceName = "RestaurantServiceATService", portName = "RestaurantServiceAT", name = "RestaurantServiceAT", targetNamespace = "http://www.jboss.org/jboss-jdf/jboss-as-quickstart/wsat/simple/Restaurant") +@WebService(serviceName = "RestaurantServiceATService", portName = "RestaurantServiceAT", name = "RestaurantServiceAT", + targetNamespace = "http://www.jboss.org/jboss-jdf/jboss-as-quickstart/wsat/simple/Restaurant") @HandlerChain(file = "/context-handlers.xml", name = "Context Handlers") @SOAPBinding(style = SOAPBinding.Style.RPC) @WebServlet("/RestaurantServiceAT") diff --git a/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/jaxws/RestaurantServiceATService.java b/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/jaxws/RestaurantServiceATService.java index 1665aede51..df32dae9c7 100644 --- a/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/jaxws/RestaurantServiceATService.java +++ b/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/jaxws/RestaurantServiceATService.java @@ -55,7 +55,7 @@ public RestaurantServiceATService(URL wsdlLocation, QName serviceName) { public RestaurantServiceATService() { super(RESTAURANTSERVICEATSERVICE_WSDL_LOCATION, new QName( - "http://www.jboss.org/jboss-jdf/jboss-as-quickstart/wsat/simple/Restaurant", "RestaurantServiceATService")); + "http://www.jboss.org/jboss-jdf/jboss-as-quickstart/wsat/simple/Restaurant", "RestaurantServiceATService")); } /** @@ -65,7 +65,7 @@ public RestaurantServiceATService() { @WebEndpoint(name = "RestaurantServiceAT") public RestaurantServiceAT getRestaurantServiceAT() { return super.getPort(new QName("http://www.jboss.org/jboss-jdf/jboss-as-quickstart/wsat/simple/Restaurant", - "RestaurantServiceAT"), RestaurantServiceAT.class); + "RestaurantServiceAT"), RestaurantServiceAT.class); } /** @@ -77,7 +77,7 @@ public RestaurantServiceAT getRestaurantServiceAT() { @WebEndpoint(name = "RestaurantServiceAT") public RestaurantServiceAT getRestaurantServiceAT(WebServiceFeature... features) { return super.getPort(new QName("http://www.jboss.org/jboss-jdf/jboss-as-quickstart/wsat/simple/Restaurant", - "RestaurantServiceAT"), RestaurantServiceAT.class, features); + "RestaurantServiceAT"), RestaurantServiceAT.class, features); } } diff --git a/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/servlet/WSATSimpleServletClient.java b/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/servlet/WSATSimpleServletClient.java index 016c2b3f12..4e967b2cfb 100644 --- a/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/servlet/WSATSimpleServletClient.java +++ b/wsat-simple/src/main/java/org/jboss/as/quickstarts/wsat/simple/servlet/WSATSimpleServletClient.java @@ -76,7 +76,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se String openshift = System.getenv("OPENSHIFT_APP_DNS"); if (openshift != null) { bindingProvider.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, - "http://" + openshift + "/RestaurantServiceAT"); + "http://" + openshift + "/RestaurantServiceAT"); } resp.setContentType("text/html"); @@ -88,7 +88,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se UserTransaction ut = UserTransactionFactory.userTransaction(); try { System.out - .println("[CLIENT] Beginning Atomic Transaction (All calls to Web services that support WS-AT wil be included in this transaction)"); + .println("[CLIENT] Beginning Atomic Transaction (All calls to Web services that support WS-AT wil be included in this transaction)"); ut.begin(); System.out.println("[CLIENT] invoking makeBooking() on WS"); client.makeBooking(); diff --git a/wsat-simple/src/main/webapp/WEB-INF/beans.xml b/wsat-simple/src/main/webapp/WEB-INF/beans.xml index 8c5ac6eaa9..4114ef5dc1 100644 --- a/wsat-simple/src/main/webapp/WEB-INF/beans.xml +++ b/wsat-simple/src/main/webapp/WEB-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - - \ No newline at end of file + diff --git a/wsat-simple/src/main/webapp/WEB-INF/classes/context-handlers.xml b/wsat-simple/src/main/webapp/WEB-INF/classes/context-handlers.xml index 603b6de417..3f7c606d78 100644 --- a/wsat-simple/src/main/webapp/WEB-INF/classes/context-handlers.xml +++ b/wsat-simple/src/main/webapp/WEB-INF/classes/context-handlers.xml @@ -16,7 +16,7 @@ limitations under the License. --> diff --git a/wsat-simple/src/main/webapp/WEB-INF/jboss-web.xml b/wsat-simple/src/main/webapp/WEB-INF/jboss-web.xml index e545a5bb61..5fb6e3b874 100644 --- a/wsat-simple/src/main/webapp/WEB-INF/jboss-web.xml +++ b/wsat-simple/src/main/webapp/WEB-INF/jboss-web.xml @@ -17,8 +17,8 @@ --> / diff --git a/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/Client.java b/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/Client.java index ee629824f5..b5848a642e 100644 --- a/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/Client.java +++ b/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/Client.java @@ -48,9 +48,9 @@ public class Client implements RestaurantServiceAT { public Client() throws MalformedURLException { URL wsdlLocation = new URL("http://localhost:8080/wsat-simple/RestaurantServiceAT?wsdl"); QName serviceName = new QName("http://www.jboss.org/jboss-jdf/jboss-as-quickstart/wsat/simple/Restaurant", - "RestaurantServiceATService"); + "RestaurantServiceATService"); QName portName = new QName("http://www.jboss.org/jboss-jdf/jboss-as-quickstart/wsat/simple/Restaurant", - "RestaurantServiceAT"); + "RestaurantServiceAT"); Service service = Service.create(wsdlLocation, serviceName); restaurant = service.getPort(portName, RestaurantServiceAT.class); diff --git a/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/ClientStub.java b/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/ClientStub.java index 0930633be5..248af7c87f 100644 --- a/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/ClientStub.java +++ b/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/ClientStub.java @@ -37,6 +37,6 @@ */ @Qualifier @Retention(RUNTIME) -@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Target({ TYPE, METHOD, FIELD, PARAMETER }) public @interface ClientStub { } diff --git a/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/ClientTest.java b/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/ClientTest.java index 82613469cc..20e4a7e4dc 100644 --- a/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/ClientTest.java +++ b/wsat-simple/src/test/java/org/jboss/as/quickstarts/wsat/simple/ClientTest.java @@ -42,7 +42,7 @@ public class ClientTest { private static final String ManifestMF = "Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.xts,org.jboss.modules,org.jboss.msc\n"; + + "Dependencies: org.jboss.xts,org.jboss.modules,org.jboss.msc\n"; @Inject @ClientStub @@ -57,9 +57,9 @@ public class ClientTest { public static WebArchive createTestArchive() { return ShrinkWrap.create(WebArchive.class, "wsat-simple.war") - .addPackages(true, RestaurantServiceATImpl.class.getPackage()).addAsResource("context-handlers.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .setManifest(new StringAsset(ManifestMF)); + .addPackages(true, RestaurantServiceATImpl.class.getPackage()).addAsResource("context-handlers.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .setManifest(new StringAsset(ManifestMF)); } /** @@ -71,12 +71,12 @@ public static WebArchive createTestArchive() { public void testCommit() throws Exception { System.out - .println("\n\nStarting 'testCommit'. This test invokes a WS within an AT. The AT is later committed, which causes the back-end resource(s) to be committed."); + .println("\n\nStarting 'testCommit'. This test invokes a WS within an AT. The AT is later committed, which causes the back-end resource(s) to be committed."); System.out.println("[CLIENT] Creating a new WS-AT User Transaction"); UserTransaction ut = UserTransactionFactory.userTransaction(); try { System.out - .println("[CLIENT] Beginning Atomic Transaction (All calls to Web services that support WS-AT wil be included in this transaction)"); + .println("[CLIENT] Beginning Atomic Transaction (All calls to Web services that support WS-AT wil be included in this transaction)"); ut.begin(); System.out.println("[CLIENT] invoking makeBooking() on WS"); client.makeBooking(); @@ -101,17 +101,17 @@ public void testCommit() throws Exception { public void testRollback() throws Exception { System.out - .println("\n\nStarting 'testRollback'. This test invokes a WS within an AT. The AT is later rolled back, which causes the back-end resource(s) to be rolled back."); + .println("\n\nStarting 'testRollback'. This test invokes a WS within an AT. The AT is later rolled back, which causes the back-end resource(s) to be rolled back."); System.out.println("[CLIENT] Creating a new WS-AT User Transaction"); UserTransaction ut = UserTransactionFactory.userTransaction(); try { System.out - .println("[CLIENT] Beginning Atomic Transaction (All calls to Web services that support WS-AT wil be included in this transaction)"); + .println("[CLIENT] Beginning Atomic Transaction (All calls to Web services that support WS-AT wil be included in this transaction)"); ut.begin(); System.out.println("[CLIENT] invoking makeBooking() on WS"); client.makeBooking(); System.out - .println("[CLIENT] rolling back Atomic Transaction (This will cause the AT and thus the enlisted back-end resources to rollback)"); + .println("[CLIENT] rolling back Atomic Transaction (This will cause the AT and thus the enlisted back-end resources to rollback)"); ut.rollback(); // Check the booking is visible after the transaction has committed. diff --git a/wsat-simple/src/test/resources/arquillian.xml b/wsat-simple/src/test/resources/arquillian.xml index e9c7be6ec5..df3a1f50c5 100644 --- a/wsat-simple/src/test/resources/arquillian.xml +++ b/wsat-simple/src/test/resources/arquillian.xml @@ -28,7 +28,7 @@ - + @@ -38,7 +38,7 @@ ../../docs/examples/configs/standalone-xts.xml - - + + diff --git a/wsat-simple/src/test/resources/context-handlers.xml b/wsat-simple/src/test/resources/context-handlers.xml index 603b6de417..3f7c606d78 100644 --- a/wsat-simple/src/test/resources/context-handlers.xml +++ b/wsat-simple/src/test/resources/context-handlers.xml @@ -16,7 +16,7 @@ limitations under the License. --> diff --git a/wsba-coordinator-completion-simple/pom.xml b/wsba-coordinator-completion-simple/pom.xml index f22b16d25d..3032f86a15 100644 --- a/wsba-coordinator-completion-simple/pom.xml +++ b/wsba-coordinator-completion-simple/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,16 +90,16 @@ - - UTF-8 - + 1.0.2.Final - + 7.0.0-build-7 @@ -113,16 +113,16 @@ - - - org.jboss.bom @@ -142,7 +142,7 @@ api provided - + org.jboss.spec.javax.servlet @@ -150,7 +150,7 @@ provided - org.jboss.spec.javax.annotation @@ -164,7 +164,7 @@ junit test - + javax.enterprise @@ -203,9 +203,9 @@ - - default @@ -224,9 +224,9 @@ - - arq-wildfly-managed @@ -241,7 +241,7 @@ - arq-wildfly-remote diff --git a/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/MockSetManager.java b/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/MockSetManager.java index 6ecdd2036b..73e4567d83 100644 --- a/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/MockSetManager.java +++ b/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/MockSetManager.java @@ -68,7 +68,7 @@ public static boolean prepare() { */ public static void commit() { System.out - .println("[SERVICE] Commit the backend resource (e.g. commit any changes to databases so that they are visible to others)"); + .println("[SERVICE] Commit the backend resource (e.g. commit any changes to databases so that they are visible to others)"); } /** @@ -81,7 +81,7 @@ public static void commit() { */ public static void rollback(String item) { System.out.println("[SERVICE] Compensate the backend resource by removing '" + item - + "' from the set (e.g. undo any changes to databases that were previously made visible to others)"); + + "' from the set (e.g. undo any changes to databases that were previously made visible to others)"); synchronized (set) { set.remove(item); diff --git a/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/SetParticipantBA.java b/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/SetParticipantBA.java index 4fe2da4afe..0b8e733f0c 100644 --- a/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/SetParticipantBA.java +++ b/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/SetParticipantBA.java @@ -39,7 +39,7 @@ * @author Paul Robinson (paul.robinson@redhat.com) */ public class SetParticipantBA implements BusinessAgreementWithCoordinatorCompletionParticipant, ConfirmCompletedParticipant, - Serializable { + Serializable { private static final long serialVersionUID = 1L; // The ID of the corresponding transaction private String txID; @@ -79,7 +79,7 @@ public void addValue(String value) { public void close() throws WrongStateException, SystemException { // nothing to do here as the item has already been added to the set System.out - .println("[SERVICE] Participant.close (The participant knows that this BA is now finished and can throw away any temporary state)"); + .println("[SERVICE] Participant.close (The participant knows that this BA is now finished and can throw away any temporary state)"); removeParticipant(txID); } @@ -133,7 +133,7 @@ private void doCompensate() { @Override public void complete() throws WrongStateException, SystemException { System.out - .println("[SERVICE] Participant.complete (This tells the participant that the BA completed, but may be compensated later)"); + .println("[SERVICE] Participant.complete (This tells the participant that the BA completed, but may be compensated later)"); } /** @@ -146,9 +146,9 @@ public void complete() throws WrongStateException, SystemException { public void confirmCompleted(boolean confirmed) { if (confirmed) { System.out - .println("[SERVICE] Participant.confirmCompleted('" - + confirmed - + "') (This tells the participant that compensation information has been logged and that it is safe to commit any changes.)"); + .println("[SERVICE] Participant.confirmCompleted('" + + confirmed + + "') (This tells the participant that compensation information has been logged and that it is safe to commit any changes.)"); MockSetManager.commit(); } else { doCompensate(); diff --git a/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/SetServiceBAImpl.java b/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/SetServiceBAImpl.java index ecf838e6da..f1a2447b90 100644 --- a/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/SetServiceBAImpl.java +++ b/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/SetServiceBAImpl.java @@ -32,7 +32,8 @@ * * @author Paul Robinson (paul.robinson@redhat.com) */ -@WebService(serviceName = "SetServiceBAService", portName = "SetServiceBA", name = "SetServiceBA", targetNamespace = "http://www.jboss.org/jboss-jdf/jboss-as-quickstart/helloworld/wsba/coordinatorcompletion/set") +@WebService(serviceName = "SetServiceBAService", portName = "SetServiceBA", name = "SetServiceBA", + targetNamespace = "http://www.jboss.org/jboss-jdf/jboss-as-quickstart/helloworld/wsba/coordinatorcompletion/set") @HandlerChain(file = "/context-handlers.xml", name = "Context Handlers") @SOAPBinding(style = SOAPBinding.Style.RPC) @WebServlet("/SetServiceBA") @@ -74,7 +75,7 @@ public void addValueToSet(String value) throws AlreadyInSetException, SetService System.out.println("[SERVICE] Enlisting a participant into the BA"); activityManager.enlistForBusinessAgreementWithCoordinatorCompletion(participant, "SetServiceBAImpl:" - + UUID.randomUUID()); + + UUID.randomUUID()); } catch (Exception e) { System.err.println("Participant enlistment failed"); throw new SetServiceException("Error enlisting participant", e); diff --git a/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/jaxws/SetServiceBAService.java b/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/jaxws/SetServiceBAService.java index bd7692c2e7..7e2342ab81 100644 --- a/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/jaxws/SetServiceBAService.java +++ b/wsba-coordinator-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/jaxws/SetServiceBAService.java @@ -54,7 +54,7 @@ public SetServiceBAService(URL wsdlLocation, QName serviceName) { public SetServiceBAService() { super(SETSERVICEBASERVICE_WSDL_LOCATION, new QName("http://www.jboss.org/jboss-jdf/jboss-as-quickstart/Set", - "SetServiceBAService")); + "SetServiceBAService")); } /** diff --git a/wsba-coordinator-completion-simple/src/test/java/META-INF/beans.xml b/wsba-coordinator-completion-simple/src/test/java/META-INF/beans.xml index 639207b526..4114ef5dc1 100644 --- a/wsba-coordinator-completion-simple/src/test/java/META-INF/beans.xml +++ b/wsba-coordinator-completion-simple/src/test/java/META-INF/beans.xml @@ -16,10 +16,10 @@ limitations under the License. --> - diff --git a/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/Client.java b/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/Client.java index c9cc268ea0..9be673f991 100644 --- a/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/Client.java +++ b/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/Client.java @@ -47,9 +47,9 @@ public class Client implements SetServiceBA { public Client() throws MalformedURLException { URL wsdlLocation = new URL("http://localhost:8080/test/SetServiceBA?wsdl"); QName serviceName = new QName("http://www.jboss.org/jboss-jdf/jboss-as-quickstart/helloworld/wsba/coordinatorcompletion/set", - "SetServiceBAService"); + "SetServiceBAService"); QName portName = new QName("http://www.jboss.org/jboss-jdf/jboss-as-quickstart/helloworld/wsba/coordinatorcompletion/set", - "SetServiceBA"); + "SetServiceBA"); Service service = Service.create(wsdlLocation, serviceName); set = service.getPort(portName, SetServiceBA.class); diff --git a/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/ClientStub.java b/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/ClientStub.java index 61f174e529..4c439c1bde 100644 --- a/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/ClientStub.java +++ b/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/ClientStub.java @@ -37,6 +37,6 @@ */ @Qualifier @Retention(RUNTIME) -@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Target({ TYPE, METHOD, FIELD, PARAMETER }) public @interface ClientStub { } diff --git a/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/ClientTest.java b/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/ClientTest.java index d36ec90bf7..a9f689edaa 100644 --- a/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/ClientTest.java +++ b/wsba-coordinator-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/coordinatorcompletion/simple/ClientTest.java @@ -35,7 +35,7 @@ public class ClientTest { private static String ManifestMF = "Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.xts\n"; + + "Dependencies: org.jboss.xts\n"; @Inject @ClientStub @@ -44,10 +44,10 @@ public class ClientTest { @Deployment public static WebArchive createTestArchive() { return ShrinkWrap.create(WebArchive.class, "test.war") - .addPackages(true, SetServiceBAImpl.class.getPackage().getName()) - .addAsResource("context-handlers.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .setManifest(new StringAsset(ManifestMF)); + .addPackages(true, SetServiceBAImpl.class.getPackage().getName()) + .addAsResource("context-handlers.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .setManifest(new StringAsset(ManifestMF)); } /** @@ -59,7 +59,7 @@ public static WebArchive createTestArchive() { public void testSuccess() throws Exception { System.out - .println("\n\nStarting 'testSuccess'. This test invokes a WS twice within a BA. The BA is later closes, which causes these WS calls to complete successfully."); + .println("\n\nStarting 'testSuccess'. This test invokes a WS twice within a BA. The BA is later closes, which causes these WS calls to complete successfully."); System.out.println("[CLIENT] Creating a new Business Activity"); UserBusinessActivity uba = UserBusinessActivityFactory.userBusinessActivity(); try { @@ -67,7 +67,7 @@ public void testSuccess() throws Exception { String value2 = "2"; System.out - .println("[CLIENT] Beginning Business Activity (All calls to Web services that support WS-BA wil be included in this activity)"); + .println("[CLIENT] Beginning Business Activity (All calls to Web services that support WS-BA wil be included in this activity)"); uba.begin(); System.out.println("[CLIENT] invoking addValueToSet(1) on WS"); @@ -98,7 +98,7 @@ public void testSuccess() throws Exception { public void testCancel() throws Exception { System.out - .println("\n\nStarting 'testCancel'. This test invokes a WS twice within a BA. The BA is later cancelled, which causes these WS calls to be compensated."); + .println("\n\nStarting 'testCancel'. This test invokes a WS twice within a BA. The BA is later cancelled, which causes these WS calls to be compensated."); System.out.println("[CLIENT] Creating a new Business Activity"); UserBusinessActivity uba = UserBusinessActivityFactory.userBusinessActivity(); try { @@ -106,7 +106,7 @@ public void testCancel() throws Exception { String value2 = "2"; System.out - .println("[CLIENT] Beginning Business Activity (All calls to Web services that support WS-BA will be included in this activity)"); + .println("[CLIENT] Beginning Business Activity (All calls to Web services that support WS-BA will be included in this activity)"); uba.begin(); System.out.println("[CLIENT] invoking addValueToSet(1) on WS"); diff --git a/wsba-coordinator-completion-simple/src/test/resources/context-handlers.xml b/wsba-coordinator-completion-simple/src/test/resources/context-handlers.xml index 2d6a23ea86..23053948b9 100644 --- a/wsba-coordinator-completion-simple/src/test/resources/context-handlers.xml +++ b/wsba-coordinator-completion-simple/src/test/resources/context-handlers.xml @@ -18,7 +18,7 @@ diff --git a/wsba-participant-completion-simple/pom.xml b/wsba-participant-completion-simple/pom.xml index 0bb37269a5..f5307ddccc 100644 --- a/wsba-participant-completion-simple/pom.xml +++ b/wsba-participant-completion-simple/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -96,9 +96,9 @@ UTF-8 - + 1.0.2.Final - + 7.0.0-build-7 @@ -149,7 +149,7 @@ jboss-annotations-api_1.2_spec provided - + @@ -164,7 +164,7 @@ junit test - + javax.enterprise @@ -203,9 +203,9 @@ - - default diff --git a/wsba-participant-completion-simple/src/main/java/META-INF/beans.xml b/wsba-participant-completion-simple/src/main/java/META-INF/beans.xml index 6cf5f54f2c..5c0dbc2d7d 100644 --- a/wsba-participant-completion-simple/src/main/java/META-INF/beans.xml +++ b/wsba-participant-completion-simple/src/main/java/META-INF/beans.xml @@ -16,6 +16,6 @@ --> - \ No newline at end of file + diff --git a/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/MockSetManager.java b/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/MockSetManager.java index b4b9aab41d..dde6b8a2e5 100644 --- a/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/MockSetManager.java +++ b/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/MockSetManager.java @@ -68,7 +68,7 @@ public static boolean prepare() { */ public static void commit() { System.out - .println("[SERVICE] Commit the backend resource (e.g. commit any changes to databases so that they are visible to others)"); + .println("[SERVICE] Commit the backend resource (e.g. commit any changes to databases so that they are visible to others)"); } /** @@ -81,7 +81,7 @@ public static void commit() { */ public static void rollback(String item) { System.out.println("[SERVICE] Compensate the backend resource by removing '" + item - + "' from the set (e.g. undo any changes to databases that were previously made visible to others)"); + + "' from the set (e.g. undo any changes to databases that were previously made visible to others)"); synchronized (set) { set.remove(item); diff --git a/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/SetParticipantBA.java b/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/SetParticipantBA.java index fac36cd9d6..dd2686cce2 100644 --- a/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/SetParticipantBA.java +++ b/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/SetParticipantBA.java @@ -34,7 +34,7 @@ * @author Paul Robinson (paul.robinson@redhat.com) */ public class SetParticipantBA implements BusinessAgreementWithParticipantCompletionParticipant, ConfirmCompletedParticipant, - Serializable { + Serializable { private static final long serialVersionUID = 1L; @@ -60,7 +60,7 @@ public SetParticipantBA(String value) { public void close() throws WrongStateException, SystemException { // nothing to do here as the item has already been added to the set System.out - .println("[SERVICE] Participant.close (The participant knows that this BA is now finished and can throw away any temporary state)"); + .println("[SERVICE] Participant.close (The participant knows that this BA is now finished and can throw away any temporary state)"); } /** @@ -117,9 +117,9 @@ public void error() throws SystemException { public void confirmCompleted(boolean confirmed) { if (confirmed) { System.out - .println("[SERVICE] Participant.confirmCompleted('" - + confirmed - + "') (This tells the participant that compensation information has been logged and that it is safe to commit any changes.)"); + .println("[SERVICE] Participant.confirmCompleted('" + + confirmed + + "') (This tells the participant that compensation information has been logged and that it is safe to commit any changes.)"); MockSetManager.commit(); } else { MockSetManager.rollback(value); diff --git a/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/SetServiceBAImpl.java b/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/SetServiceBAImpl.java index ae503fdfc7..61ce80a696 100644 --- a/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/SetServiceBAImpl.java +++ b/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/SetServiceBAImpl.java @@ -33,7 +33,8 @@ * * @author Paul Robinson (paul.robinson@redhat.com) */ -@WebService(serviceName = "SetServiceBAService", portName = "SetServiceBA", name = "SetServiceBA", targetNamespace = "http://www.jboss.org/jboss-jdf/jboss-as-quickstart/helloworld/wsba/participantcompletion/set") +@WebService(serviceName = "SetServiceBAService", portName = "SetServiceBA", name = "SetServiceBA", + targetNamespace = "http://www.jboss.org/jboss-jdf/jboss-as-quickstart/helloworld/wsba/participantcompletion/set") @HandlerChain(file = "/context-handlers.xml", name = "Context Handlers") @SOAPBinding(style = SOAPBinding.Style.RPC) @WebServlet("/SetServiceBA") @@ -58,7 +59,7 @@ public void addValueToSet(String value) throws AlreadyInSetException, SetService BusinessActivityManager activityManager = BusinessActivityManagerFactory.businessActivityManager(); System.out.println("[SERVICE] Enlisting a participant into the BA"); participantManager = activityManager.enlistForBusinessAgreementWithParticipantCompletion(participant, - "SetServiceBAImpl:" + UUID.randomUUID()); + "SetServiceBAImpl:" + UUID.randomUUID()); } catch (Exception e) { System.err.println("Participant enlistment failed"); e.printStackTrace(System.err); @@ -76,7 +77,7 @@ public void addValueToSet(String value) throws AlreadyInSetException, SetService * decides to cancel we can rely upon being told to compensate. */ System.out - .println("[SERVICE] Prepare the backend resource and if successful notify the coordinator that we have completed our work"); + .println("[SERVICE] Prepare the backend resource and if successful notify the coordinator that we have completed our work"); if (MockSetManager.prepare()) { try { // tell the coordinator manager we have finished our work diff --git a/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/jaxws/SetServiceBAService.java b/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/jaxws/SetServiceBAService.java index 3b71b392f8..f351ac5b0c 100644 --- a/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/jaxws/SetServiceBAService.java +++ b/wsba-participant-completion-simple/src/main/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/jaxws/SetServiceBAService.java @@ -54,7 +54,7 @@ public SetServiceBAService(URL wsdlLocation, QName serviceName) { public SetServiceBAService() { super(SETSERVICEBASERVICE_WSDL_LOCATION, new QName("http://www.jboss.org/jboss-jdf/jboss-as-quickstart/Set", - "SetServiceBAService")); + "SetServiceBAService")); } /** diff --git a/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/Client.java b/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/Client.java index 56fb3cf343..63a413d5d6 100644 --- a/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/Client.java +++ b/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/Client.java @@ -47,9 +47,9 @@ public class Client implements SetServiceBA { public Client() throws MalformedURLException { URL wsdlLocation = new URL("http://localhost:8080/test/SetServiceBA?wsdl"); QName serviceName = new QName("http://www.jboss.org/jboss-jdf/jboss-as-quickstart/helloworld/wsba/participantcompletion/set", - "SetServiceBAService"); + "SetServiceBAService"); QName portName = new QName("http://www.jboss.org/jboss-jdf/jboss-as-quickstart/helloworld/wsba/participantcompletion/set", - "SetServiceBA"); + "SetServiceBA"); Service service = Service.create(wsdlLocation, serviceName); set = service.getPort(portName, SetServiceBA.class); diff --git a/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/ClientStub.java b/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/ClientStub.java index b5d161a724..fa507da3f6 100644 --- a/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/ClientStub.java +++ b/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/ClientStub.java @@ -37,6 +37,6 @@ */ @Qualifier @Retention(RUNTIME) -@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Target({ TYPE, METHOD, FIELD, PARAMETER }) public @interface ClientStub { } diff --git a/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/ClientTest.java b/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/ClientTest.java index edd521a29e..cc2496d7f4 100644 --- a/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/ClientTest.java +++ b/wsba-participant-completion-simple/src/test/java/org/jboss/as/quickstarts/wsba/participantcompletion/simple/ClientTest.java @@ -35,7 +35,7 @@ public class ClientTest { private static final String ManifestMF = "Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.xts\n"; + + "Dependencies: org.jboss.xts\n"; @Inject @ClientStub @@ -44,10 +44,10 @@ public class ClientTest { @Deployment public static WebArchive createTestArchive() { return ShrinkWrap.create(WebArchive.class, "test.war") - .addPackages(true, SetServiceBAImpl.class.getPackage().getName()) - .addAsResource("context-handlers.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .setManifest(new StringAsset(ManifestMF)); + .addPackages(true, SetServiceBAImpl.class.getPackage().getName()) + .addAsResource("context-handlers.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .setManifest(new StringAsset(ManifestMF)); } /** @@ -58,14 +58,14 @@ public static WebArchive createTestArchive() { @Test public void testSuccess() throws Exception { System.out - .println("\n\nStarting 'testSuccess'. This test invokes a WS within a BA. The BA is later closed, which causes the WS call to complete successfully."); + .println("\n\nStarting 'testSuccess'. This test invokes a WS within a BA. The BA is later closed, which causes the WS call to complete successfully."); System.out.println("[CLIENT] Creating a new Business Activity"); UserBusinessActivity uba = UserBusinessActivityFactory.userBusinessActivity(); try { String value = "1"; System.out - .println("[CLIENT] Beginning Business Activity (All calls to Web services that support WS-BA wil be included in this activity)"); + .println("[CLIENT] Beginning Business Activity (All calls to Web services that support WS-BA wil be included in this activity)"); uba.begin(); System.out.println("[CLIENT] invoking addValueToSet(1) on WS"); @@ -91,14 +91,14 @@ public void testSuccess() throws Exception { @Test public void testCancel() throws Exception { System.out - .println("\n\nStarting 'testCancel'. This test invokes a WS within a BA. The BA is later cancelled, which causes these WS call to be compensated."); + .println("\n\nStarting 'testCancel'. This test invokes a WS within a BA. The BA is later cancelled, which causes these WS call to be compensated."); System.out.println("[CLIENT] Creating a new Business Activity"); UserBusinessActivity uba = UserBusinessActivityFactory.userBusinessActivity(); try { String value = "1"; System.out - .println("[CLIENT] Beginning Business Activity (All calls to Web services that support WS-BA will be included in this activity)"); + .println("[CLIENT] Beginning Business Activity (All calls to Web services that support WS-BA will be included in this activity)"); uba.begin(); System.out.println("[CLIENT] invoking addValueToSet(1) on WS"); diff --git a/wsba-participant-completion-simple/src/test/resources/context-handlers.xml b/wsba-participant-completion-simple/src/test/resources/context-handlers.xml index c2a028230a..a690ac5e06 100644 --- a/wsba-participant-completion-simple/src/test/resources/context-handlers.xml +++ b/wsba-participant-completion-simple/src/test/resources/context-handlers.xml @@ -17,7 +17,7 @@ --> diff --git a/xml-dom4j/pom.xml b/xml-dom4j/pom.xml index 68972240db..a447e30387 100644 --- a/xml-dom4j/pom.xml +++ b/xml-dom4j/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,16 +90,16 @@ - - UTF-8 - + 1.0.2.Final - + 1.0.3.Final @@ -116,14 +116,14 @@ - - org.jboss.spec @@ -137,7 +137,7 @@ - @@ -147,7 +147,7 @@ provided - org.jboss.spec.javax.annotation @@ -169,7 +169,7 @@ provided - org.jboss.spec.javax.servlet @@ -177,8 +177,8 @@ provided - dom4j @@ -188,7 +188,7 @@ - ${project.artifactId} @@ -196,7 +196,7 @@ maven-war-plugin ${version.war.plugin} - false diff --git a/xml-dom4j/src/main/java/org/jboss/as/quickstart/xml/XMLParser.java b/xml-dom4j/src/main/java/org/jboss/as/quickstart/xml/XMLParser.java index 31f4cf3a38..fdfc95ea7f 100644 --- a/xml-dom4j/src/main/java/org/jboss/as/quickstart/xml/XMLParser.java +++ b/xml-dom4j/src/main/java/org/jboss/as/quickstart/xml/XMLParser.java @@ -57,7 +57,7 @@ public List parse(InputStream is) throws Exception { try { URL schema = Resources.getResource("/catalog.xsd"); Validator validator = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema").newSchema(schema) - .newValidator(); + .newValidator(); Source source = new StreamSource(new CharArrayReader(xml.toCharArray())); validator.validate(source); } catch (Exception e) { diff --git a/xml-dom4j/src/main/java/org/jboss/as/quickstart/xml/upload/FileUploadServlet.java b/xml-dom4j/src/main/java/org/jboss/as/quickstart/xml/upload/FileUploadServlet.java index 3d62cfeed1..e1beb0420b 100644 --- a/xml-dom4j/src/main/java/org/jboss/as/quickstart/xml/upload/FileUploadServlet.java +++ b/xml-dom4j/src/main/java/org/jboss/as/quickstart/xml/upload/FileUploadServlet.java @@ -85,7 +85,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S String partContentType = p.getContentType(); String partName = p.getName(); if (partContentType != null && partContentType.equals("text/xml") && partName != null - && partName.equals(INPUT_NAME)) { + && partName.equals(INPUT_NAME)) { InputStream is = p.getInputStream(); fileUploadBean.parseUpload(is); diff --git a/xml-dom4j/src/main/resources/catalog.xml b/xml-dom4j/src/main/resources/catalog.xml index 23d7d3d540..519c0d49e5 100644 --- a/xml-dom4j/src/main/resources/catalog.xml +++ b/xml-dom4j/src/main/resources/catalog.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - Sean Connery diff --git a/xml-dom4j/src/main/webapp/WEB-INF/beans.xml b/xml-dom4j/src/main/webapp/WEB-INF/beans.xml index ef5f221efe..80249f91c6 100644 --- a/xml-dom4j/src/main/webapp/WEB-INF/beans.xml +++ b/xml-dom4j/src/main/webapp/WEB-INF/beans.xml @@ -19,6 +19,6 @@ xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" - http://xmlns.jcp.org/xml/ns/javaee + http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all"> diff --git a/xml-jaxp/pom.xml b/xml-jaxp/pom.xml index 95ca42d0f1..e508f823c9 100644 --- a/xml-jaxp/pom.xml +++ b/xml-jaxp/pom.xml @@ -41,7 +41,7 @@ see the section entitled 'Use the Maven Repository' in the Development Guide for Red Hat JBoss Enterprise Application Platform located here: - https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ + https://access.redhat.com/documentation/en-US/JBoss_Enterprise_Application_Platform/ --> @@ -90,9 +90,9 @@ - - UTF-8 @@ -114,14 +114,14 @@ - - org.jboss.spec @@ -135,10 +135,10 @@ - - javax.enterprise @@ -146,21 +146,21 @@ provided - org.jboss.spec.javax.annotation jboss-annotations-api_1.2_spec provided - + org.jboss.spec.javax.ws.rs jboss-jaxrs-api_2.0_spec provided - + org.jboss.spec.javax.faces @@ -177,7 +177,7 @@ - ${project.artifactId} diff --git a/xml-jaxp/src/main/java/org/jboss/as/quickstart/xml/XMLParser.java b/xml-jaxp/src/main/java/org/jboss/as/quickstart/xml/XMLParser.java index 31f4cf3a38..fdfc95ea7f 100644 --- a/xml-jaxp/src/main/java/org/jboss/as/quickstart/xml/XMLParser.java +++ b/xml-jaxp/src/main/java/org/jboss/as/quickstart/xml/XMLParser.java @@ -57,7 +57,7 @@ public List parse(InputStream is) throws Exception { try { URL schema = Resources.getResource("/catalog.xsd"); Validator validator = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema").newSchema(schema) - .newValidator(); + .newValidator(); Source source = new StreamSource(new CharArrayReader(xml.toCharArray())); validator.validate(source); } catch (Exception e) { diff --git a/xml-jaxp/src/main/java/org/jboss/as/quickstart/xml/upload/FileUploadServlet.java b/xml-jaxp/src/main/java/org/jboss/as/quickstart/xml/upload/FileUploadServlet.java index 3d62cfeed1..e1beb0420b 100644 --- a/xml-jaxp/src/main/java/org/jboss/as/quickstart/xml/upload/FileUploadServlet.java +++ b/xml-jaxp/src/main/java/org/jboss/as/quickstart/xml/upload/FileUploadServlet.java @@ -85,7 +85,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S String partContentType = p.getContentType(); String partName = p.getName(); if (partContentType != null && partContentType.equals("text/xml") && partName != null - && partName.equals(INPUT_NAME)) { + && partName.equals(INPUT_NAME)) { InputStream is = p.getInputStream(); fileUploadBean.parseUpload(is); diff --git a/xml-jaxp/src/main/resources/catalog.xml b/xml-jaxp/src/main/resources/catalog.xml index 23d7d3d540..519c0d49e5 100644 --- a/xml-jaxp/src/main/resources/catalog.xml +++ b/xml-jaxp/src/main/resources/catalog.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - Sean Connery diff --git a/xml-jaxp/src/main/webapp/WEB-INF/beans.xml b/xml-jaxp/src/main/webapp/WEB-INF/beans.xml index 5e3ae23c7e..ec765a7173 100644 --- a/xml-jaxp/src/main/webapp/WEB-INF/beans.xml +++ b/xml-jaxp/src/main/webapp/WEB-INF/beans.xml @@ -19,11 +19,11 @@ xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" - http://xmlns.jcp.org/xml/ns/javaee + http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" bean-discovery-mode="all"> -