From 0b097630373e5fd9b76d45f9710d925fcf5b9811 Mon Sep 17 00:00:00 2001 From: Hans Sowa Date: Wed, 20 Sep 2023 15:13:09 +0200 Subject: [PATCH 1/6] Migrate to java 17, widfly 28 (jakarta), primeface 12, jsf 4 Wildfly 28/Jakarta 9 - Fix inject problem with @ManagedProperty - Fix searching for scientific name on livingplan manage page - Fix filter problem do to api changes - Migrate persistence.xml to version 3.0 - Refactor Date to LocalDate - Fix missing named queries (@MappedSuperclass is not possible without inherited by an entity) - Remove the resteasy configuration from manifest so the correct verison is used - Use newest resteasy-client and jakarta security enterprise api - Fix hibernate.dialect - Remove jaspitest configuration instead use default Elytron jaspi configuration - Fix DefaultStreamdContent and some load methods - Fixed LazyxxxModels load, getRowKey method - Fix uploadfile for faces - Set javvax.security.enterprise to provided - Use jakarta instead of javax - Fix returning not all findable livings - Fix tab Deriatives - Add design to tab green color - Fix issue with Standort get id for criterias Primefaces 12/Java Server Faces 4 - Use new default theme saga instead of omega - Use slide menu instead of omega based menu - Fix primefaces converter for LocalDate - Solve the problem with Resources jakarta.faces.resource Maven/Java 17 - Add maven wrapper - Use new versions of plugins maven-compiler-plugin:3.10.1 maven-war-plugin:3.4.0 maven-jar-plugin:3.2.2 maven-dependency-plugin:3.6.0 - Remove versions information etc. from plugins which are management in the pom project - Set Maven Compiler to java 17 --- README.md | 22 +- jacq-common/pom.xml | 39 +- .../model/rest/GeoNamesAdminCodes.java | 6 +- .../common/external/rest/GeoNamesService.java | 12 +- .../common/external/rest/ImageServer.java | 16 +- .../external/rest/ScientificNamesService.java | 10 +- .../converter/AcquisitionSourceConverter.java | 8 +- .../faces/converter/CultivarConverter.java | 8 +- .../faces/converter/LocationConverter.java | 8 +- .../converter/OrganisationConverter.java | 8 +- .../OutputOrganisationConverter.java | 8 +- .../faces/converter/PersonConverter.java | 10 +- .../converter/ScientificNameConverter.java | 8 +- .../common/manager/BaseDerivativeManager.java | 8 +- .../common/manager/BaseGatheringManager.java | 6 +- .../manager/BaseImageServerManager.java | 16 +- .../manager/BaseOrganisationManager.java | 20 +- .../common/manager/NameParserManager.java | 16 +- .../common/model/dataimport/ImportRecord.java | 35 +- .../model/jpa/FrmwrkAuthAssignment.java | 24 +- .../model/jpa/FrmwrkAuthAssignmentPK.java | 10 +- .../jacq/common/model/jpa/FrmwrkAuthItem.java | 36 +- .../jacq/common/model/jpa/FrmwrkConfig.java | 26 +- .../model/jpa/FrmwrkEmploymentType.java | 32 +- .../org/jacq/common/model/jpa/FrmwrkRole.java | 30 +- .../jacq/common/model/jpa/FrmwrkTemplate.java | 22 +- .../org/jacq/common/model/jpa/FrmwrkUser.java | 53 +- .../jacq/common/model/jpa/FrmwrkUserType.java | 32 +- .../jpa/FrmwrkaccessBotanicalObject.java | 28 +- .../model/jpa/FrmwrkaccessClassification.java | 28 +- .../model/jpa/FrmwrkaccessOrganisation.java | 32 +- .../common/model/jpa/RevClassification.java | 49 +- .../org/jacq/common/model/jpa/RevFlora.java | 26 +- .../jacq/common/model/jpa/ScientificName.java | 19 + .../jacq/common/model/jpa/SrvcUuidMinter.java | 34 +- .../common/model/jpa/SrvcUuidMinterType.java | 32 +- .../common/model/jpa/TblAccessionNumber.java | 24 +- .../common/model/jpa/TblAcquisitionDate.java | 30 +- .../common/model/jpa/TblAcquisitionEvent.java | 40 +- .../model/jpa/TblAcquisitionEventSource.java | 37 +- .../model/jpa/TblAcquisitionSource.java | 35 +- .../common/model/jpa/TblAcquisitionType.java | 30 +- .../jpa/TblAlternativeAccessionNumber.java | 30 +- .../common/model/jpa/TblBotanicalObject.java | 56 +- .../model/jpa/TblBotanicalObjectSex.java | 26 +- .../jacq/common/model/jpa/TblCertificate.java | 30 +- .../common/model/jpa/TblCertificateType.java | 32 +- .../common/model/jpa/TblClassification.java | 44 +- .../jpa/TblClassificationChorolStatus.java | 28 +- .../jacq/common/model/jpa/TblCultivar.java | 37 +- .../jacq/common/model/jpa/TblDerivative.java | 41 +- .../common/model/jpa/TblDerivativeType.java | 32 +- .../jacq/common/model/jpa/TblDiaspora.java | 28 +- .../common/model/jpa/TblDiasporaBank.java | 30 +- .../jacq/common/model/jpa/TblGeoNation.java | 20 +- .../jacq/common/model/jpa/TblGeoProvince.java | 20 +- .../jacq/common/model/jpa/TblHabitusType.java | 30 +- .../jacq/common/model/jpa/TblIdentStatus.java | 30 +- .../jacq/common/model/jpa/TblImageServer.java | 32 +- .../jacq/common/model/jpa/TblImportError.java | 26 +- .../common/model/jpa/TblImportProperties.java | 34 +- .../model/jpa/TblIndexSeminumContent.java | 45 +- .../model/jpa/TblIndexSeminumPerson.java | 34 +- .../model/jpa/TblIndexSeminumRevision.java | 43 +- .../common/model/jpa/TblIndexSeminumType.java | 32 +- .../jacq/common/model/jpa/TblInventory.java | 36 +- .../common/model/jpa/TblInventoryObject.java | 36 +- .../common/model/jpa/TblInventoryType.java | 36 +- .../jacq/common/model/jpa/TblLabelType.java | 30 +- .../jacq/common/model/jpa/TblLivingPlant.java | 57 +- .../jpa/TblLivingPlantTreeRecordFilePage.java | 41 +- .../jacq/common/model/jpa/TblLocation.java | 39 +- .../model/jpa/TblLocationCoordinates.java | 30 +- .../common/model/jpa/TblLocationGeonames.java | 28 +- .../jacq/common/model/jpa/TblNomEpithet.java | 33 +- .../org/jacq/common/model/jpa/TblNomName.java | 47 +- .../org/jacq/common/model/jpa/TblNomRank.java | 30 +- .../jacq/common/model/jpa/TblNomStatus.java | 30 +- .../common/model/jpa/TblNomSubstantive.java | 33 +- .../common/model/jpa/TblOrganisation.java | 38 +- .../org/jacq/common/model/jpa/TblPerson.java | 35 +- .../jacq/common/model/jpa/TblPhenology.java | 30 +- .../common/model/jpa/TblRelevancyType.java | 30 +- .../jpa/TblScientificNameInformation.java | 34 +- .../org/jacq/common/model/jpa/TblSeed.java | 26 +- .../jacq/common/model/jpa/TblSeedOrder.java | 60 +- .../model/jpa/TblSeedOrderDerivative.java | 26 +- .../jacq/common/model/jpa/TblSeparation.java | 43 +- .../common/model/jpa/TblSeparationType.java | 30 +- .../jacq/common/model/jpa/TblSequence.java | 20 +- .../org/jacq/common/model/jpa/TblSex.java | 30 +- .../jacq/common/model/jpa/TblSpecimen.java | 33 +- .../jacq/common/model/jpa/TblSpecimenOld.java | 34 +- .../common/model/jpa/TblTreeRecordFile.java | 30 +- .../model/jpa/TblTreeRecordFilePage.java | 38 +- .../jpa/TblUserClassificationSource.java | 30 +- .../jacq/common/model/jpa/TblVegetative.java | 46 +- .../model/jpa/ViewClassificationResult.java | 26 +- .../org/jacq/common/model/jpa/ViewPerson.java | 20 +- .../jacq/common/model/jpa/ViewProtolog.java | 22 +- .../common/model/jpa/ViewScientificName.java | 22 +- .../org/jacq/common/model/jpa/ViewTaxon.java | 22 +- .../jpa/custom/BotanicalObjectDerivative.java | 16 +- .../model/jpa/custom/CustomNamedQueries.java | 62 -- .../CustomNamedStoredProcedureQueries.java | 10 +- .../model/jpa/openup/TblCommonNamesCache.java | 24 +- .../jpa/openup/TblScientificNameCache.java | 24 +- .../common/model/jpa/openup/TblService.java | 30 +- .../model/jpa/openup/TblWebserviceCache.java | 30 +- .../jacq/common/model/names/CommonName.java | 4 +- .../model/names/taxamatch/Searchresult.java | 2 +- .../rest/AcquistionEventSourceResult.java | 11 +- .../rest/BotanicalObjectDownloadResult.java | 6 +- .../model/rest/BotanicalObjectResult.java | 6 +- .../model/rest/EmploymentTypeResult.java | 6 +- .../model/rest/ImportPropertiesResult.java | 6 +- .../rest/IndexSeminumDownloadResult.java | 6 +- .../common/model/rest/IndexSeminumResult.java | 6 +- .../common/model/rest/InventoryResult.java | 6 +- .../model/rest/InventoryTypeResult.java | 6 +- .../common/model/rest/LivingPlantResult.java | 13 +- .../common/model/rest/OrganisationResult.java | 6 +- .../model/rest/RevClassificationResponse.java | 10 +- .../jacq/common/model/rest/RoleResult.java | 6 +- .../common/model/rest/SeedOrderResult.java | 8 +- .../common/model/rest/SeparationResult.java | 12 +- .../model/rest/TreeRecordFilePageResult.java | 6 +- .../model/rest/TreeRecordFileResult.java | 6 +- .../jacq/common/model/rest/UserResult.java | 14 +- .../common/model/rest/UserTypeResult.java | 6 +- .../common/model/rest/VegetativeResult.java | 8 +- .../jacq/common/rest/AcquisitionService.java | 12 +- .../common/rest/AuthorizationService.java | 14 +- .../common/rest/ClassificationService.java | 14 +- .../jacq/common/rest/DerivativeService.java | 16 +- .../jacq/common/rest/GatheringService.java | 12 +- .../jacq/common/rest/IndexSeminumService.java | 14 +- .../jacq/common/rest/InventoryService.java | 12 +- .../jacq/common/rest/OrganisationService.java | 14 +- .../org/jacq/common/rest/PersonService.java | 12 +- .../org/jacq/common/rest/PortalService.java | 10 +- .../jacq/common/rest/SeedExchangeService.java | 14 +- .../common/rest/TreeRecordFileService.java | 14 +- .../org/jacq/common/rest/UserService.java | 14 +- .../org/jacq/common/rest/UuidService.java | 10 +- .../rest/dataimport/DataImportService.java | 12 +- .../rest/exception/JacqRestException.java | 4 +- .../filter/ContentTypeResponseFilter.java | 8 +- .../rest/filter/RequestDebugFilter.java | 6 +- .../common/rest/names/CommonNameService.java | 14 +- .../rest/names/ScientificNameService.java | 14 +- .../common/rest/output/SearchService.java | 12 +- .../provider/CustomDateParamConverter.java | 2 +- .../CustomDateParamConverterProvider.java | 6 +- .../jacq/common/rest/report/LabelService.java | 14 +- .../common/security/JacqCallerPrincipal.java | 2 +- .../org/jacq/common/util/ServicesUtil.java | 15 +- .../src/main/resources/META-INF/beans.xml | 5 + jacq-dataimport/pom.xml | 51 +- .../org/jacq/service/JacqServiceConfig.java | 14 +- .../manager/BromiMdbImportManager.java | 26 +- .../dataimport/manager/DataImportManager.java | 31 +- .../manager/DbViewImportManager.java | 12 +- .../dataimport/manager/GatheringManager.java | 12 +- .../security/BasicClientRequestFilter.java | 6 +- .../service/dataimport/util/ServicesUtil.java | 13 +- .../service/rest/dataimport/JacqService.java | 4 +- .../impl/DataImportServiceImpl.java | 2 +- .../dataimport/impl/GatheringServiceImpl.java | 2 +- .../main/resources/META-INF/persistence.xml | 21 +- .../src/main/webapp/WEB-INF/beans.xml | 8 +- jacq-input/pom.xml | 75 +- .../org/jacq/input/ApplicationManager.java | 10 +- .../java/org/jacq/input/JacqPortalConfig.java | 6 +- .../java/org/jacq/input/SessionManager.java | 12 +- .../controller/IndexSeminumController.java | 8 +- .../IndexSeminumEditController.java | 13 +- .../controller/InventoryEditController.java | 17 +- .../controller/LivingPlantController.java | 17 +- .../controller/LivingPlantEditController.java | 29 +- .../input/controller/LoginController.java | 35 +- .../OrganisationAccessController.java | 11 +- .../controller/OrganisationController.java | 8 +- .../OrganisationEditController.java | 18 +- ...rganisationHierarchicSelectController.java | 10 +- .../controller/SeedExchangeController.java | 8 +- .../SeedExchangeEditController.java | 19 +- .../input/controller/SessionController.java | 14 +- .../controller/TreeRecordFileController.java | 8 +- .../TreeRecordFileEditController.java | 17 +- .../jacq/input/controller/UserController.java | 8 +- .../input/controller/UserEditController.java | 17 +- .../controller/UserUpdateController.java | 13 +- .../controller/VegetativeEditController.java | 10 +- .../jacq/input/faces/UpdatePhaseListener.java | 8 +- .../security/BasicClientRequestFilter.java | 14 +- .../input/security/InputIdentityStore.java | 18 +- .../input/view/LazyDerivativeDataModel.java | 38 +- .../view/LazyDerivativeDownloadDataModel.java | 62 +- .../input/view/LazyIndexSeminumDataModel.java | 16 +- .../LazyIndexSeminumDownloadDataModel.java | 16 +- .../view/LazyOrganisationAccessDataModel.java | 16 +- .../input/view/LazyOrganisationDataModel.java | 42 +- .../view/LazyTreeRecordFileDataModel.java | 34 +- .../jacq/input/view/LazyUserDataModel.java | 35 +- jacq-input/src/main/sass/_icons.scss | 911 ++++++++++++---- jacq-input/src/main/sass/_landing.scss | 2 +- jacq-input/src/main/sass/_main.scss | 555 +++++----- jacq-input/src/main/sass/_theme.scss | 322 ++++-- jacq-input/src/main/webapp/WEB-INF/beans.xml | 11 +- .../src/main/webapp/WEB-INF/faces-config.xml | 23 +- .../src/main/webapp/WEB-INF/jboss-web.xml | 1 - .../webapp/WEB-INF/lib/omega-menu-1.1.2.jar | Bin 10197 -> 0 bytes .../WEB-INF/lib/omega-theme-5.1.0-jakarta.jar | Bin 0 -> 101567 bytes .../WEB-INF/primefaces-omega.taglib.xml | 60 -- .../templates/{omega => saga}/error.xhtml | 4 +- .../templates/{omega => saga}/sidebar.xhtml | 63 +- .../templates/{omega => saga}/template.xhtml | 14 +- .../templates/{omega => saga}/topbar.xhtml | 2 +- jacq-input/src/main/webapp/WEB-INF/web.xml | 20 +- .../main/webapp/pages/livingplant/edit.xhtml | 2 +- .../pages/livingplant/edit/derivatives.xhtml | 2 +- .../webapp/pages/livingplant/editsimple.xhtml | 2 +- .../pages/livingplant/indexseminum.xhtml | 2 +- .../pages/livingplant/inventories.xhtml | 2 +- .../pages/livingplant/inventoryedit.xhtml | 2 +- .../webapp/pages/livingplant/manage.xhtml | 2 +- .../pages/livingplant/revisioncreate.xhtml | 2 +- .../main/webapp/pages/organisation/edit.xhtml | 2 +- .../webapp/pages/organisation/manage.xhtml | 2 +- .../main/webapp/pages/seedexchange/edit.xhtml | 2 +- .../webapp/pages/seedexchange/manage.xhtml | 4 +- .../webapp/pages/treerecordfile/edit.xhtml | 2 +- .../webapp/pages/treerecordfile/manage.xhtml | 4 +- .../src/main/webapp/pages/user/edit.xhtml | 10 +- .../src/main/webapp/pages/user/manage.xhtml | 4 +- .../src/main/webapp/pages/user/update.xhtml | 2 +- .../src/main/webapp/resources/jacq/jacq.css | 20 +- .../resources/omega-layout/css/grid.css | 347 ------- .../resources/omega-layout/css/layout.css.map | 7 - .../resources/omega-layout/images/404.png | Bin 11003 -> 0 bytes .../resources/omega-layout/images/access.png | Bin 3756 -> 0 bytes .../omega-layout/images/avatar_1.png | Bin 1051 -> 0 bytes .../omega-layout/images/avatar_2.png | Bin 986 -> 0 bytes .../omega-layout/images/avatar_3.png | Bin 1044 -> 0 bytes .../omega-layout/images/avatar_4.png | Bin 1111 -> 0 bytes .../resources/omega-layout/images/error.png | Bin 4728 -> 0 bytes .../images/landing/section1_bg.jpg | Bin 144066 -> 0 bytes .../images/landing/section1_logo.png | Bin 5594 -> 0 bytes .../images/landing/section2_1.png | Bin 889 -> 0 bytes .../images/landing/section2_2.png | Bin 1008 -> 0 bytes .../images/landing/section2_3.png | Bin 1008 -> 0 bytes .../images/landing/section2_4.png | Bin 1829 -> 0 bytes .../images/landing/section2_5.png | Bin 883 -> 0 bytes .../images/landing/section2_6.png | Bin 1419 -> 0 bytes .../images/landing/section3_mobile.png | Bin 39455 -> 0 bytes .../omega-layout/images/login-logo.png | Bin 7433 -> 0 bytes .../omega-layout/images/logo-colored.png | Bin 5414 -> 0 bytes .../resources/omega-layout/images/logo.png | Bin 3287 -> 0 bytes .../omega-layout/images/preloader.gif | Bin 10756 -> 0 bytes .../resources/omega-layout/images/profile.png | Bin 3780 -> 0 bytes .../css/animate.css | 0 .../css/layout.css | 983 ++++++++---------- .../resources/saga-layout/css/layout.css.map | 7 + .../css/nanoscroller.css | 0 .../webapp/resources/saga-layout/js/jacq.js | 6 + .../js/layout.js | 324 ++++-- .../js/nanoscroller.js | 0 .../webapp/resources/saga-layout/js/prism.js | 10 + jacq-names/pom.xml | 12 +- .../names/manager/CommonNameManager.java | 24 +- .../names/manager/ScientificNameManager.java | 28 +- .../names/sources/dnpgoth/DnpGoThSource.java | 8 +- .../sources/dnpgoth/DnpGoThWebSearch.java | 16 +- .../names/sources/util/SourcesUtil.java | 12 +- .../names/sources/ylist/YListSource.java | 9 +- .../names/sources/ylist/YListWebSearch.java | 8 +- .../jacq/service/rest/names/JacqService.java | 4 +- .../names/impl/CommonNameServiceImpl.java | 6 +- .../names/impl/ScientificNameServiceImpl.java | 2 +- .../main/resources/META-INF/persistence.xml | 33 +- jacq-names/src/main/webapp/WEB-INF/beans.xml | 8 +- jacq-output/pom.xml | 46 +- .../java/org/jacq/output/SessionManager.java | 4 +- .../output/controller/FloraController.java | 11 +- .../output/controller/SearchController.java | 10 +- .../view/LazyBotanicalObjectDataModel.java | 33 +- .../src/main/webapp/WEB-INF/faces-config.xml | 10 +- jacq-output/src/main/webapp/WEB-INF/web.xml | 4 +- jacq-service-output/pom.xml | 11 +- .../output/manager/ApplicationManager.java | 4 +- .../output/manager/OrganisationManager.java | 6 +- .../service/output/manager/SearchManager.java | 10 +- .../output/rest/JacqServiceOutput.java | 4 +- .../output/rest/impl/SearchServiceImpl.java | 2 +- .../main/resources/META-INF/persistence.xml | 19 +- .../src/main/webapp/WEB-INF/beans.xml | 8 +- jacq-service-report/pom.xml | 52 +- .../service/report/ApplicationManager.java | 10 +- .../org/jacq/service/report/JacqConfig.java | 14 +- .../service/report/manager/LabelManager.java | 16 +- .../report/rest/JacqServiceReport.java | 4 +- .../report/rest/impl/LabelServiceImpl.java | 6 +- .../PassthroughClientRequestFilter.java | 10 +- .../report/security/ReportIdentityStore.java | 14 +- .../main/resources/META-INF/persistence.xml | 19 +- .../src/main/webapp/WEB-INF/beans.xml | 11 +- .../src/main/webapp/WEB-INF/jboss-web.xml | 1 - jacq-service/pom.xml | 19 +- .../org/jacq/service/ApplicationManager.java | 10 +- .../org/jacq/service/JacqServiceConfig.java | 12 +- .../java/org/jacq/service/TimerManager.java | 6 +- .../service/manager/AcquisitionManager.java | 8 +- .../service/manager/AuthorizationManager.java | 26 +- .../manager/ClassificationManager.java | 18 +- .../service/manager/DerivativeManager.java | 26 +- .../service/manager/GatheringManager.java | 10 +- .../service/manager/ImageServerManager.java | 6 +- .../service/manager/IndexSeminumManager.java | 20 +- .../service/manager/InventoryManager.java | 12 +- .../service/manager/LivingPlantManager.java | 12 +- .../service/manager/OrganisationManager.java | 22 +- .../jacq/service/manager/PersonManager.java | 8 +- .../jacq/service/manager/SecurityManager.java | 6 +- .../service/manager/SeedExchangeManager.java | 16 +- .../manager/TreeRecordFileManager.java | 20 +- .../org/jacq/service/manager/UserManager.java | 26 +- .../org/jacq/service/manager/UuidManager.java | 10 +- .../service/manager/VegetativeManager.java | 8 +- .../org/jacq/service/rest/JacqService.java | 4 +- .../rest/impl/AcquisitionServiceImpl.java | 2 +- .../rest/impl/AuthorizationServiceImpl.java | 2 +- .../rest/impl/ClassificationServiceImpl.java | 6 +- .../rest/impl/DerivativeServiceImpl.java | 6 +- .../rest/impl/GatheringServiceImpl.java | 2 +- .../rest/impl/IndexSeminumServiceImpl.java | 4 +- .../rest/impl/InventoryServiceImpl.java | 2 +- .../rest/impl/OrganisationServiceImpl.java | 2 +- .../service/rest/impl/PersonServiceImpl.java | 2 +- .../service/rest/impl/PortalServiceImpl.java | 2 +- .../rest/impl/SeedExchangeServiceImpl.java | 2 +- .../rest/impl/TreeRecordFileServiceImpl.java | 2 +- .../service/rest/impl/UserServiceImpl.java | 2 +- .../service/rest/impl/UuidServiceImpl.java | 2 +- .../security/ServiceCallerPrincipal.java | 2 +- .../security/ServiceIdentityStore.java | 14 +- .../main/resources/META-INF/persistence.xml | 21 +- .../src/main/webapp/WEB-INF/beans.xml | 8 +- .../src/main/webapp/WEB-INF/jboss-web.xml | 1 - jacq/.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 62547 bytes jacq/.mvn/wrapper/maven-wrapper.properties | 18 + jacq/mvnw | 308 ++++++ jacq/mvnw.cmd | 205 ++++ jacq/pom.xml | 70 +- 354 files changed, 5402 insertions(+), 4337 deletions(-) create mode 100644 jacq-common/src/main/java/org/jacq/common/model/jpa/ScientificName.java delete mode 100644 jacq-common/src/main/java/org/jacq/common/model/jpa/custom/CustomNamedQueries.java create mode 100644 jacq-common/src/main/resources/META-INF/beans.xml delete mode 100644 jacq-input/src/main/webapp/WEB-INF/lib/omega-menu-1.1.2.jar create mode 100644 jacq-input/src/main/webapp/WEB-INF/lib/omega-theme-5.1.0-jakarta.jar delete mode 100644 jacq-input/src/main/webapp/WEB-INF/primefaces-omega.taglib.xml rename jacq-input/src/main/webapp/WEB-INF/templates/{omega => saga}/error.xhtml (87%) rename jacq-input/src/main/webapp/WEB-INF/templates/{omega => saga}/sidebar.xhtml (72%) rename jacq-input/src/main/webapp/WEB-INF/templates/{omega => saga}/template.xhtml (79%) rename jacq-input/src/main/webapp/WEB-INF/templates/{omega => saga}/topbar.xhtml (95%) delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/css/grid.css delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/css/layout.css.map delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/404.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/access.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/avatar_1.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/avatar_2.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/avatar_3.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/avatar_4.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/error.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/landing/section1_bg.jpg delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/landing/section1_logo.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_1.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_2.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_3.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_4.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_5.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_6.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/landing/section3_mobile.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/login-logo.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/logo-colored.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/logo.png delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/preloader.gif delete mode 100644 jacq-input/src/main/webapp/resources/omega-layout/images/profile.png rename jacq-input/src/main/webapp/resources/{omega-layout => saga-layout}/css/animate.css (100%) rename jacq-input/src/main/webapp/resources/{omega-layout => saga-layout}/css/layout.css (85%) create mode 100644 jacq-input/src/main/webapp/resources/saga-layout/css/layout.css.map rename jacq-input/src/main/webapp/resources/{omega-layout => saga-layout}/css/nanoscroller.css (100%) create mode 100644 jacq-input/src/main/webapp/resources/saga-layout/js/jacq.js rename jacq-input/src/main/webapp/resources/{omega-layout => saga-layout}/js/layout.js (53%) rename jacq-input/src/main/webapp/resources/{omega-layout => saga-layout}/js/nanoscroller.js (100%) create mode 100644 jacq-input/src/main/webapp/resources/saga-layout/js/prism.js create mode 100644 jacq/.mvn/wrapper/maven-wrapper.jar create mode 100644 jacq/.mvn/wrapper/maven-wrapper.properties create mode 100755 jacq/mvnw create mode 100644 jacq/mvnw.cmd diff --git a/README.md b/README.md index 779c1e2f..9b119bfa 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,25 @@ Development Setup -- Netbeans (8.0.2) +- openjdk 17 - WildFly Plugin / JavaEE Edition -- WildFly 8.2 +- WildFly 13.0.0 Maven project can be opened directly from netbeans. jacq-common contains JPA / JAX-RS classes / interfaces only. -jacq-service contains the actual implementation using manager classes. \ No newline at end of file +jacq-service contains the actual implementation using manager classes. + +# To build + +We are using the the maven wrapper. So, instead of call mvn please use mvnw. For furher information +have a look at https://maven.apache.org/wrapper/index.html + +This means you don't have to install maven manually. + + +# Wildfly 13.0.0 + +To avoid the error `ModuleNotFoundException` java.se with Java 17 you have to add in the standalone.sh following line. Add it at the beginning of the file. + +``` + +``` \ No newline at end of file diff --git a/jacq-common/pom.xml b/jacq-common/pom.xml index 7ed72e4f..32073da8 100644 --- a/jacq-common/pom.xml +++ b/jacq-common/pom.xml @@ -28,48 +28,33 @@ org.jboss.resteasy resteasy-client - 3.0.19.Final + 6.2.4.Final provided - javax - javaee-api - 7.0 + jakarta.platform + jakarta.jakartaee-api + 9.1.0 provided - org.glassfish.soteria - javax.security.enterprise - 1.0 + jakarta.security.enterprise + jakarta.security.enterprise-api + 3.0.0 + provided - 1.8 - 1.8 + 17 + 17 UTF-8 - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - org.jboss.resteasy.resteasy-jaxrs - - - - org.apache.maven.plugins maven-compiler-plugin - 2.3.2 ${project.build.sourceEncoding} @@ -77,10 +62,6 @@ org.apache.maven.plugins maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - diff --git a/jacq-common/src/main/java/org/jacq/common/external/model/rest/GeoNamesAdminCodes.java b/jacq-common/src/main/java/org/jacq/common/external/model/rest/GeoNamesAdminCodes.java index ec0c22b6..3c981172 100644 --- a/jacq-common/src/main/java/org/jacq/common/external/model/rest/GeoNamesAdminCodes.java +++ b/jacq-common/src/main/java/org/jacq/common/external/model/rest/GeoNamesAdminCodes.java @@ -15,9 +15,9 @@ */ package org.jacq.common.external.model.rest; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/external/rest/GeoNamesService.java b/jacq-common/src/main/java/org/jacq/common/external/rest/GeoNamesService.java index 45723ba3..8baf70bc 100644 --- a/jacq-common/src/main/java/org/jacq/common/external/rest/GeoNamesService.java +++ b/jacq-common/src/main/java/org/jacq/common/external/rest/GeoNamesService.java @@ -15,12 +15,12 @@ */ package org.jacq.common.external.rest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.external.model.rest.GeoNamesSearchResult; /** diff --git a/jacq-common/src/main/java/org/jacq/common/external/rest/ImageServer.java b/jacq-common/src/main/java/org/jacq/common/external/rest/ImageServer.java index cd04fe14..ca2a0cd0 100644 --- a/jacq-common/src/main/java/org/jacq/common/external/rest/ImageServer.java +++ b/jacq-common/src/main/java/org/jacq/common/external/rest/ImageServer.java @@ -15,14 +15,14 @@ */ package org.jacq.common.external.rest; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * JAX-RS based interface definition for image server diff --git a/jacq-common/src/main/java/org/jacq/common/external/rest/ScientificNamesService.java b/jacq-common/src/main/java/org/jacq/common/external/rest/ScientificNamesService.java index b2b2c2ef..db1599c7 100644 --- a/jacq-common/src/main/java/org/jacq/common/external/rest/ScientificNamesService.java +++ b/jacq-common/src/main/java/org/jacq/common/external/rest/ScientificNamesService.java @@ -15,11 +15,11 @@ */ package org.jacq.common.external.rest; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.names.JsonRpcRequest; import org.jacq.common.model.names.taxamatch.TaxamatchResponse; diff --git a/jacq-common/src/main/java/org/jacq/common/faces/converter/AcquisitionSourceConverter.java b/jacq-common/src/main/java/org/jacq/common/faces/converter/AcquisitionSourceConverter.java index 50719c81..b93fa404 100644 --- a/jacq-common/src/main/java/org/jacq/common/faces/converter/AcquisitionSourceConverter.java +++ b/jacq-common/src/main/java/org/jacq/common/faces/converter/AcquisitionSourceConverter.java @@ -15,10 +15,10 @@ */ package org.jacq.common.faces.converter; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.FacesConverter; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.Converter; +import jakarta.faces.convert.FacesConverter; import org.jacq.common.model.rest.AcquisitionSourceResult; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.util.ServicesUtil; diff --git a/jacq-common/src/main/java/org/jacq/common/faces/converter/CultivarConverter.java b/jacq-common/src/main/java/org/jacq/common/faces/converter/CultivarConverter.java index d9dd32b8..5f715cc7 100644 --- a/jacq-common/src/main/java/org/jacq/common/faces/converter/CultivarConverter.java +++ b/jacq-common/src/main/java/org/jacq/common/faces/converter/CultivarConverter.java @@ -15,10 +15,10 @@ */ package org.jacq.common.faces.converter; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.FacesConverter; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.Converter; +import jakarta.faces.convert.FacesConverter; import org.jacq.common.model.rest.CultivarResult; import org.jacq.common.util.ServicesUtil; diff --git a/jacq-common/src/main/java/org/jacq/common/faces/converter/LocationConverter.java b/jacq-common/src/main/java/org/jacq/common/faces/converter/LocationConverter.java index 6c7ae006..ad88f4f7 100644 --- a/jacq-common/src/main/java/org/jacq/common/faces/converter/LocationConverter.java +++ b/jacq-common/src/main/java/org/jacq/common/faces/converter/LocationConverter.java @@ -15,10 +15,10 @@ */ package org.jacq.common.faces.converter; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.FacesConverter; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.Converter; +import jakarta.faces.convert.FacesConverter; import org.jacq.common.model.rest.LocationResult; import org.jacq.common.util.ServicesUtil; diff --git a/jacq-common/src/main/java/org/jacq/common/faces/converter/OrganisationConverter.java b/jacq-common/src/main/java/org/jacq/common/faces/converter/OrganisationConverter.java index 3d0f37bc..efe2e8e4 100644 --- a/jacq-common/src/main/java/org/jacq/common/faces/converter/OrganisationConverter.java +++ b/jacq-common/src/main/java/org/jacq/common/faces/converter/OrganisationConverter.java @@ -15,10 +15,10 @@ */ package org.jacq.common.faces.converter; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.FacesConverter; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.Converter; +import jakarta.faces.convert.FacesConverter; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.util.ServicesUtil; diff --git a/jacq-common/src/main/java/org/jacq/common/faces/converter/OutputOrganisationConverter.java b/jacq-common/src/main/java/org/jacq/common/faces/converter/OutputOrganisationConverter.java index 2504242b..99d101b3 100644 --- a/jacq-common/src/main/java/org/jacq/common/faces/converter/OutputOrganisationConverter.java +++ b/jacq-common/src/main/java/org/jacq/common/faces/converter/OutputOrganisationConverter.java @@ -15,10 +15,10 @@ */ package org.jacq.common.faces.converter; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.FacesConverter; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.Converter; +import jakarta.faces.convert.FacesConverter; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.util.ServicesUtil; diff --git a/jacq-common/src/main/java/org/jacq/common/faces/converter/PersonConverter.java b/jacq-common/src/main/java/org/jacq/common/faces/converter/PersonConverter.java index 681aaa30..674a5120 100644 --- a/jacq-common/src/main/java/org/jacq/common/faces/converter/PersonConverter.java +++ b/jacq-common/src/main/java/org/jacq/common/faces/converter/PersonConverter.java @@ -15,11 +15,11 @@ */ package org.jacq.common.faces.converter; -import javax.faces.component.UIComponent; -import javax.faces.component.UIInput; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.FacesConverter; +import jakarta.faces.component.UIComponent; +import jakarta.faces.component.UIInput; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.Converter; +import jakarta.faces.convert.FacesConverter; import org.jacq.common.model.rest.PersonResult; import org.jacq.common.util.ServicesUtil; diff --git a/jacq-common/src/main/java/org/jacq/common/faces/converter/ScientificNameConverter.java b/jacq-common/src/main/java/org/jacq/common/faces/converter/ScientificNameConverter.java index 52193e87..1104df04 100644 --- a/jacq-common/src/main/java/org/jacq/common/faces/converter/ScientificNameConverter.java +++ b/jacq-common/src/main/java/org/jacq/common/faces/converter/ScientificNameConverter.java @@ -15,10 +15,10 @@ */ package org.jacq.common.faces.converter; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.FacesConverter; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.Converter; +import jakarta.faces.convert.FacesConverter; import org.jacq.common.model.rest.ScientificNameResult; import org.jacq.common.util.ServicesUtil; diff --git a/jacq-common/src/main/java/org/jacq/common/manager/BaseDerivativeManager.java b/jacq-common/src/main/java/org/jacq/common/manager/BaseDerivativeManager.java index e14b5c9b..4e8f4c8a 100644 --- a/jacq-common/src/main/java/org/jacq/common/manager/BaseDerivativeManager.java +++ b/jacq-common/src/main/java/org/jacq/common/manager/BaseDerivativeManager.java @@ -20,10 +20,10 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.persistence.Column; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.transaction.Transactional; +import jakarta.persistence.Column; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.transaction.Transactional; import org.apache.commons.lang3.StringUtils; import org.jacq.common.model.jpa.TblNomName; import org.jacq.common.model.jpa.TblOrganisation; diff --git a/jacq-common/src/main/java/org/jacq/common/manager/BaseGatheringManager.java b/jacq-common/src/main/java/org/jacq/common/manager/BaseGatheringManager.java index acccf01e..2e55fa00 100644 --- a/jacq-common/src/main/java/org/jacq/common/manager/BaseGatheringManager.java +++ b/jacq-common/src/main/java/org/jacq/common/manager/BaseGatheringManager.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.transaction.Transactional; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.transaction.Transactional; import org.jacq.common.external.model.rest.GeoNamesEntryResult; import org.jacq.common.external.model.rest.GeoNamesSearchResult; import org.jacq.common.external.rest.GeoNamesService; diff --git a/jacq-common/src/main/java/org/jacq/common/manager/BaseImageServerManager.java b/jacq-common/src/main/java/org/jacq/common/manager/BaseImageServerManager.java index 04abebe0..d9c717af 100644 --- a/jacq-common/src/main/java/org/jacq/common/manager/BaseImageServerManager.java +++ b/jacq-common/src/main/java/org/jacq/common/manager/BaseImageServerManager.java @@ -20,14 +20,14 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.transaction.Transactional; -import javax.ws.rs.core.Response; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.core.Response; import org.jacq.common.external.rest.ImageServer; import org.jacq.common.model.rest.ImageServerResource; import org.jacq.common.model.jpa.TblDerivative; diff --git a/jacq-common/src/main/java/org/jacq/common/manager/BaseOrganisationManager.java b/jacq-common/src/main/java/org/jacq/common/manager/BaseOrganisationManager.java index 9e72b72e..76f03b20 100644 --- a/jacq-common/src/main/java/org/jacq/common/manager/BaseOrganisationManager.java +++ b/jacq-common/src/main/java/org/jacq/common/manager/BaseOrganisationManager.java @@ -17,16 +17,16 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.transaction.Transactional; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.transaction.Transactional; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.model.jpa.FrmwrkUser; import org.jacq.common.model.jpa.TblOrganisation; diff --git a/jacq-common/src/main/java/org/jacq/common/manager/NameParserManager.java b/jacq-common/src/main/java/org/jacq/common/manager/NameParserManager.java index 0f412d8a..820b1412 100644 --- a/jacq-common/src/main/java/org/jacq/common/manager/NameParserManager.java +++ b/jacq-common/src/main/java/org/jacq/common/manager/NameParserManager.java @@ -15,22 +15,18 @@ */ package org.jacq.common.manager; -import java.io.BufferedInputStream; +import jakarta.inject.Named; import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintWriter; import java.io.StringReader; import java.net.Socket; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.annotation.PostConstruct; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.jacq.common.model.names.NameParserResponse; /** @@ -43,7 +39,7 @@ * * @author wkoller */ -@ManagedBean +@Named public class NameParserManager { private static final Logger LOGGER = Logger.getLogger(NameParserManager.class.getName()); diff --git a/jacq-common/src/main/java/org/jacq/common/model/dataimport/ImportRecord.java b/jacq-common/src/main/java/org/jacq/common/model/dataimport/ImportRecord.java index 586c4d61..e3622f57 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/dataimport/ImportRecord.java +++ b/jacq-common/src/main/java/org/jacq/common/model/dataimport/ImportRecord.java @@ -16,14 +16,14 @@ package org.jacq.common.model.dataimport; import java.io.Serializable; -import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; +import java.time.LocalDate; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Model for holding a single import record @@ -59,9 +59,8 @@ public class ImportRecord implements Serializable { protected String genericAnnotation; @Column(name = "gathering_number") protected String gatheringNumber; - @Temporal(TemporalType.DATE) @Column(name = "separation_date") - protected Date separationDate; + protected LocalDate separationDate; @Column(name = "separation_type") protected String separationType; @Column(name = "separation_annotation") @@ -89,7 +88,7 @@ public class ImportRecord implements Serializable { @Column(name = "price") protected Float price; @Column(name = "gathering_date") - protected Date gatheringDate; + protected LocalDate gatheringDate; @Column(name = "gathering_source") protected String gatheringSource; @Column(name = "altitude_min") @@ -107,7 +106,7 @@ public class ImportRecord implements Serializable { @Column(name = "habitat") protected String habitat; @Column(name = "acquisition_date") - protected Date acquisitionDate; + protected LocalDate acquisitionDate; @Column(name = "custom_acquisition_date") protected String customAcquisitionDate; @Column(name = "gathering_annotation") @@ -189,11 +188,11 @@ public void setGatheringNumber(String gatheringNumber) { this.gatheringNumber = gatheringNumber; } - public Date getSeparationDate() { + public LocalDate getSeparationDate() { return separationDate; } - public void setSeparationDate(Date separationDate) { + public void setSeparationDate(LocalDate separationDate) { this.separationDate = separationDate; } @@ -309,11 +308,11 @@ public void setPrice(Float price) { this.price = price; } - public Date getGatheringDate() { + public LocalDate getGatheringDate() { return gatheringDate; } - public void setGatheringDate(Date gatheringDate) { + public void setGatheringDate(LocalDate gatheringDate) { this.gatheringDate = gatheringDate; } @@ -381,11 +380,11 @@ public void setHabitat(String habitat) { this.habitat = habitat; } - public Date getAcquisitionDate() { + public LocalDate getAcquisitionDate() { return acquisitionDate; } - public void setAcquisitionDate(Date acquisitionDate) { + public void setAcquisitionDate(LocalDate acquisitionDate) { this.acquisitionDate = acquisitionDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthAssignment.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthAssignment.java index dab185b1..226a57fa 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthAssignment.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthAssignment.java @@ -16,18 +16,18 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthAssignmentPK.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthAssignmentPK.java index 3867f53c..5711578f 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthAssignmentPK.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthAssignmentPK.java @@ -16,11 +16,11 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthItem.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthItem.java index bf2423ce..8692fb88 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthItem.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkAuthItem.java @@ -17,24 +17,24 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkConfig.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkConfig.java index f3f6fb0e..9e450c80 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkConfig.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkConfig.java @@ -16,19 +16,19 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkEmploymentType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkEmploymentType.java index de1bff0d..fed5b63c 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkEmploymentType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkEmploymentType.java @@ -17,22 +17,22 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkRole.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkRole.java index ed21e2af..fcebe945 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkRole.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkRole.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkTemplate.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkTemplate.java index 1adb8f86..93440510 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkTemplate.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkTemplate.java @@ -16,17 +16,17 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkUser.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkUser.java index 579a0581..6bd2c99b 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkUser.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkUser.java @@ -16,30 +16,30 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -100,8 +100,7 @@ public class FrmwrkUser implements Serializable { @Column(name = "title_suffix") private String titleSuffix; @Column(name = "birthdate") - @Temporal(TemporalType.DATE) - private Date birthdate; + private LocalDate birthdate; @Basic(optional = false) @NotNull @Column(name = "force_password_change") @@ -220,11 +219,11 @@ public void setTitleSuffix(String titleSuffix) { this.titleSuffix = titleSuffix; } - public Date getBirthdate() { + public LocalDate getBirthdate() { return birthdate; } - public void setBirthdate(Date birthdate) { + public void setBirthdate(LocalDate birthdate) { this.birthdate = birthdate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkUserType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkUserType.java index 74082e25..1380b5a3 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkUserType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkUserType.java @@ -17,22 +17,22 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessBotanicalObject.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessBotanicalObject.java index adf2dffe..2b436c08 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessBotanicalObject.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessBotanicalObject.java @@ -16,20 +16,20 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessClassification.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessClassification.java index 6cdd662e..46516d2d 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessClassification.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessClassification.java @@ -16,20 +16,20 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessOrganisation.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessOrganisation.java index e6d6ee4b..6c31acf1 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessOrganisation.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/FrmwrkaccessOrganisation.java @@ -16,20 +16,20 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @@ -41,7 +41,9 @@ @NamedQueries({ @NamedQuery(name = "FrmwrkaccessOrganisation.findAll", query = "SELECT f FROM FrmwrkaccessOrganisation f") , @NamedQuery(name = "FrmwrkaccessOrganisation.findById", query = "SELECT f FROM FrmwrkaccessOrganisation f WHERE f.id = :id") - , @NamedQuery(name = "FrmwrkaccessOrganisation.findByAllowDeny", query = "SELECT f FROM FrmwrkaccessOrganisation f WHERE f.allowDeny = :allowDeny")}) + , @NamedQuery(name = "FrmwrkaccessOrganisation.findByAllowDeny", query = "SELECT f FROM FrmwrkaccessOrganisation f WHERE f.allowDeny = :allowDeny") + , @NamedQuery(name = "FrmwrkaccessOrganisation.findByUserAndOrganisation", query = "SELECT f FROM FrmwrkaccessOrganisation f WHERE f.userId = :userId AND f.organisationId = :organisationId") + , @NamedQuery(name = "FrmwrkaccessOrganisation.findByOrganisationIdandUserId", query = "SELECT f FROM FrmwrkaccessOrganisation f WHERE f.organisationId = :organisationId and f.userId = :userId")}) public class FrmwrkaccessOrganisation implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/RevClassification.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/RevClassification.java index 87d11bc3..b0543ba8 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/RevClassification.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/RevClassification.java @@ -16,25 +16,26 @@ package org.jacq.common.model.jpa; import java.io.Serializable; +import java.time.LocalDate; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @@ -58,7 +59,10 @@ , @NamedQuery(name = "RevClassification.findByTimestamp", query = "SELECT r FROM RevClassification r WHERE r.timestamp = :timestamp") , @NamedQuery(name = "RevClassification.findByParentScientificNameId", query = "SELECT r FROM RevClassification r WHERE r.parentScientificNameId = :parentScientificNameId") , @NamedQuery(name = "RevClassification.findByNumber", query = "SELECT r FROM RevClassification r WHERE r.number = :number") - , @NamedQuery(name = "RevClassification.findByOrder", query = "SELECT r FROM RevClassification r WHERE r.order = :order")}) + , @NamedQuery(name = "RevClassification.findByOrder", query = "SELECT r FROM RevClassification r WHERE r.order = :order") + , @NamedQuery(name = "RevClassification.findByUuidMinterIdAndParent", query = "SELECT r FROM RevClassification r WHERE r.uuidMinterId = :uuidMinterId AND r.accScientificNameId = :accScientificNameId ORDER BY r.order ASC, r.scientificName ASC") + , @NamedQuery(name = "RevClassification.findByUuidMinterIdAndTopLevel", query = "SELECT r FROM RevClassification r WHERE r.uuidMinterId = :uuidMinterId AND r.accScientificNameId IS NULL ORDER BY r.order ASC, r.scientificName ASC") + , @NamedQuery(name = "RevClassification.findByUuidMinterIdAndTopLevelAndProvinceId", query = "SELECT r FROM RevClassification r WHERE r.uuidMinterId = :uuidMinterId AND r.accScientificNameId IS NULL AND r.provinceIds LIKE :provinceId ORDER BY r.order ASC, r.scientificName ASC")}) public class RevClassification implements Serializable { private static final long serialVersionUID = 1L; @@ -78,8 +82,7 @@ public class RevClassification implements Serializable { @Column(name = "acc_scientific_name_id") private Long accScientificNameId; @Column(name = "ref_date") - @Temporal(TemporalType.DATE) - private Date refDate; + private LocalDate refDate; @Basic(optional = false) @NotNull @Column(name = "preferred_taxonomy") @@ -185,11 +188,11 @@ public void setAccScientificNameId(Long accScientificNameId) { this.accScientificNameId = accScientificNameId; } - public Date getRefDate() { + public LocalDate getRefDate() { return refDate; } - public void setRefDate(Date refDate) { + public void setRefDate(LocalDate refDate) { this.refDate = refDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/RevFlora.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/RevFlora.java index 2142f601..e1364e14 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/RevFlora.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/RevFlora.java @@ -16,19 +16,19 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/ScientificName.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/ScientificName.java new file mode 100644 index 00000000..633728ff --- /dev/null +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/ScientificName.java @@ -0,0 +1,19 @@ +package org.jacq.common.model.jpa; + +public class ScientificName { + private final Long nameId; + private final String scientificName; + + public ScientificName(Long nameId, String scientificName) { + this.nameId = nameId; + this.scientificName = scientificName; + } + + public Long getNameId() { + return nameId; + } + + public String getScientificName() { + return scientificName; + } +} diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/SrvcUuidMinter.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/SrvcUuidMinter.java index 28a5e9ab..c758cbde 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/SrvcUuidMinter.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/SrvcUuidMinter.java @@ -17,23 +17,23 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/SrvcUuidMinterType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/SrvcUuidMinterType.java index d0bfa8ea..28c51362 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/SrvcUuidMinterType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/SrvcUuidMinterType.java @@ -18,22 +18,22 @@ import java.io.Serializable; import java.util.Date; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAccessionNumber.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAccessionNumber.java index e91f404a..2adb44df 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAccessionNumber.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAccessionNumber.java @@ -16,18 +16,18 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionDate.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionDate.java index c7003280..91d860b3 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionDate.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionDate.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionEvent.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionEvent.java index c33d7af7..90f39f90 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionEvent.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionEvent.java @@ -17,26 +17,26 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionEventSource.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionEventSource.java index 70f772c6..231f3ec6 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionEventSource.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionEventSource.java @@ -16,22 +16,20 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.xml.bind.annotation.XmlRootElement; +import java.time.LocalDate; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @@ -53,8 +51,7 @@ public class TblAcquisitionEventSource implements Serializable { @Column(name = "acquisition_event_source_id") private Long acquisitionEventSourceId; @Column(name = "source_date") - @Temporal(TemporalType.DATE) - private Date sourceDate; + private LocalDate sourceDate; @JoinColumn(name = "acquisition_event_id", referencedColumnName = "id") @ManyToOne(optional = false, fetch = FetchType.LAZY) private TblAcquisitionEvent acquisitionEventId; @@ -77,11 +74,11 @@ public void setAcquisitionEventSourceId(Long acquisitionEventSourceId) { this.acquisitionEventSourceId = acquisitionEventSourceId; } - public Date getSourceDate() { + public LocalDate getSourceDate() { return sourceDate; } - public void setSourceDate(Date sourceDate) { + public void setSourceDate(LocalDate sourceDate) { this.sourceDate = sourceDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionSource.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionSource.java index 4b89b0fc..c86fd92d 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionSource.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionSource.java @@ -17,22 +17,22 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -44,7 +44,8 @@ @NamedQueries({ @NamedQuery(name = "TblAcquisitionSource.findAll", query = "SELECT t FROM TblAcquisitionSource t") , @NamedQuery(name = "TblAcquisitionSource.findByAcquisitionSourceId", query = "SELECT t FROM TblAcquisitionSource t WHERE t.acquisitionSourceId = :acquisitionSourceId") - , @NamedQuery(name = "TblAcquisitionSource.findByName", query = "SELECT t FROM TblAcquisitionSource t WHERE t.name = :name")}) + , @NamedQuery(name = "TblAcquisitionSource.findByName", query = "SELECT t FROM TblAcquisitionSource t WHERE t.name = :name") + , @NamedQuery(name = "TblAcquisitionSource.findLikeName", query = "SELECT t FROM TblAcquisitionSource t WHERE t.name LIKE :name")}) public class TblAcquisitionSource implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionType.java index 5c8d51a6..e2993fe0 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAcquisitionType.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAlternativeAccessionNumber.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAlternativeAccessionNumber.java index 8a65fac3..db0e6fcc 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAlternativeAccessionNumber.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblAlternativeAccessionNumber.java @@ -16,21 +16,21 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblBotanicalObject.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblBotanicalObject.java index 043e8098..928ab0e5 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblBotanicalObject.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblBotanicalObject.java @@ -16,32 +16,33 @@ package org.jacq.common.model.jpa; import java.io.Serializable; +import java.time.LocalDate; import java.util.Date; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -74,8 +75,7 @@ public class TblBotanicalObject implements Serializable { @Column(name = "scientific_name_id") private long scientificNameId; @Column(name = "determination_date") - @Temporal(TemporalType.DATE) - private Date determinationDate; + private LocalDate determinationDate; @Lob @Size(max = 65535) @Column(name = "habitat") @@ -169,11 +169,11 @@ public void setScientificNameId(long scientificNameId) { this.scientificNameId = scientificNameId; } - public Date getDeterminationDate() { + public LocalDate getDeterminationDate() { return determinationDate; } - public void setDeterminationDate(Date determinationDate) { + public void setDeterminationDate(LocalDate determinationDate) { this.determinationDate = determinationDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblBotanicalObjectSex.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblBotanicalObjectSex.java index b00900c0..cd586ec1 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblBotanicalObjectSex.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblBotanicalObjectSex.java @@ -16,19 +16,19 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCertificate.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCertificate.java index c6a3ae8a..dddd7255 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCertificate.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCertificate.java @@ -16,21 +16,21 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCertificateType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCertificateType.java index 90557488..81e7d2a4 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCertificateType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCertificateType.java @@ -17,22 +17,22 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblClassification.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblClassification.java index df447b90..d3efe948 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblClassification.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblClassification.java @@ -16,22 +16,23 @@ package org.jacq.common.model.jpa; import java.io.Serializable; +import java.time.LocalDate; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @@ -54,7 +55,11 @@ , @NamedQuery(name = "TblClassification.findByTimestamp", query = "SELECT t FROM TblClassification t WHERE t.timestamp = :timestamp") , @NamedQuery(name = "TblClassification.findByParentScientificNameId", query = "SELECT t FROM TblClassification t WHERE t.parentScientificNameId = :parentScientificNameId") , @NamedQuery(name = "TblClassification.findByNumber", query = "SELECT t FROM TblClassification t WHERE t.number = :number") - , @NamedQuery(name = "TblClassification.findByOrder", query = "SELECT t FROM TblClassification t WHERE t.order = :order")}) + , @NamedQuery(name = "TblClassification.findByOrder", query = "SELECT t FROM TblClassification t WHERE t.order = :order") + , @NamedQuery(name = "TblClassification.findBySourceAndAcceptedAndScientificNameId", query = "SELECT t FROM TblClassification t WHERE t.source = :source AND t.sourceId = :sourceId AND t.scientificNameId = :scientificNameId") + , @NamedQuery(name = "TblClassification.findTopLevelBySource", query = "SELECT t FROM TblClassification t WHERE t.source = :source AND t.sourceId = :sourceId AND t.parentScientificNameId IS NULL") + , @NamedQuery(name = "TblClassification.findBySourceAndParent", query = "SELECT t FROM TblClassification t WHERE t.source = :source AND t.sourceId = :sourceId AND t.parentScientificNameId = :parentScientificNameId") + , @NamedQuery(name = "TblClassification.findAllAvailable", query = "SELECT t FROM TblClassification t WHERE t.parentScientificNameId IS NULL GROUP BY t.source, t.sourceId")}) public class TblClassification implements Serializable { private static final long serialVersionUID = 1L; @@ -70,8 +75,7 @@ public class TblClassification implements Serializable { @Column(name = "acc_scientific_name_id") private Long accScientificNameId; @Column(name = "ref_date") - @Temporal(TemporalType.DATE) - private Date refDate; + private LocalDate refDate; @Basic(optional = false) @NotNull @Column(name = "preferred_taxonomy") @@ -133,11 +137,11 @@ public void setAccScientificNameId(Long accScientificNameId) { this.accScientificNameId = accScientificNameId; } - public Date getRefDate() { + public LocalDate getRefDate() { return refDate; } - public void setRefDate(Date refDate) { + public void setRefDate(LocalDate refDate) { this.refDate = refDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblClassificationChorolStatus.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblClassificationChorolStatus.java index 46fbe5e6..620501a7 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblClassificationChorolStatus.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblClassificationChorolStatus.java @@ -17,24 +17,24 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /* * Custom imports */ -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCultivar.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCultivar.java index 59cc3af3..ddbb7b74 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCultivar.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblCultivar.java @@ -17,23 +17,23 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -45,7 +45,8 @@ @NamedQueries({ @NamedQuery(name = "TblCultivar.findAll", query = "SELECT t FROM TblCultivar t") , @NamedQuery(name = "TblCultivar.findByCultivarId", query = "SELECT t FROM TblCultivar t WHERE t.cultivarId = :cultivarId") - , @NamedQuery(name = "TblCultivar.findByCultivar", query = "SELECT t FROM TblCultivar t WHERE t.cultivar = :cultivar")}) + , @NamedQuery(name = "TblCultivar.findByCultivar", query = "SELECT t FROM TblCultivar t WHERE t.cultivar = :cultivar") + , @NamedQuery(name = "TblCultivar.findByScientificNameId", query = "SELECT t FROM TblCultivar t INNER JOIN t.scientificNameId s WHERE s.scientificNameId = :scientificNameId")}) public class TblCultivar implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDerivative.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDerivative.java index bc5f6664..ca2b8194 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDerivative.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDerivative.java @@ -17,24 +17,24 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -47,7 +47,10 @@ @NamedQuery(name = "TblDerivative.findAll", query = "SELECT t FROM TblDerivative t") , @NamedQuery(name = "TblDerivative.findByDerivativeId", query = "SELECT t FROM TblDerivative t WHERE t.derivativeId = :derivativeId") , @NamedQuery(name = "TblDerivative.findByCount", query = "SELECT t FROM TblDerivative t WHERE t.count = :count") - , @NamedQuery(name = "TblDerivative.findByPrice", query = "SELECT t FROM TblDerivative t WHERE t.price = :price")}) + , @NamedQuery(name = "TblDerivative.findByPrice", query = "SELECT t FROM TblDerivative t WHERE t.price = :price") + , @NamedQuery(name = "TblDerivative.findByOrganisationListAndIndexSeminum", query = "SELECT d FROM TblDerivative d INNER JOIN d.tblLivingPlant l WHERE l.indexSeminum = true and d.organisationId in :organisationList") + , @NamedQuery(name = "TblDerivative.findByLivingPlantList", query = "SELECT d FROM TblDerivative d INNER JOIN d.tblLivingPlant l WHERE l.id in :tblLivingPlantList") + , @NamedQuery(name = "TblDerivative.findByNotInTblLivingPlantListAndOrangisation", query = "SELECT d FROM TblDerivative d INNER JOIN d.tblLivingPlant l WHERE l.id not in (:tblLivingPlantList) and d.organisationId = (:organisationId)")}) public class TblDerivative implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDerivativeType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDerivativeType.java index 18dfc5a6..fe0f1a65 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDerivativeType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDerivativeType.java @@ -17,22 +17,22 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDiaspora.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDiaspora.java index 81b80cef..77db6d0b 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDiaspora.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDiaspora.java @@ -16,20 +16,20 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDiasporaBank.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDiasporaBank.java index 36bacc9a..9120485c 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDiasporaBank.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblDiasporaBank.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblGeoNation.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblGeoNation.java index 554d59c0..8524c114 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblGeoNation.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblGeoNation.java @@ -16,16 +16,16 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblGeoProvince.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblGeoProvince.java index 7e7acb73..bb0a189a 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblGeoProvince.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblGeoProvince.java @@ -16,16 +16,16 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblHabitusType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblHabitusType.java index 0a0a6631..4bab532e 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblHabitusType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblHabitusType.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIdentStatus.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIdentStatus.java index 74ae81c0..3856d6b1 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIdentStatus.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIdentStatus.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImageServer.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImageServer.java index 39776d56..afc232d4 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImageServer.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImageServer.java @@ -17,22 +17,22 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImportError.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImportError.java index ea440a7f..07fb3e45 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImportError.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImportError.java @@ -16,19 +16,19 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImportProperties.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImportProperties.java index aec063e5..3957c6a7 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImportProperties.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblImportProperties.java @@ -16,21 +16,21 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @@ -45,7 +45,9 @@ , @NamedQuery(name = "TblImportProperties.findByIDPflanze", query = "SELECT t FROM TblImportProperties t WHERE t.iDPflanze = :iDPflanze") , @NamedQuery(name = "TblImportProperties.findBySpeciesName", query = "SELECT t FROM TblImportProperties t WHERE t.speciesName = :speciesName") , @NamedQuery(name = "TblImportProperties.findBySourceName", query = "SELECT t FROM TblImportProperties t WHERE t.sourceName = :sourceName") - , @NamedQuery(name = "TblImportProperties.findByOriginalBotanicalObjectId", query = "SELECT t FROM TblImportProperties t WHERE t.originalBotanicalObjectId = :originalBotanicalObjectId")}) + , @NamedQuery(name = "TblImportProperties.findByOriginalBotanicalObjectId", query = "SELECT t FROM TblImportProperties t WHERE t.originalBotanicalObjectId = :originalBotanicalObjectId") + , @NamedQuery(name = "TblImportProperties.findByOriginalBotanicalObjectIdAndSourceName", query = "SELECT t FROM TblImportProperties t WHERE t.originalBotanicalObjectId = :originalBotanicalObjectId AND t.sourceName = :sourceName") + , @NamedQuery(name = "TblCultivar.findByCultivarAndScientificNameId", query = "SELECT t FROM TblCultivar t INNER JOIN t.scientificNameId sni WHERE t.cultivar = :cultivar AND sni.scientificNameId = :scientificNameId")}) public class TblImportProperties implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumContent.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumContent.java index e91d52a9..a4b53e77 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumContent.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumContent.java @@ -18,27 +18,27 @@ import java.io.Serializable; import java.util.Date; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -58,7 +58,8 @@ @NamedQuery(name = "TblIndexSeminumContent.findByLatitude", query = "SELECT t FROM TblIndexSeminumContent t WHERE t.latitude = :latitude"), @NamedQuery(name = "TblIndexSeminumContent.findByLongitude", query = "SELECT t FROM TblIndexSeminumContent t WHERE t.longitude = :longitude"), @NamedQuery(name = "TblIndexSeminumContent.findByAcquisitionDate", query = "SELECT t FROM TblIndexSeminumContent t WHERE t.acquisitionDate = :acquisitionDate"), - @NamedQuery(name = "TblIndexSeminumContent.findByTimestamp", query = "SELECT t FROM TblIndexSeminumContent t WHERE t.timestamp = :timestamp")}) + @NamedQuery(name = "TblIndexSeminumContent.findByTimestamp", query = "SELECT t FROM TblIndexSeminumContent t WHERE t.timestamp = :timestamp"), + @NamedQuery(name = "TblIndexSeminumContent.findByIndexSeminumRevisionId", query = "SELECT t FROM TblIndexSeminumContent t WHERE t.indexSeminumRevisionId = :indexSeminumRevisionId")}) public class TblIndexSeminumContent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumPerson.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumPerson.java index a0c89990..b058b920 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumPerson.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumPerson.java @@ -17,23 +17,23 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumRevision.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumRevision.java index 2b46450f..f4ccbc5d 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumRevision.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumRevision.java @@ -18,26 +18,26 @@ import java.io.Serializable; import java.util.Date; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -50,7 +50,8 @@ @NamedQuery(name = "TblIndexSeminumRevision.findAll", query = "SELECT t FROM TblIndexSeminumRevision t") , @NamedQuery(name = "TblIndexSeminumRevision.findByIndexSeminumRevisionId", query = "SELECT t FROM TblIndexSeminumRevision t WHERE t.indexSeminumRevisionId = :indexSeminumRevisionId") , @NamedQuery(name = "TblIndexSeminumRevision.findByName", query = "SELECT t FROM TblIndexSeminumRevision t WHERE t.name = :name") - , @NamedQuery(name = "TblIndexSeminumRevision.findByTimestamp", query = "SELECT t FROM TblIndexSeminumRevision t WHERE t.timestamp = :timestamp")}) + , @NamedQuery(name = "TblIndexSeminumRevision.findByTimestamp", query = "SELECT t FROM TblIndexSeminumRevision t WHERE t.timestamp = :timestamp") + , @NamedQuery(name = "TblIndexSeminumRevision.findByUserId", query = "SELECT t FROM TblIndexSeminumRevision t WHERE t.userId = :userId")}) public class TblIndexSeminumRevision implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumType.java index a6bbcf45..d4fc216d 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblIndexSeminumType.java @@ -17,22 +17,22 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventory.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventory.java index cd48e5ae..0ee3f1b7 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventory.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventory.java @@ -18,24 +18,24 @@ import java.io.Serializable; import java.util.Date; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventoryObject.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventoryObject.java index c4ee37f5..462afefe 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventoryObject.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventoryObject.java @@ -17,24 +17,24 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventoryType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventoryType.java index 9366930b..c3205546 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventoryType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblInventoryType.java @@ -18,24 +18,24 @@ import java.io.Serializable; import java.util.Date; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLabelType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLabelType.java index 055115e7..da7a198d 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLabelType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLabelType.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLivingPlant.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLivingPlant.java index ae6e507b..bd871c78 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLivingPlant.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLivingPlant.java @@ -16,30 +16,30 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -64,7 +64,9 @@ , @NamedQuery(name = "TblLivingPlant.findByReviewed", query = "SELECT t FROM TblLivingPlant t WHERE t.reviewed = :reviewed") , @NamedQuery(name = "TblLivingPlant.findByHasImage", query = "SELECT t FROM TblLivingPlant t WHERE t.hasImage = :hasImage") , @NamedQuery(name = "TblLivingPlant.findByHasPublicImage", query = "SELECT t FROM TblLivingPlant t WHERE t.hasPublicImage = :hasPublicImage") - , @NamedQuery(name = "TblLivingPlant.findBySeminumCount", query = "SELECT t FROM TblLivingPlant t WHERE t.seminumCount = :seminumCount")}) + , @NamedQuery(name = "TblLivingPlant.findBySeminumCount", query = "SELECT t FROM TblLivingPlant t WHERE t.seminumCount = :seminumCount") + , @NamedQuery(name = "TblLivingPlant.resetImageStatus", query = "UPDATE TblLivingPlant t SET t.hasImage = FALSE, t.hasPublicImage = FALSE WHERE t.tblDerivative IN ( SELECT td FROM TblDerivative td WHERE td.organisationId IN (:organisations) )") + , @NamedQuery(name = "TblLivingPlant.findByAccessionNumberList", query = "SELECT t FROM TblLivingPlant t WHERE t.accessionNumber in (:accessionNumberList)")}) public class TblLivingPlant implements Serializable { private static final long serialVersionUID = 1L; @@ -105,8 +107,7 @@ public class TblLivingPlant implements Serializable { @Column(name = "culture_notes") private String cultureNotes; @Column(name = "cultivation_date") - @Temporal(TemporalType.DATE) - private Date cultivationDate; + private LocalDate cultivationDate; @Column(name = "label_synonym_scientific_name_id") private Long labelSynonymScientificNameId; @Lob @@ -252,11 +253,11 @@ public void setCultureNotes(String cultureNotes) { this.cultureNotes = cultureNotes; } - public Date getCultivationDate() { + public LocalDate getCultivationDate() { return cultivationDate; } - public void setCultivationDate(Date cultivationDate) { + public void setCultivationDate(LocalDate cultivationDate) { this.cultivationDate = cultivationDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLivingPlantTreeRecordFilePage.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLivingPlantTreeRecordFilePage.java index dcc97001..67a515f0 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLivingPlantTreeRecordFilePage.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLivingPlantTreeRecordFilePage.java @@ -16,23 +16,23 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlRootElement; +import java.time.LocalDate; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @@ -59,8 +59,7 @@ public class TblLivingPlantTreeRecordFilePage implements Serializable { @Column(name = "corrections_done") private boolean correctionsDone; @Column(name = "corrections_date") - @Temporal(TemporalType.DATE) - private Date correctionsDate; + private LocalDate correctionsDate; @JoinColumn(name = "living_plant_id", referencedColumnName = "id") @ManyToOne(optional = false, fetch = FetchType.LAZY) private TblLivingPlant livingPlantId; @@ -96,11 +95,11 @@ public void setCorrectionsDone(boolean correctionsDone) { this.correctionsDone = correctionsDone; } - public Date getCorrectionsDate() { + public LocalDate getCorrectionsDate() { return correctionsDate; } - public void setCorrectionsDate(Date correctionsDate) { + public void setCorrectionsDate(LocalDate correctionsDate) { this.correctionsDate = correctionsDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocation.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocation.java index 9df82b0c..f650aa9a 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocation.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocation.java @@ -17,24 +17,24 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -45,7 +45,8 @@ @XmlRootElement @NamedQueries({ @NamedQuery(name = "TblLocation.findAll", query = "SELECT t FROM TblLocation t") - , @NamedQuery(name = "TblLocation.findById", query = "SELECT t FROM TblLocation t WHERE t.id = :id")}) + , @NamedQuery(name = "TblLocation.findById", query = "SELECT t FROM TblLocation t WHERE t.id = :id") + , @NamedQuery(name = "TblLocation.findByLocation", query = "SELECT t FROM TblLocation t WHERE t.location = :location")}) public class TblLocation implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocationCoordinates.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocationCoordinates.java index 6838383c..431bf29b 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocationCoordinates.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocationCoordinates.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocationGeonames.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocationGeonames.java index a7c66ed7..ae1f56fa 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocationGeonames.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblLocationGeonames.java @@ -16,20 +16,20 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomEpithet.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomEpithet.java index db925f5d..b70989d1 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomEpithet.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomEpithet.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -43,7 +43,8 @@ @NamedQueries({ @NamedQuery(name = "TblNomEpithet.findAll", query = "SELECT t FROM TblNomEpithet t") , @NamedQuery(name = "TblNomEpithet.findByEpithetId", query = "SELECT t FROM TblNomEpithet t WHERE t.epithetId = :epithetId") - , @NamedQuery(name = "TblNomEpithet.findByEpithet", query = "SELECT t FROM TblNomEpithet t WHERE t.epithet = :epithet")}) + , @NamedQuery(name = "TblNomEpithet.findByEpithet", query = "SELECT t FROM TblNomEpithet t WHERE t.epithet = :epithet") + , @NamedQuery(name = "TblNomEpithet.findLikeEpithet", query = "SELECT t FROM TblNomEpithet t WHERE t.epithet LIKE :epithet")}) public class TblNomEpithet implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomName.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomName.java index 8610c3cb..c57ff70a 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomName.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomName.java @@ -17,24 +17,24 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -45,7 +45,12 @@ @XmlRootElement @NamedQueries({ @NamedQuery(name = "TblNomName.findAll", query = "SELECT t FROM TblNomName t") - , @NamedQuery(name = "TblNomName.findByNameId", query = "SELECT t FROM TblNomName t WHERE t.nameId = :nameId")}) + , @NamedQuery(name = "TblNomName.findByNameId", query = "SELECT t FROM TblNomName t WHERE t.nameId = :nameId") + , @NamedQuery(name = "TblNomName.findBySubstantive", query = "SELECT t FROM TblNomName t WHERE t.substantiveId IN (:substantiveIds) AND t.firstEpithetId IS NULL AND t.secondEpithetId IS NULL") + , @NamedQuery(name = "TblNomName.findBySubstantiveAndFirstEpithet", query = "SELECT t FROM TblNomName t WHERE t.substantiveId IN (:substantiveIds) AND t.firstEpithetId IN (:firstEpithetIds) AND t.secondEpithetId IS NULL") + , @NamedQuery(name = "TblNomName.findBySubstantiveAndFirstEpithetAndSecondEpithet", query = "SELECT t FROM TblNomName t WHERE t.substantiveId IN (:substantiveIds) AND t.firstEpithetId IN (:firstEpithetIds) AND t.secondEpithetId IN (:secondEpithetIds)") + , @NamedQuery(name = "TblNomName.findBySubstantiveAndRank", query = "SELECT t FROM TblNomName t INNER JOIN t.substantiveId s INNER JOIN t.rankId r WHERE s.substantiveId = :substantiveId AND r.rankId = :rankId") + , @NamedQuery(name = "TblNomName.findNameIdAndScientificName", query = "SELECT new org.jacq.common.model.jpa.ScientificName(t.nameId, v.scientificName) FROM TblNomName t JOIN t.viewScientificName v WHERE t.nameId = :scientificNameId")}) public class TblNomName implements Serializable { private static final long serialVersionUID = 1L; @@ -69,10 +74,10 @@ public class TblNomName implements Serializable { @ManyToMany private List tblPersonList; @JoinColumn(name = "first_epithet_id", referencedColumnName = "epithet_id") - @ManyToOne(optional = false) + @ManyToOne() private TblNomEpithet firstEpithetId; @JoinColumn(name = "second_epithet_id", referencedColumnName = "epithet_id") - @ManyToOne(optional = false) + @ManyToOne() private TblNomEpithet secondEpithetId; @JoinColumn(name = "substantive_id", referencedColumnName = "substantive_id") @ManyToOne(optional = false) diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomRank.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomRank.java index c1eacd86..8ebae79b 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomRank.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomRank.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomStatus.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomStatus.java index b9ac6c1e..ebbdda04 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomStatus.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomStatus.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomSubstantive.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomSubstantive.java index 4b75fd11..2176859e 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomSubstantive.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblNomSubstantive.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -43,7 +43,8 @@ @NamedQueries({ @NamedQuery(name = "TblNomSubstantive.findAll", query = "SELECT t FROM TblNomSubstantive t") , @NamedQuery(name = "TblNomSubstantive.findBySubstantiveId", query = "SELECT t FROM TblNomSubstantive t WHERE t.substantiveId = :substantiveId") - , @NamedQuery(name = "TblNomSubstantive.findBySubstantive", query = "SELECT t FROM TblNomSubstantive t WHERE t.substantive = :substantive")}) + , @NamedQuery(name = "TblNomSubstantive.findBySubstantive", query = "SELECT t FROM TblNomSubstantive t WHERE t.substantive = :substantive") + , @NamedQuery(name = "TblNomSubstantive.findLikeSubstantive", query = "SELECT t FROM TblNomSubstantive t WHERE t.substantive LIKE :substantive")}) public class TblNomSubstantive implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblOrganisation.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblOrganisation.java index 63fe4218..08e7d222 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblOrganisation.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblOrganisation.java @@ -17,25 +17,25 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblPerson.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblPerson.java index 70b67477..44380660 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblPerson.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblPerson.java @@ -17,22 +17,22 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -44,7 +44,8 @@ @NamedQueries({ @NamedQuery(name = "TblPerson.findAll", query = "SELECT t FROM TblPerson t") , @NamedQuery(name = "TblPerson.findById", query = "SELECT t FROM TblPerson t WHERE t.id = :id") - , @NamedQuery(name = "TblPerson.findByName", query = "SELECT t FROM TblPerson t WHERE t.name = :name")}) + , @NamedQuery(name = "TblPerson.findByName", query = "SELECT t FROM TblPerson t WHERE t.name = :name") + , @NamedQuery(name = "TblPerson.findByLikeName", query = "SELECT t FROM TblPerson t WHERE t.name like :name")}) public class TblPerson implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblPhenology.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblPhenology.java index 8a8a67e5..f93b8ddd 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblPhenology.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblPhenology.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblRelevancyType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblRelevancyType.java index 25929692..9ca5b9c9 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblRelevancyType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblRelevancyType.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblScientificNameInformation.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblScientificNameInformation.java index 54f396f8..4f1c2c36 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblScientificNameInformation.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblScientificNameInformation.java @@ -17,23 +17,23 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeed.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeed.java index a7e7756c..e96454e4 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeed.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeed.java @@ -16,19 +16,19 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeedOrder.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeedOrder.java index 29b20608..d7cbeae8 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeedOrder.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeedOrder.java @@ -16,31 +16,31 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @@ -53,7 +53,8 @@ @NamedQuery(name = "TblSeedOrder.findAll", query = "SELECT t FROM TblSeedOrder t") , @NamedQuery(name = "TblSeedOrder.findBySeedOrderId", query = "SELECT t FROM TblSeedOrder t WHERE t.seedOrderId = :seedOrderId") , @NamedQuery(name = "TblSeedOrder.findByOrderDate", query = "SELECT t FROM TblSeedOrder t WHERE t.orderDate = :orderDate") - , @NamedQuery(name = "TblSeedOrder.findByComplete", query = "SELECT t FROM TblSeedOrder t WHERE t.complete = :complete")}) + , @NamedQuery(name = "TblSeedOrder.findByComplete", query = "SELECT t FROM TblSeedOrder t WHERE t.complete = :complete") + , @NamedQuery(name = "TblSeedOrder.findBySenderUserId", query = "SELECT t FROM TblSeedOrder t WHERE t.senderUserId = :senderUserId")}) public class TblSeedOrder implements Serializable { private static final long serialVersionUID = 1L; @@ -65,8 +66,7 @@ public class TblSeedOrder implements Serializable { @Basic(optional = false) @NotNull @Column(name = "order_date") - @Temporal(TemporalType.DATE) - private Date orderDate; + private LocalDate orderDate; @Lob @Size(max = 65535) @Column(name = "annotation") @@ -94,7 +94,7 @@ public TblSeedOrder(Long seedOrderId) { this.seedOrderId = seedOrderId; } - public TblSeedOrder(Long seedOrderId, Date orderDate, boolean complete) { + public TblSeedOrder(Long seedOrderId, LocalDate orderDate, boolean complete) { this.seedOrderId = seedOrderId; this.orderDate = orderDate; this.complete = complete; @@ -108,11 +108,11 @@ public void setSeedOrderId(Long seedOrderId) { this.seedOrderId = seedOrderId; } - public Date getOrderDate() { + public LocalDate getOrderDate() { return orderDate; } - public void setOrderDate(Date orderDate) { + public void setOrderDate(LocalDate orderDate) { this.orderDate = orderDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeedOrderDerivative.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeedOrderDerivative.java index baa7d357..83517108 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeedOrderDerivative.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeedOrderDerivative.java @@ -16,19 +16,19 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeparation.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeparation.java index 305a4201..c9457919 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeparation.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeparation.java @@ -16,24 +16,24 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import java.time.LocalDate; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @@ -55,8 +55,7 @@ public class TblSeparation implements Serializable { @Column(name = "separation_id") private Long separationId; @Column(name = "date") - @Temporal(TemporalType.DATE) - private Date date; + private LocalDate date; @Lob @Size(max = 65535) @Column(name = "annotation") @@ -83,11 +82,11 @@ public void setSeparationId(Long separationId) { this.separationId = separationId; } - public Date getDate() { + public LocalDate getDate() { return date; } - public void setDate(Date date) { + public void setDate(LocalDate date) { this.date = date; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeparationType.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeparationType.java index a8d13470..cbc2428e 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeparationType.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSeparationType.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSequence.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSequence.java index c7007771..57b8e494 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSequence.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSequence.java @@ -16,16 +16,16 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSex.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSex.java index 3cb1762c..46a502ff 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSex.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSex.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSpecimen.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSpecimen.java index 719ef0f8..e310c783 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSpecimen.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSpecimen.java @@ -16,21 +16,21 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @@ -42,7 +42,8 @@ @NamedQueries({ @NamedQuery(name = "TblSpecimen.findAll", query = "SELECT t FROM TblSpecimen t") , @NamedQuery(name = "TblSpecimen.findBySpecimenId", query = "SELECT t FROM TblSpecimen t WHERE t.specimenId = :specimenId") - , @NamedQuery(name = "TblSpecimen.findByHerbarNumber", query = "SELECT t FROM TblSpecimen t WHERE t.herbarNumber = :herbarNumber")}) + , @NamedQuery(name = "TblSpecimen.findByHerbarNumber", query = "SELECT t FROM TblSpecimen t WHERE t.herbarNumber = :herbarNumber") + , @NamedQuery(name = "TblSpecimen.findByBotanicalObjectId", query = "SELECT t FROM TblSpecimen t WHERE t.specimenId in (SELECT td.derivativeId FROM TblDerivative td WHERE td.botanicalObjectId = (:botanicalObjectId))")}) public class TblSpecimen implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSpecimenOld.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSpecimenOld.java index f2c41d1a..073fee1c 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSpecimenOld.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblSpecimenOld.java @@ -17,23 +17,23 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblTreeRecordFile.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblTreeRecordFile.java index 2c7666e5..a555ccb4 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblTreeRecordFile.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblTreeRecordFile.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblTreeRecordFilePage.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblTreeRecordFilePage.java index 7d589232..d28a1ebe 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblTreeRecordFilePage.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblTreeRecordFilePage.java @@ -17,25 +17,25 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblUserClassificationSource.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblUserClassificationSource.java index 5022f2bb..bfd1d44c 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblUserClassificationSource.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblUserClassificationSource.java @@ -16,21 +16,21 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblVegetative.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblVegetative.java index 2f0be1b1..38d6f144 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/TblVegetative.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/TblVegetative.java @@ -16,24 +16,24 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import java.time.LocalDate; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @@ -49,7 +49,8 @@ , @NamedQuery(name = "TblVegetative.findByCultivationDate", query = "SELECT t FROM TblVegetative t WHERE t.cultivationDate = :cultivationDate") , @NamedQuery(name = "TblVegetative.findByIndexSeminum", query = "SELECT t FROM TblVegetative t WHERE t.indexSeminum = :indexSeminum") , @NamedQuery(name = "TblVegetative.findByPlaceNumber", query = "SELECT t FROM TblVegetative t WHERE t.placeNumber = :placeNumber") - , @NamedQuery(name = "TblVegetative.findBySeparated", query = "SELECT t FROM TblVegetative t WHERE t.separated = :separated")}) + , @NamedQuery(name = "TblVegetative.findBySeparated", query = "SELECT t FROM TblVegetative t WHERE t.separated = :separated") + , @NamedQuery(name = "TblVegetative.findByBotanicalObjectId", query = "SELECT v FROM TblVegetative v WHERE v.vegetativeId IN (SELECT td.derivativeId FROM TblDerivative td WHERE td.botanicalObjectId = :botanicalObjectId)")}) public class TblVegetative implements Serializable { private static final long serialVersionUID = 1L; @@ -63,8 +64,7 @@ public class TblVegetative implements Serializable { @Column(name = "accession_number") private long accessionNumber; @Column(name = "cultivation_date") - @Temporal(TemporalType.DATE) - private Date cultivationDate; + private LocalDate cultivationDate; @Basic(optional = false) @NotNull @Column(name = "index_seminum") @@ -117,11 +117,11 @@ public void setAccessionNumber(long accessionNumber) { this.accessionNumber = accessionNumber; } - public Date getCultivationDate() { + public LocalDate getCultivationDate() { return cultivationDate; } - public void setCultivationDate(Date cultivationDate) { + public void setCultivationDate(LocalDate cultivationDate) { this.cultivationDate = cultivationDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewClassificationResult.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewClassificationResult.java index 72b300c2..d1f657a2 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewClassificationResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewClassificationResult.java @@ -16,19 +16,19 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.rest.ClassificationSourceType; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewPerson.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewPerson.java index 4f09591d..55756d37 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewPerson.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewPerson.java @@ -16,16 +16,16 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewProtolog.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewProtolog.java index 5f34deac..61824267 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewProtolog.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewProtolog.java @@ -16,17 +16,17 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewScientificName.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewScientificName.java index 22451e25..97644c88 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewScientificName.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewScientificName.java @@ -16,17 +16,17 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewTaxon.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewTaxon.java index b30e7245..ad3f0ffc 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewTaxon.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/ViewTaxon.java @@ -16,17 +16,17 @@ package org.jacq.common.model.jpa; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/custom/BotanicalObjectDerivative.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/custom/BotanicalObjectDerivative.java index df338503..514dc942 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/custom/BotanicalObjectDerivative.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/custom/BotanicalObjectDerivative.java @@ -16,14 +16,14 @@ package org.jacq.common.model.jpa.custom; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Union object for displaying and search botanical object derivatives diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/custom/CustomNamedQueries.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/custom/CustomNamedQueries.java deleted file mode 100644 index a116765f..00000000 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/custom/CustomNamedQueries.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2017 wkoller. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jacq.common.model.jpa.custom; - -import javax.persistence.MappedSuperclass; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; - -/** - * - * @author wkoller - */ -@MappedSuperclass -@NamedQueries({ - @NamedQuery(name = "RevClassification.findByUuidMinterIdAndParent", query = "SELECT r FROM RevClassification r WHERE r.uuidMinterId = :uuidMinterId AND r.accScientificNameId = :accScientificNameId ORDER BY r.order ASC, r.scientificName ASC") - , @NamedQuery(name = "RevClassification.findByUuidMinterIdAndTopLevel", query = "SELECT r FROM RevClassification r WHERE r.uuidMinterId = :uuidMinterId AND r.accScientificNameId IS NULL ORDER BY r.order ASC, r.scientificName ASC") - , @NamedQuery(name = "RevClassification.findByUuidMinterIdAndTopLevelAndProvinceId", query = "SELECT r FROM RevClassification r WHERE r.uuidMinterId = :uuidMinterId AND r.accScientificNameId IS NULL AND r.provinceIds LIKE :provinceId ORDER BY r.order ASC, r.scientificName ASC") - , @NamedQuery(name = "TblDerivative.findByOrganisationListAndIndexSeminum", query = "SELECT d FROM TblDerivative d INNER JOIN d.tblLivingPlant l WHERE l.indexSeminum = true and d.organisationId in :organisationList") - , @NamedQuery(name = "TblDerivative.findByLivingPlantList", query = "SELECT d FROM TblDerivative d INNER JOIN d.tblLivingPlant l WHERE l.id in :tblLivingPlantList") - , @NamedQuery(name = "TblDerivative.findByNotInTblLivingPlantListAndOrangisation", query = "SELECT d FROM TblDerivative d INNER JOIN d.tblLivingPlant l WHERE l.id not in (:tblLivingPlantList) and d.organisationId = (:organisationId)") - , @NamedQuery(name = "TblClassification.findTopLevelBySource", query = "SELECT t FROM TblClassification t WHERE t.source = :source AND t.sourceId = :sourceId AND t.parentScientificNameId IS NULL") - , @NamedQuery(name = "TblClassification.findBySourceAndParent", query = "SELECT t FROM TblClassification t WHERE t.source = :source AND t.sourceId = :sourceId AND t.parentScientificNameId = :parentScientificNameId") - , @NamedQuery(name = "TblClassification.findBySourceAndAcceptedAndScientificNameId", query = "SELECT t FROM TblClassification t WHERE t.source = :source AND t.sourceId = :sourceId AND t.scientificNameId = :scientificNameId") - , @NamedQuery(name = "TblLivingPlant.resetImageStatus", query = "UPDATE TblLivingPlant t SET t.hasImage = FALSE, t.hasPublicImage = FALSE WHERE t.tblDerivative IN ( SELECT td FROM TblDerivative td WHERE td.organisationId IN (:organisations) )") - , @NamedQuery(name = "TblLivingPlant.findByAccessionNumberList", query = "SELECT t FROM TblLivingPlant t WHERE t.accessionNumber in (:accessionNumberList)") - , @NamedQuery(name = "TblImportProperties.findByOriginalBotanicalObjectIdAndSourceName", query = "SELECT t FROM TblImportProperties t WHERE t.originalBotanicalObjectId = :originalBotanicalObjectId AND t.sourceName = :sourceName") - , @NamedQuery(name = "TblCultivar.findByCultivarAndScientificNameId", query = "SELECT t FROM TblCultivar t INNER JOIN t.scientificNameId sni WHERE t.cultivar = :cultivar AND sni.scientificNameId = :scientificNameId") - , @NamedQuery(name = "TblNomName.findBySubstantive", query = "SELECT t FROM TblNomName t WHERE t.substantiveId IN (:substantiveIds) AND t.firstEpithetId IS NULL AND t.secondEpithetId IS NULL") - , @NamedQuery(name = "TblNomName.findBySubstantiveAndFirstEpithet", query = "SELECT t FROM TblNomName t WHERE t.substantiveId IN (:substantiveIds) AND t.firstEpithetId IN (:firstEpithetIds) AND t.secondEpithetId IS NULL") - , @NamedQuery(name = "TblNomName.findBySubstantiveAndFirstEpithetAndSecondEpithet", query = "SELECT t FROM TblNomName t WHERE t.substantiveId IN (:substantiveIds) AND t.firstEpithetId IN (:firstEpithetIds) AND t.secondEpithetId IN (:secondEpithetIds)") - , @NamedQuery(name = "TblNomSubstantive.findLikeSubstantive", query = "SELECT t FROM TblNomSubstantive t WHERE t.substantive LIKE :substantive") - , @NamedQuery(name = "TblNomEpithet.findLikeEpithet", query = "SELECT t FROM TblNomEpithet t WHERE t.epithet LIKE :epithet") - , @NamedQuery(name = "TblIndexSeminumContent.findByIndexSeminumRevisionId", query = "SELECT t FROM TblIndexSeminumContent t WHERE t.indexSeminumRevisionId = :indexSeminumRevisionId") - , @NamedQuery(name = "TblCultivar.findByScientificNameId", query = "SELECT t FROM TblCultivar t INNER JOIN t.scientificNameId s WHERE s.scientificNameId = :scientificNameId") - , @NamedQuery(name = "TblLocation.findByLocation", query = "SELECT t FROM TblLocation t WHERE t.location = :location") - , @NamedQuery(name = "TblClassification.findAllAvailable", query = "SELECT t FROM TblClassification t WHERE t.parentScientificNameId IS NULL GROUP BY t.source, t.sourceId") - , @NamedQuery(name = "TblVegetative.findByBotanicalObjectId", query = "SELECT v FROM TblVegetative v WHERE v.vegetativeId IN (SELECT td FROM TblDerivative td WHERE td.botanicalObjectId = :botanicalObjectId)") - , @NamedQuery(name = "TblAcquisitionSource.findLikeName", query = "SELECT t FROM TblAcquisitionSource t WHERE t.name LIKE :name") - , @NamedQuery(name = "TblSpecimen.findByBotanicalObjectId", query = "SELECT t FROM TblSpecimen t WHERE t.specimenId in (SELECT td FROM TblDerivative td WHERE td.botanicalObjectId = (:botanicalObjectId))") - , @NamedQuery(name = "FrmwrkaccessOrganisation.findByOrganisationIdandUserId", query = "SELECT f FROM FrmwrkaccessOrganisation f WHERE f.organisationId = :organisationId and f.userId = :userId") - , @NamedQuery(name = "FrmwrkaccessOrganisation.findByUserAndOrganisation", query = "SELECT f FROM FrmwrkaccessOrganisation f WHERE f.userId = :userId AND f.organisationId = :organisationId") - , @NamedQuery(name = "TblNomName.findBySubstantiveAndRank", query = "SELECT t FROM TblNomName t INNER JOIN t.substantiveId s INNER JOIN t.rankId r WHERE s.substantiveId = :substantiveId AND r.rankId = :rankId") - , @NamedQuery(name = "TblPerson.findByLikeName", query = "SELECT t FROM TblPerson t WHERE t.name like :name") - , @NamedQuery(name = "TblIndexSeminumRevision.findByUserId", query = "SELECT t FROM TblIndexSeminumRevision t WHERE t.userId = :userId") - , @NamedQuery(name = "TblSeedOrder.findBySenderUserId", query = "SELECT t FROM TblSeedOrder t WHERE t.senderUserId = :senderUserId") -}) -public class CustomNamedQueries { - -} diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/custom/CustomNamedStoredProcedureQueries.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/custom/CustomNamedStoredProcedureQueries.java index bef78a28..ba50666d 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/custom/CustomNamedStoredProcedureQueries.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/custom/CustomNamedStoredProcedureQueries.java @@ -15,11 +15,11 @@ */ package org.jacq.common.model.jpa.custom; -import javax.persistence.MappedSuperclass; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblCommonNamesCache.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblCommonNamesCache.java index e05085bc..20ae16dc 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblCommonNamesCache.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblCommonNamesCache.java @@ -16,18 +16,18 @@ package org.jacq.common.model.jpa.openup; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblScientificNameCache.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblScientificNameCache.java index 6c3a1078..2a3712ff 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblScientificNameCache.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblScientificNameCache.java @@ -16,18 +16,18 @@ package org.jacq.common.model.jpa.openup; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblService.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblService.java index e84d1529..01ab0714 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblService.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblService.java @@ -17,21 +17,21 @@ import java.io.Serializable; import java.util.Collection; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblWebserviceCache.java b/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblWebserviceCache.java index 9f0a0905..1fb9a15c 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblWebserviceCache.java +++ b/jacq-common/src/main/java/org/jacq/common/model/jpa/openup/TblWebserviceCache.java @@ -16,21 +16,21 @@ package org.jacq.common.model.jpa.openup; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/model/names/CommonName.java b/jacq-common/src/main/java/org/jacq/common/model/names/CommonName.java index f7af694d..c42dab26 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/names/CommonName.java +++ b/jacq-common/src/main/java/org/jacq/common/model/names/CommonName.java @@ -19,8 +19,8 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import javax.persistence.Transient; -import javax.validation.Valid; +import jakarta.persistence.Transient; +import jakarta.validation.Valid; import org.apache.commons.lang3.StringUtils; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/names/taxamatch/Searchresult.java b/jacq-common/src/main/java/org/jacq/common/model/names/taxamatch/Searchresult.java index f52d11ed..7fd424e0 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/names/taxamatch/Searchresult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/names/taxamatch/Searchresult.java @@ -2,7 +2,7 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElement; public class Searchresult { diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/AcquistionEventSourceResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/AcquistionEventSourceResult.java index 95def3bd..4f86cddf 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/AcquistionEventSourceResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/AcquistionEventSourceResult.java @@ -15,10 +15,11 @@ */ package org.jacq.common.model.rest; +import org.jacq.common.model.jpa.TblAcquisitionEventSource; + +import java.time.LocalDate; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import org.jacq.common.model.jpa.TblAcquisitionEventSource; /** * @@ -27,7 +28,7 @@ public class AcquistionEventSourceResult { private Long acquisitionEventSourceId; - private Date sourceDate; + private LocalDate sourceDate; private AcquisitionSourceResult acquisitionEventSource; public AcquistionEventSourceResult() { @@ -50,11 +51,11 @@ public void setAcquisitionEventSourceId(Long acquisitionEventSourceId) { this.acquisitionEventSourceId = acquisitionEventSourceId; } - public Date getSourceDate() { + public LocalDate getSourceDate() { return sourceDate; } - public void setSourceDate(Date sourceDate) { + public void setSourceDate(LocalDate sourceDate) { this.sourceDate = sourceDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/BotanicalObjectDownloadResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/BotanicalObjectDownloadResult.java index a45436c7..89009c43 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/BotanicalObjectDownloadResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/BotanicalObjectDownloadResult.java @@ -16,9 +16,9 @@ package org.jacq.common.model.rest; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.TblDerivative; import org.apache.commons.lang3.StringUtils; import org.jacq.common.model.jpa.TblClassification; diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/BotanicalObjectResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/BotanicalObjectResult.java index 46fa4c7b..61ff5fff 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/BotanicalObjectResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/BotanicalObjectResult.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.TblBotanicalObject; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/EmploymentTypeResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/EmploymentTypeResult.java index b328612b..b28f8248 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/EmploymentTypeResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/EmploymentTypeResult.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.FrmwrkEmploymentType; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/ImportPropertiesResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/ImportPropertiesResult.java index 86f51698..31698c1c 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/ImportPropertiesResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/ImportPropertiesResult.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.TblImportProperties; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/IndexSeminumDownloadResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/IndexSeminumDownloadResult.java index d6f7b580..f694c1bf 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/IndexSeminumDownloadResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/IndexSeminumDownloadResult.java @@ -15,9 +15,9 @@ */ package org.jacq.common.model.rest; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.TblIndexSeminumContent; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/IndexSeminumResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/IndexSeminumResult.java index 1d275075..b95caf29 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/IndexSeminumResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/IndexSeminumResult.java @@ -18,9 +18,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.TblIndexSeminumRevision; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/InventoryResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/InventoryResult.java index 05e17079..609b197b 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/InventoryResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/InventoryResult.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.TblInventory; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/InventoryTypeResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/InventoryTypeResult.java index dbd06443..afb4e6b4 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/InventoryTypeResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/InventoryTypeResult.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.TblInventoryType; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/LivingPlantResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/LivingPlantResult.java index 67e699ce..c0f91b56 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/LivingPlantResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/LivingPlantResult.java @@ -16,6 +16,7 @@ package org.jacq.common.model.rest; import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -70,14 +71,14 @@ public class LivingPlantResult extends BotanicalObjectDerivative { protected Date recordingDate; protected Date incomingDate; - protected Date cultivationDate; + protected LocalDate cultivationDate; protected String generalAnnotation; protected PhenologyResult phenology; protected List acquistionEventSources; protected boolean redetermine; - protected Date determinationDate; + protected LocalDate determinationDate; protected IdentStatusResult identStatus; protected PersonResult determinedBy; protected boolean phytoControl; @@ -475,11 +476,11 @@ public void setIncomingDate(Date incomingDate) { this.incomingDate = incomingDate; } - public Date getCultivationDate() { + public LocalDate getCultivationDate() { return cultivationDate; } - public void setCultivationDate(Date cultivationDate) { + public void setCultivationDate(LocalDate cultivationDate) { this.cultivationDate = cultivationDate; } @@ -499,11 +500,11 @@ public void setPhenology(PhenologyResult phenology) { this.phenology = phenology; } - public Date getDeterminationDate() { + public LocalDate getDeterminationDate() { return determinationDate; } - public void setDeterminationDate(Date determinationDate) { + public void setDeterminationDate(LocalDate determinationDate) { this.determinationDate = determinationDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/OrganisationResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/OrganisationResult.java index 65501820..caebe63d 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/OrganisationResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/OrganisationResult.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.TblOrganisation; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/RevClassificationResponse.java b/jacq-common/src/main/java/org/jacq/common/model/rest/RevClassificationResponse.java index c5d59874..6b378f88 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/RevClassificationResponse.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/RevClassificationResponse.java @@ -17,11 +17,11 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.jacq.common.model.jpa.RevClassification; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/RoleResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/RoleResult.java index 98d8adb8..4fe87461 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/RoleResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/RoleResult.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.FrmwrkRole; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/SeedOrderResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/SeedOrderResult.java index fca0f43b..5087fd6e 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/SeedOrderResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/SeedOrderResult.java @@ -15,8 +15,8 @@ */ package org.jacq.common.model.rest; +import java.time.LocalDate; import java.util.ArrayList; -import java.util.Date; import java.util.List; import org.jacq.common.model.jpa.TblDerivative; import org.jacq.common.model.jpa.TblSeedOrder; @@ -29,7 +29,7 @@ public class SeedOrderResult { protected Long seedOrderId; - protected Date orderDate; + protected LocalDate orderDate; protected String annotation; protected boolean complete; @@ -62,11 +62,11 @@ public void setSeedOrderId(Long seedOrderId) { this.seedOrderId = seedOrderId; } - public Date getOrderDate() { + public LocalDate getOrderDate() { return orderDate; } - public void setOrderDate(Date orderDate) { + public void setOrderDate(LocalDate orderDate) { this.orderDate = orderDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/SeparationResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/SeparationResult.java index 4c0b0c81..b1a78ad0 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/SeparationResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/SeparationResult.java @@ -15,10 +15,11 @@ */ package org.jacq.common.model.rest; +import org.jacq.common.model.jpa.TblSeparation; + +import java.time.LocalDate; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import org.jacq.common.model.jpa.TblSeparation; /** * @see TblSeparation @@ -28,7 +29,8 @@ public class SeparationResult { protected Long separationId; - protected Date date; + + protected LocalDate date; protected String annotation; protected SeparationTypeResult separationType; @@ -54,11 +56,11 @@ public void setSeparationId(Long separationId) { this.separationId = separationId; } - public Date getDate() { + public LocalDate getDate() { return date; } - public void setDate(Date date) { + public void setDate(LocalDate date) { this.date = date; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/TreeRecordFilePageResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/TreeRecordFilePageResult.java index 6231adde..0c2b3271 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/TreeRecordFilePageResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/TreeRecordFilePageResult.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.TblTreeRecordFilePage; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/TreeRecordFileResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/TreeRecordFileResult.java index 53607782..8a998829 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/TreeRecordFileResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/TreeRecordFileResult.java @@ -18,9 +18,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.TblTreeRecordFile; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/UserResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/UserResult.java index d4f1eaf8..1f055814 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/UserResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/UserResult.java @@ -15,12 +15,12 @@ */ package org.jacq.common.model.rest; +import java.time.LocalDate; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.FrmwrkUser; /** @@ -39,7 +39,7 @@ public class UserResult { protected String firstname; protected String lastname; protected String titleSuffix; - protected Date birthdate; + protected LocalDate birthdate; protected Long userTypeId; protected String userType; protected Long employmentTypeId; @@ -160,11 +160,11 @@ public void setTitleSuffix(String titleSuffix) { this.titleSuffix = titleSuffix; } - public Date getBirthdate() { + public LocalDate getBirthdate() { return birthdate; } - public void setBirthdate(Date birthdate) { + public void setBirthdate(LocalDate birthdate) { this.birthdate = birthdate; } diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/UserTypeResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/UserTypeResult.java index c8a88039..26a36d91 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/UserTypeResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/UserTypeResult.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jacq.common.model.jpa.FrmwrkUserType; /** diff --git a/jacq-common/src/main/java/org/jacq/common/model/rest/VegetativeResult.java b/jacq-common/src/main/java/org/jacq/common/model/rest/VegetativeResult.java index df7998b6..2a4680d5 100644 --- a/jacq-common/src/main/java/org/jacq/common/model/rest/VegetativeResult.java +++ b/jacq-common/src/main/java/org/jacq/common/model/rest/VegetativeResult.java @@ -15,8 +15,8 @@ */ package org.jacq.common.model.rest; +import java.time.LocalDate; import java.util.ArrayList; -import java.util.Date; import java.util.List; import org.jacq.common.model.jpa.TblVegetative; import org.jacq.common.model.jpa.custom.BotanicalObjectDerivative; @@ -29,7 +29,7 @@ public class VegetativeResult extends BotanicalObjectDerivative { protected Long vegetativeId; - protected Date cultivationDate; + protected LocalDate cultivationDate; protected String annotation; protected PhenologyResult phenology; protected OrganisationResult organisation; @@ -86,11 +86,11 @@ public void setVegetativeId(Long vegetativeId) { this.vegetativeId = vegetativeId; } - public Date getCultivationDate() { + public LocalDate getCultivationDate() { return cultivationDate; } - public void setCultivationDate(Date cultivationDate) { + public void setCultivationDate(LocalDate cultivationDate) { this.cultivationDate = cultivationDate; } diff --git a/jacq-common/src/main/java/org/jacq/common/rest/AcquisitionService.java b/jacq-common/src/main/java/org/jacq/common/rest/AcquisitionService.java index 6fbf6081..ce287e4c 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/AcquisitionService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/AcquisitionService.java @@ -16,12 +16,12 @@ package org.jacq.common.rest; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.AcquisitionSourceResult; /** diff --git a/jacq-common/src/main/java/org/jacq/common/rest/AuthorizationService.java b/jacq-common/src/main/java/org/jacq/common/rest/AuthorizationService.java index 5c9fee80..6dcc2cb2 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/AuthorizationService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/AuthorizationService.java @@ -17,13 +17,13 @@ import java.util.Date; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.AccessOrganisationResult; /** diff --git a/jacq-common/src/main/java/org/jacq/common/rest/ClassificationService.java b/jacq-common/src/main/java/org/jacq/common/rest/ClassificationService.java index 2d40c393..39cfa525 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/ClassificationService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/ClassificationService.java @@ -17,13 +17,13 @@ import java.util.List; import java.util.UUID; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.ClassificationSourceType; import org.jacq.common.model.jpa.RevClassification; import org.jacq.common.model.jpa.ViewClassificationResult; diff --git a/jacq-common/src/main/java/org/jacq/common/rest/DerivativeService.java b/jacq-common/src/main/java/org/jacq/common/rest/DerivativeService.java index c724da72..cd4c7f8d 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/DerivativeService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/DerivativeService.java @@ -16,14 +16,14 @@ package org.jacq.common.rest; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jacq.common.model.jpa.custom.BotanicalObjectDerivative; import org.jacq.common.model.rest.BotanicalObjectDownloadResult; import org.jacq.common.model.rest.CertificateTypeResult; diff --git a/jacq-common/src/main/java/org/jacq/common/rest/GatheringService.java b/jacq-common/src/main/java/org/jacq/common/rest/GatheringService.java index 0fbb795b..51ffca07 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/GatheringService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/GatheringService.java @@ -16,12 +16,12 @@ package org.jacq.common.rest; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.LocationResult; /** diff --git a/jacq-common/src/main/java/org/jacq/common/rest/IndexSeminumService.java b/jacq-common/src/main/java/org/jacq/common/rest/IndexSeminumService.java index 425bfc5e..5d968277 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/IndexSeminumService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/IndexSeminumService.java @@ -16,13 +16,13 @@ package org.jacq.common.rest; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.IndexSeminumDownloadResult; import org.jacq.common.model.rest.IndexSeminumResult; import org.jacq.common.model.rest.IndexSeminumTypeResult; diff --git a/jacq-common/src/main/java/org/jacq/common/rest/InventoryService.java b/jacq-common/src/main/java/org/jacq/common/rest/InventoryService.java index 02df1fe2..397d2fc1 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/InventoryService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/InventoryService.java @@ -16,12 +16,12 @@ package org.jacq.common.rest; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.InventoryResult; import org.jacq.common.model.rest.InventoryTypeResult; diff --git a/jacq-common/src/main/java/org/jacq/common/rest/OrganisationService.java b/jacq-common/src/main/java/org/jacq/common/rest/OrganisationService.java index 26dfe26c..8ff9e2a9 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/OrganisationService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/OrganisationService.java @@ -16,13 +16,13 @@ package org.jacq.common.rest; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.OrganisationResult; /** diff --git a/jacq-common/src/main/java/org/jacq/common/rest/PersonService.java b/jacq-common/src/main/java/org/jacq/common/rest/PersonService.java index f18de9b5..dd06da39 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/PersonService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/PersonService.java @@ -16,12 +16,12 @@ package org.jacq.common.rest; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.PersonResult; /** diff --git a/jacq-common/src/main/java/org/jacq/common/rest/PortalService.java b/jacq-common/src/main/java/org/jacq/common/rest/PortalService.java index c4560cbb..566e8db6 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/PortalService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/PortalService.java @@ -16,11 +16,11 @@ package org.jacq.common.rest; import java.util.HashMap; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * Any portal wide ("application scoped") services are in here diff --git a/jacq-common/src/main/java/org/jacq/common/rest/SeedExchangeService.java b/jacq-common/src/main/java/org/jacq/common/rest/SeedExchangeService.java index 058afe6b..c64b57a9 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/SeedExchangeService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/SeedExchangeService.java @@ -16,13 +16,13 @@ package org.jacq.common.rest; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.SeedOrderResult; /** diff --git a/jacq-common/src/main/java/org/jacq/common/rest/TreeRecordFileService.java b/jacq-common/src/main/java/org/jacq/common/rest/TreeRecordFileService.java index affe805c..322a0aa0 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/TreeRecordFileService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/TreeRecordFileService.java @@ -17,13 +17,13 @@ import java.util.List; import java.util.Date; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.TreeRecordFilePageResult; import org.jacq.common.model.rest.TreeRecordFileResult; diff --git a/jacq-common/src/main/java/org/jacq/common/rest/UserService.java b/jacq-common/src/main/java/org/jacq/common/rest/UserService.java index b7532699..03937821 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/UserService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/UserService.java @@ -17,13 +17,13 @@ import java.util.Date; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.EmploymentTypeResult; import org.jacq.common.model.rest.RoleResult; import org.jacq.common.model.rest.UserResult; diff --git a/jacq-common/src/main/java/org/jacq/common/rest/UuidService.java b/jacq-common/src/main/java/org/jacq/common/rest/UuidService.java index 0fe5c804..f9f4e684 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/UuidService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/UuidService.java @@ -1,10 +1,10 @@ package org.jacq.common.rest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * UUID Service interface for handling unique identifiers across the jacq system diff --git a/jacq-common/src/main/java/org/jacq/common/rest/dataimport/DataImportService.java b/jacq-common/src/main/java/org/jacq/common/rest/dataimport/DataImportService.java index d521a52e..2d53ffeb 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/dataimport/DataImportService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/dataimport/DataImportService.java @@ -15,12 +15,12 @@ */ package org.jacq.common.rest.dataimport; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.dataimport.ImportFile; /** diff --git a/jacq-common/src/main/java/org/jacq/common/rest/exception/JacqRestException.java b/jacq-common/src/main/java/org/jacq/common/rest/exception/JacqRestException.java index e9c7b9d1..fe6dc4fb 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/exception/JacqRestException.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/exception/JacqRestException.java @@ -5,8 +5,8 @@ */ package org.jacq.common.rest.exception; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; /** * Main exception class to be used by REST service This is necessary because we can automatically fetch those exceptions diff --git a/jacq-common/src/main/java/org/jacq/common/rest/filter/ContentTypeResponseFilter.java b/jacq-common/src/main/java/org/jacq/common/rest/filter/ContentTypeResponseFilter.java index 11fbd4c2..9fab4fd8 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/filter/ContentTypeResponseFilter.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/filter/ContentTypeResponseFilter.java @@ -18,10 +18,10 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.core.MediaType; /** * diff --git a/jacq-common/src/main/java/org/jacq/common/rest/filter/RequestDebugFilter.java b/jacq-common/src/main/java/org/jacq/common/rest/filter/RequestDebugFilter.java index cc2d4632..689ec649 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/filter/RequestDebugFilter.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/filter/RequestDebugFilter.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.ext.Provider; /** * Helper filter for debugging request sent through jax-rs diff --git a/jacq-common/src/main/java/org/jacq/common/rest/names/CommonNameService.java b/jacq-common/src/main/java/org/jacq/common/rest/names/CommonNameService.java index 0dfadf6a..55cde43b 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/names/CommonNameService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/names/CommonNameService.java @@ -15,13 +15,13 @@ */ package org.jacq.common.rest.names; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * Common Names service interface diff --git a/jacq-common/src/main/java/org/jacq/common/rest/names/ScientificNameService.java b/jacq-common/src/main/java/org/jacq/common/rest/names/ScientificNameService.java index adc6c6ef..3f58f6e9 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/names/ScientificNameService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/names/ScientificNameService.java @@ -16,13 +16,13 @@ package org.jacq.common.rest.names; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.rest.CultivarResult; import org.jacq.common.model.rest.HabitusTypeResult; import org.jacq.common.model.rest.ScientificNameInformationResult; diff --git a/jacq-common/src/main/java/org/jacq/common/rest/output/SearchService.java b/jacq-common/src/main/java/org/jacq/common/rest/output/SearchService.java index 123c1cf6..9046441a 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/output/SearchService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/output/SearchService.java @@ -16,12 +16,12 @@ package org.jacq.common.rest.output; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.jacq.common.model.jpa.custom.BotanicalObjectDerivative; import org.jacq.common.model.rest.OrderDirection; import org.jacq.common.model.rest.OrganisationResult; diff --git a/jacq-common/src/main/java/org/jacq/common/rest/provider/CustomDateParamConverter.java b/jacq-common/src/main/java/org/jacq/common/rest/provider/CustomDateParamConverter.java index 9be6851a..6af425ac 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/provider/CustomDateParamConverter.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/provider/CustomDateParamConverter.java @@ -20,7 +20,7 @@ import java.util.Date; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverter; /** * Custom converter for Date.class - required due to incompatibility between Date Constructor and toString diff --git a/jacq-common/src/main/java/org/jacq/common/rest/provider/CustomDateParamConverterProvider.java b/jacq-common/src/main/java/org/jacq/common/rest/provider/CustomDateParamConverterProvider.java index 9eb029ab..a1b4a3d1 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/provider/CustomDateParamConverterProvider.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/provider/CustomDateParamConverterProvider.java @@ -18,9 +18,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Date; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; /** * Provider for custom data param converter diff --git a/jacq-common/src/main/java/org/jacq/common/rest/report/LabelService.java b/jacq-common/src/main/java/org/jacq/common/rest/report/LabelService.java index 2d3aea3c..58563627 100644 --- a/jacq-common/src/main/java/org/jacq/common/rest/report/LabelService.java +++ b/jacq-common/src/main/java/org/jacq/common/rest/report/LabelService.java @@ -1,12 +1,12 @@ package org.jacq.common.rest.report; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * Service for generating labels diff --git a/jacq-common/src/main/java/org/jacq/common/security/JacqCallerPrincipal.java b/jacq-common/src/main/java/org/jacq/common/security/JacqCallerPrincipal.java index 9cdff476..36c3c5f7 100644 --- a/jacq-common/src/main/java/org/jacq/common/security/JacqCallerPrincipal.java +++ b/jacq-common/src/main/java/org/jacq/common/security/JacqCallerPrincipal.java @@ -15,7 +15,7 @@ */ package org.jacq.common.security; -import javax.security.enterprise.CallerPrincipal; +import jakarta.security.enterprise.CallerPrincipal; import org.apache.commons.codec.binary.Base64; import org.jacq.common.model.rest.UserResult; diff --git a/jacq-common/src/main/java/org/jacq/common/util/ServicesUtil.java b/jacq-common/src/main/java/org/jacq/common/util/ServicesUtil.java index dee79879..08eae63c 100644 --- a/jacq-common/src/main/java/org/jacq/common/util/ServicesUtil.java +++ b/jacq-common/src/main/java/org/jacq/common/util/ServicesUtil.java @@ -15,6 +15,8 @@ */ package org.jacq.common.util; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; @@ -22,7 +24,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestFilter; import org.jacq.common.external.rest.GeoNamesService; import org.jacq.common.external.rest.ImageServer; import org.jacq.common.rest.AcquisitionService; @@ -133,13 +135,13 @@ public static SeedExchangeService getSeedExchangeService() { } public static String getWorkLabelURL(String type, Long derivativeId) { - try { + try (ResteasyClient resteasyClient = (ResteasyClient) ClientBuilder.newClient()) { Map templateParams = new HashMap<>(); templateParams.put("type", type); templateParams.put("derivative_id", derivativeId); Method workLabelMethod = LabelService.class.getMethod("getWork", String.class, Long.class); - ResteasyClient resteasyClient = new ResteasyClientBuilder().connectionPoolSize(20).build(); + ResteasyWebTarget resteasyWebTarget = resteasyClient.target(JACQ_SERVICE_REPORT_URL).path(LabelService.class).path(workLabelMethod).resolveTemplates(templateParams); return resteasyWebTarget.getUri().toString(); @@ -175,8 +177,9 @@ protected static T getProxy(Class serviceInterfaceClass, String serviceUR * @param serviceURI * @return */ - protected static T getProxy(Class serviceInterfaceClass, String serviceURI, boolean noClientRequestFilters) { - ResteasyClient resteasyClient = new ResteasyClientBuilder().connectionPoolSize(20).build(); + protected static T getProxy(Class serviceInterfaceClass, String serviceURI, + boolean noClientRequestFilters) { + Client resteasyClient = ClientBuilder.newBuilder().build(); resteasyClient.register(new CustomDateParamConverterProvider()); if (!noClientRequestFilters) { @@ -185,7 +188,7 @@ protected static T getProxy(Class serviceInterfaceClass, String serviceUR } } - ResteasyWebTarget resteasyWebTarget = resteasyClient.target(serviceURI); + ResteasyWebTarget resteasyWebTarget = (ResteasyWebTarget) resteasyClient.target(serviceURI); return (T) resteasyWebTarget.proxy(serviceInterfaceClass); } } diff --git a/jacq-common/src/main/resources/META-INF/beans.xml b/jacq-common/src/main/resources/META-INF/beans.xml new file mode 100644 index 00000000..6c9b0739 --- /dev/null +++ b/jacq-common/src/main/resources/META-INF/beans.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/jacq-dataimport/pom.xml b/jacq-dataimport/pom.xml index c587d250..40c95154 100644 --- a/jacq-dataimport/pom.xml +++ b/jacq-dataimport/pom.xml @@ -31,7 +31,7 @@ org.jboss.resteasy resteasy-client - 3.0.10.Final + 6.2.4.Final provided @@ -40,9 +40,15 @@ 2.1.3 - javax - javaee-web-api - 7.0 + jakarta.platform + jakarta.jakartaee-api + 9.1.0 + provided + + + jakarta.platform + jakarta.jakartaee-web-api + 9.1.0 provided @@ -53,47 +59,14 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 - 1.8 - 1.8 - - ${endorsed.dir} - + 17 + 17 org.apache.maven.plugins maven-war-plugin - 2.3 - - false - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.6 - - - validate - - copy - - - ${endorsed.dir} - true - - - javax - javaee-endorsed-api - 7.0 - jar - - - - - diff --git a/jacq-dataimport/src/main/java/org/jacq/service/JacqServiceConfig.java b/jacq-dataimport/src/main/java/org/jacq/service/JacqServiceConfig.java index 0e713b67..81bf0f28 100644 --- a/jacq-dataimport/src/main/java/org/jacq/service/JacqServiceConfig.java +++ b/jacq-dataimport/src/main/java/org/jacq/service/JacqServiceConfig.java @@ -5,14 +5,14 @@ */ package org.jacq.service; +import jakarta.inject.Named; import java.util.HashMap; import java.util.List; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.ejb.Singleton; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; +import jakarta.annotation.PostConstruct; +import jakarta.ejb.Singleton; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; import org.jacq.common.manager.JacqConfig; import org.jacq.common.model.jpa.FrmwrkConfig; @@ -21,7 +21,7 @@ * * @author wkoller */ -@ManagedBean +@Named @Singleton public class JacqServiceConfig extends JacqConfig { diff --git a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/BromiMdbImportManager.java b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/BromiMdbImportManager.java index f56d5651..cc51e8a4 100644 --- a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/BromiMdbImportManager.java +++ b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/BromiMdbImportManager.java @@ -19,26 +19,29 @@ import com.healthmarketscience.jackcess.DatabaseBuilder; import com.healthmarketscience.jackcess.Row; import com.healthmarketscience.jackcess.Table; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import org.apache.commons.lang3.StringUtils; +import org.jacq.common.model.dataimport.ImportFile; +import org.jacq.common.model.dataimport.ImportRecord; +import org.jacq.common.rest.dataimport.DataImportService; + import java.io.File; import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; +import java.time.LocalDate; +import java.time.ZoneId; import java.util.Date; import java.util.HashMap; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.ManagedBean; -import javax.inject.Inject; -import org.apache.commons.lang3.StringUtils; -import org.jacq.common.model.dataimport.ImportFile; -import org.jacq.common.model.dataimport.ImportRecord; -import org.jacq.common.rest.dataimport.DataImportService; /** * * @author wkoller */ -@ManagedBean +@Named public class BromiMdbImportManager { private static final Logger LOGGER = Logger.getLogger(BromiMdbImportManager.class.getName()); @@ -163,7 +166,9 @@ public void importBromiMdb() throws IOException, ParseException { // try to parse the date as "normal" date try { - importRecord.setSeparationDate(DateFormat.getDateInstance(DateFormat.SHORT).parse(pflanzenAbgang)); + importRecord.setSeparationDate(DateFormat.getDateInstance(DateFormat.SHORT).parse(pflanzenAbgang).toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDate()); importRecord.setSeparationType("dead (eliminated)"); } catch (ParseException pe) { // separate date information @@ -238,7 +243,8 @@ else if (pflanzenAbgangParts.length > 2) { if (month >= 0) { try { - Date separationDate = new Date(Integer.valueOf(pflanzenAbgangParts[1]) + 100, month, 1); + int year = Integer.valueOf(pflanzenAbgangParts[1]) + 1900; + LocalDate separationDate = LocalDate.of(year, month + 1, 1); importRecord.setSeparationDate(separationDate); importRecord.setSeparationType("dead (eliminated)"); } catch (Exception e) { @@ -255,7 +261,7 @@ else if (pflanzenAbgangParts.length > 2) { // Augarten entries have their own separation (static) if (glashaus.equals(glashausLookup.get("AG"))) { - importRecord.setSeparationDate(DateFormat.getDateInstance(DateFormat.SHORT).parse("17.12.2012")); + importRecord.setSeparationDate(LocalDate.of(2012, 12, 17)); importRecord.setSeparationType("separated"); importRecord.setSeparationAnnotation("Augarten"); } diff --git a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/DataImportManager.java b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/DataImportManager.java index 3490eff2..20b24de7 100644 --- a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/DataImportManager.java +++ b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/DataImportManager.java @@ -15,11 +15,13 @@ */ package org.jacq.service.dataimport.manager; +import jakarta.inject.Named; import java.io.IOException; import java.io.StringReader; import java.nio.charset.Charset; import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Date; import java.util.Base64; @@ -29,12 +31,11 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.transaction.Transactional; +import jakarta.annotation.PostConstruct; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.transaction.Transactional; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVRecord; import org.apache.commons.lang3.StringUtils; @@ -77,7 +78,7 @@ * * @author wkoller */ -@ManagedBean +@Named @Transactional public class DataImportManager { @@ -100,7 +101,7 @@ public enum ImportStatus { protected GatheringService gatheringService; - protected SimpleDateFormat separationDateFormat = new SimpleDateFormat("YYYY-mm-dd"); + protected DateTimeFormatter separationDateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd"); protected Pattern coordinatePattern = Pattern.compile("([N|S|W|E])(\\d+)°(\\d+)'(\\d+)\""); @@ -143,7 +144,7 @@ public void dataImport(ImportFile importFile) throws IOException, ParseException importRecord.setLivingPlantNumber(record.get(i++)); importRecord.setOriginalId(Long.valueOf(record.get(i++))); importRecord.setGatheringNumber(record.get(i++)); - importRecord.setSeparationDate(separationDateFormat.parse(record.get(i++))); + importRecord.setSeparationDate(LocalDate.parse(record.get(i++), separationDateFormat)); importRecord.setSeparationType(record.get(i++)); importRecord.setLabelAnnotation(record.get(i++)); importRecord.setAlternativeLivingPlantNumber(record.get(i++)); @@ -158,7 +159,7 @@ public void dataImport(ImportFile importFile) throws IOException, ParseException importRecord.setCultivar(record.get(i++)); importRecord.setCommonNames(record.get(i++)); importRecord.setPrice(Float.valueOf(record.get(i++))); - importRecord.setGatheringDate(separationDateFormat.parse(record.get(i++))); + importRecord.setGatheringDate(LocalDate.parse(record.get(i++), separationDateFormat)); importRecord.setGatheringSource(record.get(i++)); importRecord.setAltitudeMin(Long.valueOf(record.get(i++))); importRecord.setAltitudeMax(Long.valueOf(record.get(i++))); @@ -167,7 +168,7 @@ public void dataImport(ImportFile importFile) throws IOException, ParseException importRecord.setGatheringLocation(record.get(i++)); importRecord.setDefaultScientificNameId(Long.valueOf(record.get(i++))); importRecord.setHabitat(record.get(i++)); - importRecord.setAcquisitionDate(separationDateFormat.parse(record.get(i++))); + importRecord.setAcquisitionDate(LocalDate.parse(record.get(i++), separationDateFormat)); importRecord.setCustomAcquisitionDate(record.get(i++)); importRecord.setGatheringAnnotation(record.get(i++)); importRecord.setLatitude(record.get(i++)); @@ -302,9 +303,9 @@ protected ImportStatus importRecord(ImportRecord importRecord) { tblAcquisitionDate.setCustom(importRecord.getCustomAcquisitionDate()); } if (importRecord.getAcquisitionDate() != null) { - tblAcquisitionDate.setYear(String.valueOf(importRecord.getAcquisitionDate().getYear() + 1900)); - tblAcquisitionDate.setMonth(String.valueOf(importRecord.getAcquisitionDate().getMonth() + 1)); - tblAcquisitionDate.setDay(String.valueOf(importRecord.getAcquisitionDate().getDate())); + tblAcquisitionDate.setYear(String.valueOf(importRecord.getAcquisitionDate().getYear())); + tblAcquisitionDate.setMonth(String.valueOf(importRecord.getAcquisitionDate().getMonthValue())); + tblAcquisitionDate.setDay(String.valueOf(importRecord.getAcquisitionDate().getDayOfMonth())); } else { tblAcquisitionDate.setYear(null); tblAcquisitionDate.setMonth(null); diff --git a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/DbViewImportManager.java b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/DbViewImportManager.java index bf62ada6..beb50bbc 100644 --- a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/DbViewImportManager.java +++ b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/DbViewImportManager.java @@ -15,14 +15,14 @@ */ package org.jacq.service.dataimport.manager; +import jakarta.inject.Named; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.ManagedBean; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import org.jacq.common.model.dataimport.ImportRecord; /** @@ -31,7 +31,7 @@ * * @author wkoller */ -@ManagedBean +@Named public class DbViewImportManager { private static final Logger LOGGER = Logger.getLogger(DbViewImportManager.class.getName()); diff --git a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/GatheringManager.java b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/GatheringManager.java index 3d34ed49..aec55208 100644 --- a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/GatheringManager.java +++ b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/manager/GatheringManager.java @@ -15,11 +15,11 @@ */ package org.jacq.service.dataimport.manager; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jacq.common.manager.BaseGatheringManager; import org.jacq.common.util.ServicesUtil; import org.jacq.service.JacqServiceConfig; @@ -28,7 +28,7 @@ * * @author fhafner */ -@ManagedBean +@Named public class GatheringManager extends BaseGatheringManager { @PersistenceContext diff --git a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/security/BasicClientRequestFilter.java b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/security/BasicClientRequestFilter.java index 033e5331..860c0cbb 100644 --- a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/security/BasicClientRequestFilter.java +++ b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/security/BasicClientRequestFilter.java @@ -18,9 +18,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.ext.Provider; import org.apache.commons.codec.binary.Base64; /** diff --git a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/util/ServicesUtil.java b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/util/ServicesUtil.java index a218ea04..19fd621d 100644 --- a/jacq-dataimport/src/main/java/org/jacq/service/dataimport/util/ServicesUtil.java +++ b/jacq-dataimport/src/main/java/org/jacq/service/dataimport/util/ServicesUtil.java @@ -15,13 +15,13 @@ */ package org.jacq.service.dataimport.util; -import org.jacq.common.rest.OrganisationService; -import org.jacq.common.rest.filter.ContentTypeResponseFilter; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; import org.jacq.common.external.rest.ScientificNamesService; import org.jacq.common.rest.GatheringService; +import org.jacq.common.rest.OrganisationService; +import org.jacq.common.rest.filter.ContentTypeResponseFilter; import org.jacq.service.dataimport.security.BasicClientRequestFilter; -import org.jboss.resteasy.client.jaxrs.ResteasyClient; -import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; /** @@ -47,10 +47,11 @@ public static GatheringService getGatheringService() { } protected static T getProxy(Class serviceInterfaceClass, String serviceURI) { - ResteasyClient resteasyClient = new ResteasyClientBuilder().connectionPoolSize(20).build(); + Client resteasyClient = ClientBuilder.newBuilder().build(); resteasyClient.register(new ContentTypeResponseFilter()); resteasyClient.register(new BasicClientRequestFilter("dataimport", "dataimport")); - ResteasyWebTarget resteasyWebTarget = resteasyClient.target(serviceURI); + + ResteasyWebTarget resteasyWebTarget = (ResteasyWebTarget) resteasyClient.target(serviceURI); return (T) resteasyWebTarget.proxy(serviceInterfaceClass); } } diff --git a/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/JacqService.java b/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/JacqService.java index 6f119039..340a550d 100644 --- a/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/JacqService.java +++ b/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/JacqService.java @@ -1,7 +1,7 @@ package org.jacq.service.rest.names; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/rest") public class JacqService extends Application { diff --git a/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/impl/DataImportServiceImpl.java b/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/impl/DataImportServiceImpl.java index 0703b66e..1dfb5379 100644 --- a/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/impl/DataImportServiceImpl.java +++ b/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/impl/DataImportServiceImpl.java @@ -17,7 +17,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.model.dataimport.ImportFile; import org.jacq.common.rest.dataimport.DataImportService; import org.jacq.service.dataimport.manager.BromiMdbImportManager; diff --git a/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/impl/GatheringServiceImpl.java b/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/impl/GatheringServiceImpl.java index 325852f6..3cba0de7 100644 --- a/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/impl/GatheringServiceImpl.java +++ b/jacq-dataimport/src/main/java/org/jacq/service/rest/dataimport/impl/GatheringServiceImpl.java @@ -16,7 +16,7 @@ package org.jacq.service.rest.dataimport.impl; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.model.rest.LocationResult; import org.jacq.common.rest.GatheringService; import org.jacq.service.dataimport.manager.GatheringManager; diff --git a/jacq-dataimport/src/main/resources/META-INF/persistence.xml b/jacq-dataimport/src/main/resources/META-INF/persistence.xml index 586814c8..201ce8d9 100644 --- a/jacq-dataimport/src/main/resources/META-INF/persistence.xml +++ b/jacq-dataimport/src/main/resources/META-INF/persistence.xml @@ -1,5 +1,8 @@ - + java:/jacqDS @@ -8,14 +11,14 @@ false - - - - - - - - + + + + + + + + diff --git a/jacq-dataimport/src/main/webapp/WEB-INF/beans.xml b/jacq-dataimport/src/main/webapp/WEB-INF/beans.xml index ccf1976a..6c9b0739 100644 --- a/jacq-dataimport/src/main/webapp/WEB-INF/beans.xml +++ b/jacq-dataimport/src/main/webapp/WEB-INF/beans.xml @@ -1,5 +1,5 @@ - - - + \ No newline at end of file diff --git a/jacq-input/pom.xml b/jacq-input/pom.xml index c55bba20..7e1b2ce0 100644 --- a/jacq-input/pom.xml +++ b/jacq-input/pom.xml @@ -26,22 +26,30 @@ org.primefaces primefaces - 6.2 + 12.0.0 + jakarta + + + org.omnifaces + omnifaces + 4.3 org.primefaces.extensions primefaces-extensions - 6.2.3 + 12.0.9 + jakarta - org.omnifaces - omnifaces - 2.6.8 + org.webjars + font-awesome + 4.7.0 - org.glassfish.soteria - javax.security.enterprise - 1.0 + jakarta.security.enterprise + jakarta.security.enterprise-api + 3.0.0 + provided org.seleniumhq.selenium @@ -56,20 +64,20 @@ test - javax - javaee-api - 7.0 + jakarta.platform + jakarta.jakartaee-api + 9.1.0 provided org.apache.poi poi - 3.16 + 5.2.3 org.apache.poi poi-ooxml - 3.16 + 5.2.3 @@ -79,47 +87,14 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 - 1.8 - 1.8 - - ${endorsed.dir} - + 17 + 17 org.apache.maven.plugins maven-war-plugin - 2.3 - - false - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.6 - - - validate - - copy - - - ${endorsed.dir} - true - - - javax - javaee-endorsed-api - 7.0 - jar - - - - - nl.geodienstencentrum.maven @@ -128,14 +103,14 @@ - update-stylesheets + generate-resources update-stylesheets - src/main/webapp/resources/omega-layout/css + src/main/webapp/resources/saga-layout/css diff --git a/jacq-input/src/main/java/org/jacq/input/ApplicationManager.java b/jacq-input/src/main/java/org/jacq/input/ApplicationManager.java index a366ad01..e31e3eb9 100644 --- a/jacq-input/src/main/java/org/jacq/input/ApplicationManager.java +++ b/jacq-input/src/main/java/org/jacq/input/ApplicationManager.java @@ -18,11 +18,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import javax.annotation.ManagedBean; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Initialized; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.annotation.ManagedBean; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.rest.OrganisationService; import org.jacq.common.util.ServicesUtil; diff --git a/jacq-input/src/main/java/org/jacq/input/JacqPortalConfig.java b/jacq-input/src/main/java/org/jacq/input/JacqPortalConfig.java index 3a33bf40..d8241ffb 100644 --- a/jacq-input/src/main/java/org/jacq/input/JacqPortalConfig.java +++ b/jacq-input/src/main/java/org/jacq/input/JacqPortalConfig.java @@ -15,9 +15,9 @@ */ package org.jacq.input; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.ejb.Singleton; +import jakarta.annotation.ManagedBean; +import jakarta.annotation.PostConstruct; +import jakarta.ejb.Singleton; import org.jacq.common.manager.JacqConfig; import org.jacq.common.rest.PortalService; import org.jacq.common.util.ServicesUtil; diff --git a/jacq-input/src/main/java/org/jacq/input/SessionManager.java b/jacq-input/src/main/java/org/jacq/input/SessionManager.java index da831923..0e3a73e9 100644 --- a/jacq-input/src/main/java/org/jacq/input/SessionManager.java +++ b/jacq-input/src/main/java/org/jacq/input/SessionManager.java @@ -17,12 +17,12 @@ import java.io.Serializable; import java.util.Locale; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.enterprise.context.SessionScoped; -import javax.faces.context.FacesContext; -import javax.inject.Named; -import javax.servlet.http.HttpSession; +import jakarta.annotation.ManagedBean; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.SessionScoped; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Named; +import jakarta.servlet.http.HttpSession; import org.jacq.common.model.rest.UserResult; import org.jacq.input.view.DerivativeSearchModel; diff --git a/jacq-input/src/main/java/org/jacq/input/controller/IndexSeminumController.java b/jacq-input/src/main/java/org/jacq/input/controller/IndexSeminumController.java index 03bb764e..f90fa586 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/IndexSeminumController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/IndexSeminumController.java @@ -15,10 +15,10 @@ */ package org.jacq.input.controller; +import jakarta.inject.Named; import java.io.Serializable; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; +import jakarta.annotation.PostConstruct; +import jakarta.faces.view.ViewScoped; import org.jacq.common.util.ServicesUtil; import org.jacq.input.view.LazyIndexSeminumDataModel; import org.jacq.input.view.LazyIndexSeminumDownloadDataModel; @@ -27,7 +27,7 @@ * * @author fhafner */ -@ManagedBean +@Named @ViewScoped public class IndexSeminumController implements Serializable { diff --git a/jacq-input/src/main/java/org/jacq/input/controller/IndexSeminumEditController.java b/jacq-input/src/main/java/org/jacq/input/controller/IndexSeminumEditController.java index 9ff7af3f..1e53a9d9 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/IndexSeminumEditController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/IndexSeminumEditController.java @@ -15,10 +15,11 @@ */ package org.jacq.input.controller; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Inject; +import java.io.Serializable; import org.jacq.common.model.rest.IndexSeminumResult; import org.jacq.common.rest.IndexSeminumService; import org.jacq.common.util.ServicesUtil; @@ -27,9 +28,9 @@ * * @author fhafner */ -@ManagedBean +@Named @ViewScoped -public class IndexSeminumEditController { +public class IndexSeminumEditController implements Serializable { @Inject protected SessionController sessionController; diff --git a/jacq-input/src/main/java/org/jacq/input/controller/InventoryEditController.java b/jacq-input/src/main/java/org/jacq/input/controller/InventoryEditController.java index 4ae05ee4..a8155c60 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/InventoryEditController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/InventoryEditController.java @@ -15,30 +15,31 @@ */ package org.jacq.input.controller; +import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Base64; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Inject; import org.jacq.common.model.rest.InventoryResult; import org.jacq.common.model.rest.InventoryTypeResult; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.rest.InventoryService; import org.jacq.common.rest.OrganisationService; import org.jacq.common.util.ServicesUtil; -import org.primefaces.model.UploadedFile; +import org.primefaces.model.file.UploadedFile; /** * * @author fhafner */ -@ManagedBean +@Named @ViewScoped -public class InventoryEditController { +public class InventoryEditController implements Serializable { @Inject protected SessionController sessionController; @@ -75,7 +76,7 @@ public void init() { public String edit() { try { - this.inventory.setFileContent(new String(Base64.getEncoder().encode(this.file.getContents()), "ASCII")); + this.inventory.setFileContent(new String(Base64.getEncoder().encode(this.file.getContent()), "ASCII")); this.inventory.setSeparated(separated); this.inventory = this.inventoryService.save(this.inventory); diff --git a/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantController.java b/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantController.java index e8470c22..179028c2 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantController.java @@ -8,13 +8,12 @@ import org.jacq.input.SessionManager; import java.io.Serializable; import java.util.List; -import javax.annotation.PostConstruct; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ManagedProperty; -import javax.faces.bean.ViewScoped; -import javax.faces.context.FacesContext; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.faces.application.FacesMessage; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Inject; import org.jacq.common.model.rest.CultivarResult; import org.jacq.common.model.rest.LocationResult; import org.jacq.common.model.rest.OrganisationResult; @@ -34,7 +33,7 @@ * * @author wkoller */ -@ManagedBean +@Named @ViewScoped public class LivingPlantController implements Serializable, OrganisationSelectListener { @@ -60,7 +59,7 @@ public class LivingPlantController implements Serializable, OrganisationSelectLi protected Boolean downloadRender; - @ManagedProperty(value = "#{organisationHierarchicSelectController}") + @Inject protected OrganisationHierarchicSelectController organisationHierarchicSelectController; @PostConstruct diff --git a/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantEditController.java b/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantEditController.java index a101b8c4..0d834c3b 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantEditController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantEditController.java @@ -19,16 +19,15 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ManagedProperty; -import javax.faces.bean.ViewScoped; -import javax.faces.component.UIInput; -import javax.faces.context.FacesContext; -import javax.faces.model.SelectItem; -import javax.inject.Inject; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.faces.application.FacesMessage; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import jakarta.faces.component.UIInput; +import jakarta.faces.context.FacesContext; +import jakarta.faces.model.SelectItem; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.jacq.common.model.rest.AcquisitionSourceResult; import org.jacq.common.model.rest.AcquistionEventSourceResult; @@ -74,7 +73,7 @@ * * @author wkoller */ -@ManagedBean +@Named @ViewScoped public class LivingPlantEditController implements OrganisationSelectListener, Serializable { @@ -164,7 +163,7 @@ public class LivingPlantEditController implements OrganisationSelectListener, Se protected CultivarResult cultivarResult; - @ManagedProperty(value = "#{organisationHierarchicSelectController}") + @Inject() protected OrganisationHierarchicSelectController organisationHierarchicSelectController; @PostConstruct @@ -513,7 +512,11 @@ public StreamedContent getWorkLabel() { Response response = this.labelService.getWork(this.livingPlantResult.getType(), this.livingPlantResult.getDerivativeId()); byte[] binaryStream = response.readEntity(byte[].class); - return new DefaultStreamedContent(this.labelService.getWork(this.livingPlantResult.getType(), this.livingPlantResult.getDerivativeId()).readEntity(InputStream.class), LabelService.APPLICATION_PDF, "work_label.pdf"); + return DefaultStreamedContent.builder() + .name("work_label.pdf") + .contentType(LabelService.APPLICATION_PDF) + .stream(() -> this.labelService.getWork(this.livingPlantResult.getType(), this.livingPlantResult.getDerivativeId()).readEntity(InputStream.class)) + .build(); } /** diff --git a/jacq-input/src/main/java/org/jacq/input/controller/LoginController.java b/jacq-input/src/main/java/org/jacq/input/controller/LoginController.java index c1d52c73..0011e829 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/LoginController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/LoginController.java @@ -15,25 +15,26 @@ */ package org.jacq.input.controller; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; + +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.RequestScoped; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.security.enterprise.AuthenticationStatus; +import jakarta.security.enterprise.SecurityContext; +import jakarta.security.enterprise.authentication.mechanism.http.AuthenticationParameters; +import jakarta.security.enterprise.credential.Credential; +import jakarta.security.enterprise.credential.UsernamePasswordCredential; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ResourceBundle; -import javax.annotation.PostConstruct; -import org.jacq.input.SessionManager; -import javax.faces.application.FacesMessage; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.context.FacesContext; -import javax.inject.Inject; -import javax.security.enterprise.AuthenticationStatus; -import javax.security.enterprise.SecurityContext; -import javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters; -import javax.security.enterprise.credential.Credential; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.jacq.common.manager.JacqConfig; import org.jacq.input.ApplicationManager; +import org.jacq.input.SessionManager; /** * Controller for handling logins of users @@ -41,7 +42,7 @@ * @author wkoller */ @RequestScoped -@ManagedBean +@Named public class LoginController { @Inject diff --git a/jacq-input/src/main/java/org/jacq/input/controller/OrganisationAccessController.java b/jacq-input/src/main/java/org/jacq/input/controller/OrganisationAccessController.java index 0bd07d4f..c15a8c4b 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/OrganisationAccessController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/OrganisationAccessController.java @@ -15,9 +15,10 @@ */ package org.jacq.input.controller; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import java.io.Serializable; import org.jacq.common.model.rest.AccessOrganisationResult; import org.jacq.common.rest.AuthorizationService; import org.jacq.common.util.ServicesUtil; @@ -27,9 +28,9 @@ * * @author fhafner */ -@ManagedBean +@Named @ViewScoped -public class OrganisationAccessController { +public class OrganisationAccessController implements Serializable { protected LazyOrganisationAccessDataModel dataModel; diff --git a/jacq-input/src/main/java/org/jacq/input/controller/OrganisationController.java b/jacq-input/src/main/java/org/jacq/input/controller/OrganisationController.java index 19358b3a..6451a38e 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/OrganisationController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/OrganisationController.java @@ -8,9 +8,9 @@ import org.jacq.input.view.LazyOrganisationDataModel; import java.io.Serializable; import java.util.Date; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; import org.jacq.common.util.ServicesUtil; /** @@ -18,7 +18,7 @@ * * @author fhafner */ -@ManagedBean +@Named @ViewScoped public class OrganisationController implements Serializable { diff --git a/jacq-input/src/main/java/org/jacq/input/controller/OrganisationEditController.java b/jacq-input/src/main/java/org/jacq/input/controller/OrganisationEditController.java index 7361f671..dc1c062e 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/OrganisationEditController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/OrganisationEditController.java @@ -15,13 +15,13 @@ */ package org.jacq.input.controller; +import java.io.Serializable; import java.util.List; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ManagedProperty; -import javax.faces.bean.ViewScoped; -import javax.faces.context.FacesContext; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Inject; import org.jacq.common.model.rest.RoleResult; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.model.rest.UserResult; @@ -37,9 +37,9 @@ * * @author wkoller */ -@ManagedBean +@Named @ViewScoped -public class OrganisationEditController implements OrganisationSelectListener { +public class OrganisationEditController implements Serializable, OrganisationSelectListener { @Inject protected SessionController sessionController; @@ -64,7 +64,7 @@ public class OrganisationEditController implements OrganisationSelectListener { protected List roles; - @ManagedProperty(value = "#{organisationHierarchicSelectController}") + @Inject protected OrganisationHierarchicSelectController organisationHierarchicSelectController; @PostConstruct diff --git a/jacq-input/src/main/java/org/jacq/input/controller/OrganisationHierarchicSelectController.java b/jacq-input/src/main/java/org/jacq/input/controller/OrganisationHierarchicSelectController.java index 49beae94..81b372dc 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/OrganisationHierarchicSelectController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/OrganisationHierarchicSelectController.java @@ -18,10 +18,10 @@ import java.io.Serializable; import java.util.HashMap; import java.util.List; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Inject; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.input.ApplicationManager; import org.jacq.input.listener.OrganisationSelectListener; @@ -32,7 +32,7 @@ * * @author fhafner */ -@ManagedBean +@Named @ViewScoped public class OrganisationHierarchicSelectController implements Serializable { diff --git a/jacq-input/src/main/java/org/jacq/input/controller/SeedExchangeController.java b/jacq-input/src/main/java/org/jacq/input/controller/SeedExchangeController.java index 4df52e01..69d8de72 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/SeedExchangeController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/SeedExchangeController.java @@ -7,9 +7,9 @@ import java.io.Serializable; import java.util.List; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; import org.jacq.common.model.rest.SeedOrderResult; import org.jacq.common.rest.SeedExchangeService; import org.jacq.common.util.ServicesUtil; @@ -19,7 +19,7 @@ * @author wkoller */ @ViewScoped -@ManagedBean +@Named public class SeedExchangeController implements Serializable { protected SeedExchangeService seedExchangeService; diff --git a/jacq-input/src/main/java/org/jacq/input/controller/SeedExchangeEditController.java b/jacq-input/src/main/java/org/jacq/input/controller/SeedExchangeEditController.java index 33cd4cf9..1839222f 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/SeedExchangeEditController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/SeedExchangeEditController.java @@ -8,11 +8,10 @@ import java.io.InputStream; import java.io.Serializable; import java.util.List; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ManagedProperty; -import javax.faces.bean.ViewScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Inject; import org.jacq.common.model.jpa.custom.BotanicalObjectDerivative; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.model.rest.SeedOrderResult; @@ -30,7 +29,7 @@ * @author wkoller */ @ViewScoped -@ManagedBean +@Named public class SeedExchangeEditController implements Serializable { protected Long seedOrderId; @@ -47,7 +46,7 @@ public class SeedExchangeEditController implements Serializable { */ protected LabelService labelService; - @ManagedProperty(value = "#{livingPlantController}") + @Inject protected LivingPlantController livingPlantController; @PostConstruct @@ -87,7 +86,11 @@ public void save() { * @return */ public StreamedContent getSeedOrder() { - return new DefaultStreamedContent(this.labelService.getSeedOrder(this.seedOrderResult.getSeedOrderId()).readEntity(InputStream.class), LabelService.APPLICATION_PDF, "seed_exchange_order.pdf"); + return DefaultStreamedContent.builder() + .name("seed_exchange_order.pdf") + .contentType(LabelService.APPLICATION_PDF) + .stream(() -> this.labelService.getSeedOrder(this.seedOrderResult.getSeedOrderId()).readEntity(InputStream.class)) + .build(); } public Long getSeedOrderId() { diff --git a/jacq-input/src/main/java/org/jacq/input/controller/SessionController.java b/jacq-input/src/main/java/org/jacq/input/controller/SessionController.java index 2be68ea6..3b4cca10 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/SessionController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/SessionController.java @@ -17,13 +17,13 @@ import java.io.Serializable; import java.util.ResourceBundle; -import javax.annotation.PostConstruct; -import javax.faces.application.FacesMessage; +import jakarta.annotation.PostConstruct; +import jakarta.faces.application.FacesMessage; import org.jacq.input.SessionManager; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; -import javax.faces.context.FacesContext; -import javax.inject.Inject; +import jakarta.inject.Named; +import jakarta.enterprise.context.SessionScoped; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Inject; import org.jacq.common.manager.JacqConfig; import org.jacq.input.ApplicationManager; @@ -32,7 +32,7 @@ * * @author wkoller */ -@ManagedBean +@Named @SessionScoped public class SessionController implements Serializable { diff --git a/jacq-input/src/main/java/org/jacq/input/controller/TreeRecordFileController.java b/jacq-input/src/main/java/org/jacq/input/controller/TreeRecordFileController.java index 2a7e21be..619129a2 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/TreeRecordFileController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/TreeRecordFileController.java @@ -6,9 +6,9 @@ package org.jacq.input.controller; import java.io.Serializable; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; import org.jacq.common.util.ServicesUtil; import org.jacq.input.view.LazyTreeRecordFileDataModel; @@ -17,7 +17,7 @@ * * @author fhafner */ -@ManagedBean +@Named @ViewScoped public class TreeRecordFileController implements Serializable { diff --git a/jacq-input/src/main/java/org/jacq/input/controller/TreeRecordFileEditController.java b/jacq-input/src/main/java/org/jacq/input/controller/TreeRecordFileEditController.java index b80cb55f..b321371e 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/TreeRecordFileEditController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/TreeRecordFileEditController.java @@ -15,26 +15,27 @@ */ package org.jacq.input.controller; +import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Base64; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Inject; import org.jacq.common.model.rest.TreeRecordFileResult; import org.jacq.common.rest.TreeRecordFileService; import org.jacq.common.util.ServicesUtil; -import org.primefaces.model.UploadedFile; +import org.primefaces.model.file.UploadedFile; /** * * @author fhafner */ -@ManagedBean +@Named @ViewScoped -public class TreeRecordFileEditController { +public class TreeRecordFileEditController implements Serializable { @Inject protected SessionController sessionController; @@ -72,7 +73,7 @@ public TreeRecordFileResult getTreeRecordFile() { public String edit() { try { - this.treeRecordFile.setFileContent(new String(Base64.getEncoder().encode(this.file.getContents()), "ASCII")); + this.treeRecordFile.setFileContent(new String(Base64.getEncoder().encode(this.file.getContent()), "ASCII")); this.treeRecordFile = this.treeRecordFileService.save(this.treeRecordFile); } catch (UnsupportedEncodingException ex) { diff --git a/jacq-input/src/main/java/org/jacq/input/controller/UserController.java b/jacq-input/src/main/java/org/jacq/input/controller/UserController.java index cf1a90df..3e27ab2a 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/UserController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/UserController.java @@ -16,9 +16,9 @@ package org.jacq.input.controller; import java.io.Serializable; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; import org.jacq.common.util.ServicesUtil; import org.jacq.input.view.LazyUserDataModel; @@ -27,7 +27,7 @@ * * @author fhafner */ -@ManagedBean +@Named @ViewScoped public class UserController implements Serializable { diff --git a/jacq-input/src/main/java/org/jacq/input/controller/UserEditController.java b/jacq-input/src/main/java/org/jacq/input/controller/UserEditController.java index 460e323b..a5ebff98 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/UserEditController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/UserEditController.java @@ -15,13 +15,14 @@ */ package org.jacq.input.controller; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.faces.model.SelectItem; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import jakarta.faces.model.SelectItem; +import jakarta.inject.Inject; import org.jacq.common.model.rest.EmploymentTypeResult; import org.jacq.common.model.rest.RoleResult; import org.jacq.common.model.rest.OrganisationResult; @@ -35,9 +36,9 @@ * * @author fhafner */ -@ManagedBean +@Named @ViewScoped -public class UserEditController { +public class UserEditController implements Serializable { @Inject protected SessionController sessionController; @@ -77,7 +78,7 @@ public void init() { List roleResults = this.userService.findAllRole(); this.roles = new ArrayList<>(); for (RoleResult role : roleResults) { - this.roles.add(new SelectItem(role.getRoleId(), role.getName())); + this.roles.add(new SelectItem(role.getRoleId().toString(), role.getName())); } this.selectedRoleIds = new ArrayList<>(); diff --git a/jacq-input/src/main/java/org/jacq/input/controller/UserUpdateController.java b/jacq-input/src/main/java/org/jacq/input/controller/UserUpdateController.java index 3c0f4a0a..d5c057d9 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/UserUpdateController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/UserUpdateController.java @@ -15,10 +15,11 @@ */ package org.jacq.input.controller; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Inject; +import java.io.Serializable; import org.jacq.common.model.rest.UserResult; import org.jacq.common.rest.UserService; import org.jacq.common.util.ServicesUtil; @@ -27,9 +28,9 @@ * * @author fhafner */ -@ManagedBean +@Named @ViewScoped -public class UserUpdateController { +public class UserUpdateController implements Serializable { @Inject protected SessionController sessionController; diff --git a/jacq-input/src/main/java/org/jacq/input/controller/VegetativeEditController.java b/jacq-input/src/main/java/org/jacq/input/controller/VegetativeEditController.java index a1b9f4dd..0d03791a 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/VegetativeEditController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/VegetativeEditController.java @@ -17,10 +17,10 @@ import java.io.Serializable; import java.util.List; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; +import jakarta.faces.view.ViewScoped; +import jakarta.ws.rs.core.Response; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.model.rest.PhenologyResult; import org.jacq.common.model.rest.SeparationResult; @@ -33,7 +33,7 @@ * * @author wkoller */ -@ManagedBean +@Named @ViewScoped public class VegetativeEditController implements Serializable { diff --git a/jacq-input/src/main/java/org/jacq/input/faces/UpdatePhaseListener.java b/jacq-input/src/main/java/org/jacq/input/faces/UpdatePhaseListener.java index 0d1232f6..30da4fec 100644 --- a/jacq-input/src/main/java/org/jacq/input/faces/UpdatePhaseListener.java +++ b/jacq-input/src/main/java/org/jacq/input/faces/UpdatePhaseListener.java @@ -5,10 +5,10 @@ */ package org.jacq.input.faces; -import javax.faces.context.FacesContext; -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PhaseListener; +import jakarta.faces.context.FacesContext; +import jakarta.faces.event.PhaseEvent; +import jakarta.faces.event.PhaseId; +import jakarta.faces.event.PhaseListener; /** * diff --git a/jacq-input/src/main/java/org/jacq/input/security/BasicClientRequestFilter.java b/jacq-input/src/main/java/org/jacq/input/security/BasicClientRequestFilter.java index 32a6add2..5b6199f7 100644 --- a/jacq-input/src/main/java/org/jacq/input/security/BasicClientRequestFilter.java +++ b/jacq-input/src/main/java/org/jacq/input/security/BasicClientRequestFilter.java @@ -18,13 +18,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.CDI; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.ext.Provider; import org.jacq.input.SessionManager; /** diff --git a/jacq-input/src/main/java/org/jacq/input/security/InputIdentityStore.java b/jacq-input/src/main/java/org/jacq/input/security/InputIdentityStore.java index c02be20a..eee9379d 100644 --- a/jacq-input/src/main/java/org/jacq/input/security/InputIdentityStore.java +++ b/jacq-input/src/main/java/org/jacq/input/security/InputIdentityStore.java @@ -17,15 +17,15 @@ import org.jacq.common.security.JacqCallerPrincipal; import java.util.HashSet; -import javax.annotation.PostConstruct; -import javax.annotation.security.DeclareRoles; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.security.enterprise.authentication.mechanism.http.CustomFormAuthenticationMechanismDefinition; -import javax.security.enterprise.authentication.mechanism.http.LoginToContinue; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.security.DeclareRoles; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.security.enterprise.authentication.mechanism.http.CustomFormAuthenticationMechanismDefinition; +import jakarta.security.enterprise.authentication.mechanism.http.LoginToContinue; +import jakarta.security.enterprise.credential.UsernamePasswordCredential; +import jakarta.security.enterprise.identitystore.CredentialValidationResult; +import jakarta.security.enterprise.identitystore.IdentityStore; import org.apache.commons.codec.binary.Base64; import org.jacq.common.model.rest.RoleResult; import org.jacq.common.model.rest.UserResult; diff --git a/jacq-input/src/main/java/org/jacq/input/view/LazyDerivativeDataModel.java b/jacq-input/src/main/java/org/jacq/input/view/LazyDerivativeDataModel.java index 77cbadd3..09c72d04 100644 --- a/jacq-input/src/main/java/org/jacq/input/view/LazyDerivativeDataModel.java +++ b/jacq-input/src/main/java/org/jacq/input/view/LazyDerivativeDataModel.java @@ -18,12 +18,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; import org.apache.commons.lang3.StringUtils; import org.jacq.common.model.jpa.custom.BotanicalObjectDerivative; import org.jacq.common.model.rest.OrderDirection; import org.jacq.common.rest.DerivativeService; import org.jacq.input.controller.LivingPlantController; +import org.primefaces.model.FilterMeta; import org.primefaces.model.LazyDataModel; +import org.primefaces.model.SortMeta; import org.primefaces.model.SortOrder; /** @@ -77,15 +81,22 @@ public BotanicalObjectDerivative getRowData(String rowKey) { } @Override - public Object getRowKey(BotanicalObjectDerivative derivativeResult) { - return derivativeResult.getDerivativeId(); + public String getRowKey(BotanicalObjectDerivative derivativeResult) { + return derivativeResult.getDerivativeId().toString(); } @Override - public List load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { + public int count(Map filters) { + return this.getRowCount(); + } + @Override + public List load(int first, int pageSize, Map sortFields, + Map filters) { + Optional> sortField = sortFields.entrySet().stream().findFirst(); + Optional sortMeta = sortField.map(Entry::getValue); // try to parse the id filter - this.derivativeSearchModel.setId((filters.get(FILTER_ID) == null) ? null : Long.valueOf(String.valueOf(filters.get(FILTER_ID)))); + this.derivativeSearchModel.setId((filters.get(FILTER_ID) == null) ? null : Long.valueOf(String.valueOf(filters.get(FILTER_ID).getFilterValue()))); if (this.derivativeSearchModel.getSeparated() == 1) { this.derivativeSearchModel.setSeparatedFilter(true); @@ -119,7 +130,8 @@ public List load(int first, int pageSize, String sort } // quote type filter and set to null if empty - this.derivativeSearchModel.setType(String.valueOf(filters.get(FILTER_TYPE))); + this.derivativeSearchModel.setType(String.valueOf(Optional.ofNullable(filters.get(FILTER_TYPE)).map( + FilterMeta::getField).orElse(null))); if (StringUtils.isEmpty(this.derivativeSearchModel.getType()) || FILTER_TYPE_EMPTY.equalsIgnoreCase(this.derivativeSearchModel.getType()) || LivingPlantController.TYPE_ALL.equalsIgnoreCase(this.derivativeSearchModel.getType())) { @@ -133,7 +145,21 @@ public List load(int first, int pageSize, String sort List results = new ArrayList<>(); if (rowCount > 0) { - results = this.derivativeService.find(this.derivativeSearchModel.getType(), this.derivativeSearchModel.getId(), this.derivativeSearchModel.getPlaceNumber(), this.derivativeSearchModel.getAccessionNumber(), this.derivativeSearchModel.getSeparatedFilter(), this.derivativeSearchModel.getScientificNameId(), this.derivativeSearchModel.getOrganisationId(), this.derivativeSearchModel.getHierarchic(), this.derivativeSearchModel.getIndexSeminumFilter(), this.derivativeSearchModel.getGatheringLocationName(), (this.derivativeSearchModel.getExhibition() != null) ? this.derivativeSearchModel.getExhibition() : null, (this.derivativeSearchModel.getWorking() != null) ? this.derivativeSearchModel.getWorking() : null, (this.derivativeSearchModel.getSelectedCultivar() != null) ? this.derivativeSearchModel.getSelectedCultivar().getCultivar() : null, this.derivativeSearchModel.getClassification(), sortField, (sortOrder.equals(SortOrder.DESCENDING)) ? OrderDirection.DESC : OrderDirection.ASC, first, pageSize); + results = this.derivativeService.find(this.derivativeSearchModel.getType(), + this.derivativeSearchModel.getId(), this.derivativeSearchModel.getPlaceNumber(), + this.derivativeSearchModel.getAccessionNumber(), + this.derivativeSearchModel.getSeparatedFilter(), + this.derivativeSearchModel.getScientificNameId(), + this.derivativeSearchModel.getOrganisationId(), + this.derivativeSearchModel.getHierarchic(), + this.derivativeSearchModel.getIndexSeminumFilter(), + this.derivativeSearchModel.getGatheringLocationName(), + (this.derivativeSearchModel.getExhibition() != null) ? this.derivativeSearchModel.getExhibition() : null, + (this.derivativeSearchModel.getWorking() != null) ? this.derivativeSearchModel.getWorking() : null, + (this.derivativeSearchModel.getSelectedCultivar() != null) ? this.derivativeSearchModel.getSelectedCultivar().getCultivar() : null, + this.derivativeSearchModel.getClassification(), + sortMeta.map(SortMeta::getField).orElse(null), + sortMeta.map(SortMeta::getOrder).orElse(SortOrder.ASCENDING).equals(SortOrder.DESCENDING) ? OrderDirection.DESC : OrderDirection.ASC, first, pageSize); } return results; diff --git a/jacq-input/src/main/java/org/jacq/input/view/LazyDerivativeDownloadDataModel.java b/jacq-input/src/main/java/org/jacq/input/view/LazyDerivativeDownloadDataModel.java index 2eb0d447..29160899 100644 --- a/jacq-input/src/main/java/org/jacq/input/view/LazyDerivativeDownloadDataModel.java +++ b/jacq-input/src/main/java/org/jacq/input/view/LazyDerivativeDownloadDataModel.java @@ -18,10 +18,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; import org.jacq.common.model.rest.BotanicalObjectDownloadResult; import org.jacq.common.model.rest.OrderDirection; import org.jacq.common.rest.DerivativeService; +import org.primefaces.model.FilterMeta; import org.primefaces.model.LazyDataModel; +import org.primefaces.model.SortMeta; import org.primefaces.model.SortOrder; /** @@ -68,20 +72,68 @@ public BotanicalObjectDownloadResult getRowData(String rowKey) { } @Override - public Object getRowKey(BotanicalObjectDownloadResult botanicalObjectDownloadResult) { - return botanicalObjectDownloadResult.getBotanicalObjectId(); + public String getRowKey(BotanicalObjectDownloadResult botanicalObjectDownloadResult) { + return botanicalObjectDownloadResult.getBotanicalObjectId().toString(); } @Override - public List load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { + public int count(Map filters) { + return this.getRowCount(); + } + + @Override + public List load(int first, int pageSize, + Map sortFields, + Map filters) { + Optional> sortField = sortFields.entrySet().stream().findFirst(); + Optional sortMeta = sortField.map(Entry::getValue); // get count first - int rowCount = this.derivativeService.count(this.lazyDerivativeDataModel.getDerivativeSearchModel().getType(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getId(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getPlaceNumber(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getAccessionNumber(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getSeparatedFilter(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getScientificNameId(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getOrganisationId(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getHierarchic(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getIndexSeminumFilter(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getGatheringLocationName(), (this.lazyDerivativeDataModel.getDerivativeSearchModel().getExhibition() != null) ? this.lazyDerivativeDataModel.getDerivativeSearchModel().getExhibition() : null, (this.lazyDerivativeDataModel.getDerivativeSearchModel().getWorking() != null) ? this.lazyDerivativeDataModel.getDerivativeSearchModel().getWorking() : null, (this.lazyDerivativeDataModel.getDerivativeSearchModel().getSelectedCultivar() != null) ? this.lazyDerivativeDataModel.getDerivativeSearchModel().getSelectedCultivar().getCultivar() : null, this.lazyDerivativeDataModel.getDerivativeSearchModel().getClassification()); + int rowCount = this.derivativeService.count( + this.lazyDerivativeDataModel.getDerivativeSearchModel().getType(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getId(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getPlaceNumber(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getAccessionNumber(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getSeparatedFilter(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getScientificNameId(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getOrganisationId(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getHierarchic(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getIndexSeminumFilter(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getGatheringLocationName(), + (this.lazyDerivativeDataModel.getDerivativeSearchModel().getExhibition() != null) + ? this.lazyDerivativeDataModel.getDerivativeSearchModel().getExhibition() : null, + (this.lazyDerivativeDataModel.getDerivativeSearchModel().getWorking() != null) + ? this.lazyDerivativeDataModel.getDerivativeSearchModel().getWorking() : null, + (this.lazyDerivativeDataModel.getDerivativeSearchModel().getSelectedCultivar() != null) + ? this.lazyDerivativeDataModel.getDerivativeSearchModel().getSelectedCultivar() + .getCultivar() : null, + this.lazyDerivativeDataModel.getDerivativeSearchModel().getClassification()); this.setRowCount(rowCount); List results = new ArrayList<>(); if (rowCount > 0) { - results = this.derivativeService.downloadFind(this.lazyDerivativeDataModel.getDerivativeSearchModel().getType(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getId(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getPlaceNumber(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getAccessionNumber(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getSeparatedFilter(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getScientificNameId(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getOrganisationId(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getHierarchic(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getIndexSeminumFilter(), this.lazyDerivativeDataModel.getDerivativeSearchModel().getGatheringLocationName(), (this.lazyDerivativeDataModel.getDerivativeSearchModel().getExhibition() != null) ? this.lazyDerivativeDataModel.getDerivativeSearchModel().getExhibition() : null, (this.lazyDerivativeDataModel.getDerivativeSearchModel().getWorking() != null) ? this.lazyDerivativeDataModel.getDerivativeSearchModel().getWorking() : null, (this.lazyDerivativeDataModel.getDerivativeSearchModel().getSelectedCultivar() != null) ? this.lazyDerivativeDataModel.getDerivativeSearchModel().getSelectedCultivar().getCultivar() : null, this.lazyDerivativeDataModel.getDerivativeSearchModel().getClassification(), sortField, (sortOrder.equals(SortOrder.DESCENDING)) ? OrderDirection.DESC : OrderDirection.ASC, first, pageSize); + results = this.derivativeService.downloadFind( + this.lazyDerivativeDataModel.getDerivativeSearchModel().getType(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getId(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getPlaceNumber(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getAccessionNumber(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getSeparatedFilter(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getScientificNameId(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getOrganisationId(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getHierarchic(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getIndexSeminumFilter(), + this.lazyDerivativeDataModel.getDerivativeSearchModel().getGatheringLocationName(), + (this.lazyDerivativeDataModel.getDerivativeSearchModel().getExhibition() != null) + ? this.lazyDerivativeDataModel.getDerivativeSearchModel().getExhibition() + : null, + (this.lazyDerivativeDataModel.getDerivativeSearchModel().getWorking() != null) + ? this.lazyDerivativeDataModel.getDerivativeSearchModel().getWorking() : null, + (this.lazyDerivativeDataModel.getDerivativeSearchModel().getSelectedCultivar() + != null) ? this.lazyDerivativeDataModel.getDerivativeSearchModel() + .getSelectedCultivar().getCultivar() : null, + this.lazyDerivativeDataModel.getDerivativeSearchModel().getClassification(), + sortMeta.map(SortMeta::getField).orElse(null), + sortMeta.map(SortMeta::getOrder).orElse(SortOrder.ASCENDING).equals(SortOrder.DESCENDING) ? OrderDirection.DESC : OrderDirection.ASC, first, pageSize); } return results; diff --git a/jacq-input/src/main/java/org/jacq/input/view/LazyIndexSeminumDataModel.java b/jacq-input/src/main/java/org/jacq/input/view/LazyIndexSeminumDataModel.java index f8d13931..0538f83f 100644 --- a/jacq-input/src/main/java/org/jacq/input/view/LazyIndexSeminumDataModel.java +++ b/jacq-input/src/main/java/org/jacq/input/view/LazyIndexSeminumDataModel.java @@ -20,8 +20,9 @@ import java.util.Map; import org.jacq.common.model.rest.IndexSeminumResult; import org.jacq.common.rest.IndexSeminumService; +import org.primefaces.model.FilterMeta; import org.primefaces.model.LazyDataModel; -import org.primefaces.model.SortOrder; +import org.primefaces.model.SortMeta; /** * @@ -63,12 +64,19 @@ public IndexSeminumResult getRowData(String rowKey) { } @Override - public Object getRowKey(IndexSeminumResult indexSeminumResult) { - return indexSeminumResult.getIndexSeminumRevisionId(); + public String getRowKey(IndexSeminumResult indexSeminumResult) { + return indexSeminumResult.getIndexSeminumRevisionId().toString(); } @Override - public List load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { + public int count(Map filters) { + return this.getRowCount(); + } + + @Override + public List load(int first, int pageSize, + Map sortFields, + Map filters) { // get count first int rowCount = this.indexSeminumService.searchCount(); diff --git a/jacq-input/src/main/java/org/jacq/input/view/LazyIndexSeminumDownloadDataModel.java b/jacq-input/src/main/java/org/jacq/input/view/LazyIndexSeminumDownloadDataModel.java index e4e7814e..70fc3f46 100644 --- a/jacq-input/src/main/java/org/jacq/input/view/LazyIndexSeminumDownloadDataModel.java +++ b/jacq-input/src/main/java/org/jacq/input/view/LazyIndexSeminumDownloadDataModel.java @@ -20,8 +20,9 @@ import java.util.Map; import org.jacq.common.model.rest.IndexSeminumDownloadResult; import org.jacq.common.rest.IndexSeminumService; +import org.primefaces.model.FilterMeta; import org.primefaces.model.LazyDataModel; -import org.primefaces.model.SortOrder; +import org.primefaces.model.SortMeta; /** * @@ -67,12 +68,19 @@ public IndexSeminumDownloadResult getRowData(String rowKey) { } @Override - public Object getRowKey(IndexSeminumDownloadResult indexSeminumDownloadResult) { - return indexSeminumDownloadResult.getIndexSeminumContentId(); + public String getRowKey(IndexSeminumDownloadResult indexSeminumDownloadResult) { + return indexSeminumDownloadResult.getIndexSeminumContentId().toString(); } @Override - public List load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { + public int count(Map filters) { + return this.getRowCount(); + } + + @Override + public List load(int first, int pageSize, + Map sortFields, + Map filters) { // get count first int rowCount = this.indexSeminumService.searchCountContent(indexSeminumRevisionId); diff --git a/jacq-input/src/main/java/org/jacq/input/view/LazyOrganisationAccessDataModel.java b/jacq-input/src/main/java/org/jacq/input/view/LazyOrganisationAccessDataModel.java index f1162101..2c81a1b3 100644 --- a/jacq-input/src/main/java/org/jacq/input/view/LazyOrganisationAccessDataModel.java +++ b/jacq-input/src/main/java/org/jacq/input/view/LazyOrganisationAccessDataModel.java @@ -21,8 +21,9 @@ import java.util.Map; import org.jacq.common.model.rest.AccessOrganisationResult; import org.jacq.common.rest.AuthorizationService; +import org.primefaces.model.FilterMeta; import org.primefaces.model.LazyDataModel; -import org.primefaces.model.SortOrder; +import org.primefaces.model.SortMeta; /** * @@ -75,12 +76,19 @@ public AccessOrganisationResult getRowData(String rowKey) { } @Override - public Object getRowKey(AccessOrganisationResult accessOrganisationResult) { - return accessOrganisationResult.getId(); + public String getRowKey(AccessOrganisationResult accessOrganisationResult) { + return accessOrganisationResult.getId().toString(); } @Override - public List load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { + public int count(Map filters) { + return this.getRowCount(); + } + + @Override + public List load(int first, int pageSize, + Map sortFields, + Map filters) { // get count first int rowCount = this.authorizationService.searchCount(this.Id, this.username, this.birthdate, this.userType, this.employmentType, this.organisationDescription, this.accessOrganisationId, this.allowDeny, this.userId, this.organisationId); diff --git a/jacq-input/src/main/java/org/jacq/input/view/LazyOrganisationDataModel.java b/jacq-input/src/main/java/org/jacq/input/view/LazyOrganisationDataModel.java index aaf11cc1..ae40d0d4 100644 --- a/jacq-input/src/main/java/org/jacq/input/view/LazyOrganisationDataModel.java +++ b/jacq-input/src/main/java/org/jacq/input/view/LazyOrganisationDataModel.java @@ -20,8 +20,9 @@ import java.util.Map; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.rest.OrganisationService; +import org.primefaces.model.FilterMeta; import org.primefaces.model.LazyDataModel; -import org.primefaces.model.SortOrder; +import org.primefaces.model.SortMeta; /** * Lazy loading data model for botanical object searches @@ -66,19 +67,26 @@ public OrganisationResult getRowData(String rowKey) { } @Override - public Object getRowKey(OrganisationResult organisationResult) { - return organisationResult.getOrganisationId(); + public String getRowKey(OrganisationResult organisationResult) { + return organisationResult.getOrganisationId().toString(); } @Override - public List load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { + public int count(Map filters) { + return this.getRowCount(); + } + + @Override + public List load(int first, int pageSize, + Map sortFields, + Map filters) { //Check if Greenhouse is true or False, All = null Boolean greenhouse = null; if (filters.get("greenhouse") != null) { - if (String.valueOf(filters.get("greenhouse")).equals("false")) { + if (String.valueOf(filters.get("greenhouse").getFilterValue()).equals("false")) { greenhouse = false; - } else if (String.valueOf(filters.get("greenhouse")).equals("true")) { + } else if (String.valueOf(filters.get("greenhouse").getFilterValue()).equals("true")) { greenhouse = true; } else { greenhouse = null; @@ -86,12 +94,30 @@ public List load(int first, int pageSize, String sortField, } // get count first - int rowCount = this.organisationService.searchCount((filters.get("organisationId") != null) ? Long.parseLong(filters.get("organisationId").toString()) : null, filters.get("description") != null ? filters.get("description").toString() : null, filters.get("department") != null ? filters.get("department").toString() : null, greenhouse, filters.get("ipenCode") != null ? filters.get("ipenCode").toString() : null, filters.get("parentOrganisationDescription") != null ? filters.get("parentOrganisationDescription").toString() : null, filters.get("gardener") != null ? filters.get("gardener").toString() : null); + int rowCount = this.organisationService.searchCount( + (filters.get("organisationId") != null) ? Long.parseLong( + filters.get("organisationId").getFilterValue().toString()) : null, + filters.get("description") != null ? filters.get("description").getFilterValue().toString() : null, + filters.get("department") != null ? filters.get("department").getFilterValue().toString() : null, + greenhouse, filters.get("ipenCode") != null ? filters.get("ipenCode").getFilterValue().toString() : null, + filters.get("parentOrganisationDescription") != null ? filters.get( + "parentOrganisationDescription").getFilterValue().toString() : null, + filters.get("gardener") != null ? filters.get("gardener").getFilterValue().toString() : null); this.setRowCount(rowCount); List results = new ArrayList<>(); if (rowCount > 0) { - results = this.organisationService.search(filters.get("organisationId") != null ? Long.parseLong(filters.get("organisationId").toString()) : null, filters.get("description") != null ? filters.get("description").toString() : null, filters.get("department") != null ? filters.get("department").toString() : null, greenhouse, filters.get("ipenCode") != null ? filters.get("ipenCode").toString() : null, filters.get("parentOrganisationDescription") != null ? filters.get("parentOrganisationDescription").toString() : null, filters.get("gardener") != null ? filters.get("gardener").toString() : null, first, pageSize + results = this.organisationService.search( + filters.get("organisationId") != null ? Long.parseLong( + filters.get("organisationId").toString()) : null, + filters.get("description") != null ? filters.get("description").getFilterValue().toString() : null, + filters.get("department") != null ? filters.get("department").getFilterValue().toString() : null, + greenhouse, + filters.get("ipenCode") != null ? filters.get("ipenCode").getFilterValue().toString() : null, + filters.get("parentOrganisationDescription") != null ? filters.get( + "parentOrganisationDescription").getFilterValue().toString() : null, + filters.get("gardener") != null ? filters.get("gardener").getFilterValue().toString() : null, first, + pageSize ); } diff --git a/jacq-input/src/main/java/org/jacq/input/view/LazyTreeRecordFileDataModel.java b/jacq-input/src/main/java/org/jacq/input/view/LazyTreeRecordFileDataModel.java index 692d9d63..3d418d66 100644 --- a/jacq-input/src/main/java/org/jacq/input/view/LazyTreeRecordFileDataModel.java +++ b/jacq-input/src/main/java/org/jacq/input/view/LazyTreeRecordFileDataModel.java @@ -16,14 +16,13 @@ package org.jacq.input.view; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; import java.util.List; import java.util.Map; import org.jacq.common.model.rest.TreeRecordFileResult; import org.jacq.common.rest.TreeRecordFileService; +import org.primefaces.model.FilterMeta; import org.primefaces.model.LazyDataModel; -import org.primefaces.model.SortOrder; +import org.primefaces.model.SortMeta; /** * Lazy loading data model for botanical object searches @@ -66,20 +65,39 @@ public TreeRecordFileResult getRowData(String rowKey) { } @Override - public Object getRowKey(TreeRecordFileResult treeRecordFileResult) { - return treeRecordFileResult.getTreeRecordFileId(); + public String getRowKey(TreeRecordFileResult treeRecordFileResult) { + return treeRecordFileResult.getTreeRecordFileId().toString(); } @Override - public List load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { + public int count(Map filters) { + return this.getRowCount(); + } + + @Override + public List load(int first, int pageSize, + Map sortFields, + Map filters) { // get count first - int rowCount = this.treeRecordFileService.searchCount(filters.get("treeRecordFileId") != null ? Long.parseLong(filters.get("treeRecordFileId").toString()) : null, filters.get("year") != null ? Long.parseLong(filters.get("year").toString()) : null, filters.get("name") != null ? filters.get("name").toString() : null, filters.get("documentNumber") != null ? filters.get("documentNumber").toString() : null); + int rowCount = this.treeRecordFileService.searchCount( + filters.get("treeRecordFileId") != null ? Long.parseLong( + filters.get("treeRecordFileId").getFilterValue().toString()) : null, + filters.get("year") != null ? Long.parseLong(filters.get("year").getFilterValue().toString()) : null, + filters.get("name") != null ? filters.get("name").getFilterValue().toString() : null, + filters.get("documentNumber") != null ? filters.get("documentNumber").getFilterValue().toString() + : null); this.setRowCount(rowCount); List results = new ArrayList<>(); if (rowCount > 0) { - results = this.treeRecordFileService.search(filters.get("treeRecordFileId") != null ? Long.parseLong(filters.get("treeRecordFileId").toString()) : null, filters.get("year") != null ? Long.parseLong(filters.get("year").toString()) : null, filters.get("name") != null ? filters.get("name").toString() : null, filters.get("documentNumber") != null ? filters.get("documentNumber").toString() : null, first, pageSize); + results = this.treeRecordFileService.search( + filters.get("treeRecordFileId") != null ? Long.parseLong( + filters.get("treeRecordFileId").getFilterValue().toString()) : null, + filters.get("year") != null ? Long.parseLong(filters.get("year").getFilterValue().toString()) : null, + filters.get("name") != null ? filters.get("name").getFilterValue().toString() : null, + filters.get("documentNumber") != null ? filters.get("documentNumber").getFilterValue().toString() + : null, first, pageSize); } return results; diff --git a/jacq-input/src/main/java/org/jacq/input/view/LazyUserDataModel.java b/jacq-input/src/main/java/org/jacq/input/view/LazyUserDataModel.java index 6cc53024..4e77c735 100644 --- a/jacq-input/src/main/java/org/jacq/input/view/LazyUserDataModel.java +++ b/jacq-input/src/main/java/org/jacq/input/view/LazyUserDataModel.java @@ -21,8 +21,9 @@ import java.util.Map; import org.jacq.common.model.rest.UserResult; import org.jacq.common.rest.UserService; +import org.primefaces.model.FilterMeta; import org.primefaces.model.LazyDataModel; -import org.primefaces.model.SortOrder; +import org.primefaces.model.SortMeta; /** * @@ -64,19 +65,41 @@ public UserResult getRowData(String rowKey) { } @Override - public Object getRowKey(UserResult userResult) { - return userResult.getId(); + public String getRowKey(UserResult userResult) { + return userResult.getId().toString(); } @Override - public List load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { + public int count(Map filters) { + return this.getRowCount(); + } + + @Override + public List load(int first, int pageSize, Map sortFields, + Map filters) { + // get count first - int rowCount = this.userService.searchCount((filters.get("id") != null) ? Long.parseLong(filters.get("id").toString()) : null, filters.get("username") != null ? filters.get("username").toString() : null, filters.get("birthdate") != null ? (Date) filters.get("birthdate") : null, filters.get("userType") != null ? filters.get("userType").toString() : null, filters.get("employmentType") != null ? filters.get("employmentType").toString() : null, filters.get("organisationDescription") != null ? filters.get("organisationDescription").toString() : null); + int rowCount = this.userService.searchCount( + (filters.get("id") != null) ? Long.parseLong(filters.get("id").getFilterValue().toString()) : null, + filters.get("username") != null ? filters.get("username").getFilterValue().toString() : null, + filters.get("birthdate") != null ? (Date) filters.get("birthdate").getFilterValue() : null, + filters.get("userType") != null ? filters.get("userType").getFilterValue().toString() : null, + filters.get("employmentType") != null ? filters.get("employmentType").getFilterValue().toString() : null, + filters.get("organisationDescription") != null ? filters.get("organisationDescription") + .getFilterValue() + .toString() : null); this.setRowCount(rowCount); List results = new ArrayList<>(); if (rowCount > 0) { - results = this.userService.search((filters.get("id") != null) ? Long.parseLong(filters.get("id").toString()) : null, filters.get("username") != null ? filters.get("username").toString() : null, filters.get("birthdate") != null ? (Date) filters.get("birthdate") : null, filters.get("userType") != null ? filters.get("userType").toString() : null, filters.get("employmentType") != null ? filters.get("employmentType").toString() : null, filters.get("organisationDescription") != null ? filters.get("organisationDescription").toString() : null, first, pageSize); + results = this.userService.search( + (filters.get("id") != null) ? Long.parseLong(filters.get("id").getFilterValue().toString()) : null, + filters.get("username") != null ? filters.get("username").getFilterValue().toString() : null, + filters.get("birthdate") != null ? (Date) filters.get("birthdate").getFilterValue() : null, + filters.get("userType") != null ? filters.get("userType").getFilterValue().toString() : null, + filters.get("employmentType") != null ? filters.get("employmentType").getFilterValue().toString() + : null, filters.get("organisationDescription") != null ? filters.get( + "organisationDescription").getFilterValue().toString() : null, first, pageSize); } return results; diff --git a/jacq-input/src/main/sass/_icons.scss b/jacq-input/src/main/sass/_icons.scss index 7ec96ed6..0f2797a4 100644 --- a/jacq-input/src/main/sass/_icons.scss +++ b/jacq-input/src/main/sass/_icons.scss @@ -1,197 +1,726 @@ // Icon Override Mixin @mixin icon-override($icon) { - background-image: none !important; - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; - font-size: inherit; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-indent: 0px !important; - text-align: center; - - &:before { - content: $icon; - } + background-image: none !important; + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-indent: 0px !important; + text-align: center; + + &:before { + content: $icon; + } } /* UI ICONS */ +body { + /* positioning */ + .ui-icon-blank { + background-position: 16px 16px; + } + + .ui-icon-carat-1-n { + @include icon-override("\f106"); + } + + .ui-icon-carat-1-ne { + background-position: -16px 0; + } + + .ui-icon-carat-1-e { + @include icon-override("\f105"); + } + + .ui-icon-carat-1-se { + background-position: -48px 0; + } + + .ui-icon-carat-1-s { + @include icon-override("\f107"); + } + + .ui-icon-carat-1-sw { + background-position: -80px 0; + } + + .ui-icon-carat-1-w { + @include icon-override("\f104"); + } + + .ui-icon-carat-1-nw { + background-position: -112px 0; + } + + .ui-icon-carat-2-n-s { + @include icon-override("\f0dc"); + } + + .ui-icon-carat-2-e-w { + background-position: -144px 0; + } + + .ui-icon-triangle-1-n { + @include icon-override("\f0de"); + } + + .ui-icon-triangle-1-ne { + background-position: -16px -16px; + } + + .ui-icon-triangle-1-e { + @include icon-override("\f0da"); + } + + .ui-icon-triangle-1-se { + background-position: -48px -16px; + } + + .ui-icon-triangle-1-s { + @include icon-override("\f0dd"); + } + + .ui-icon-triangle-1-sw { + background-position: -80px -16px; + } + + .ui-icon-triangle-1-w { + @include icon-override("\f0d9"); + } + + .ui-icon-triangle-1-nw { + background-position: -112px -16px; + } + + .ui-icon-triangle-2-n-s { + @include icon-override("\f0dc"); + } + + .ui-icon-triangle-2-e-w { + background-position: -144px -16px; + } + + .ui-icon-arrow-1-n { + @include icon-override("\f062"); + } + + .ui-icon-arrow-1-ne { + background-position: -16px -32px; + } + + .ui-icon-arrow-1-e { + @include icon-override("\f061"); + } + + .ui-icon-arrow-1-se { + background-position: -48px -32px; + } + + .ui-icon-arrow-1-s { + @include icon-override("\f063"); + } + + .ui-icon-arrow-1-sw { + background-position: -80px -32px; + } + + .ui-icon-arrow-1-w { + @include icon-override("\f177"); + } + + .ui-icon-arrow-1-nw { + background-position: -112px -32px; + } + + .ui-icon-arrow-2-n-s { + @include icon-override("\f07d"); + } + + .ui-icon-arrow-2-ne-sw { + background-position: -144px -32px; + } + + .ui-icon-arrow-2-e-w { + @include icon-override("\f07e"); + } + + .ui-icon-arrow-2-se-nw { + background-position: -176px -32px; + } + + .ui-icon-arrowstop-1-n { + background-position: -192px -32px; + } + + .ui-icon-arrowstop-1-e { + background-position: -208px -32px; + } + + .ui-icon-arrowstop-1-s { + background-position: -224px -32px; + } + + .ui-icon-arrowstop-1-w { + background-position: -240px -32px; + } + + .ui-icon-arrowthick-1-n { + @include icon-override("\f176"); + } + + .ui-icon-arrowthick-1-ne { + background-position: -16px -48px; + } + + .ui-icon-arrowthick-1-e { + @include icon-override("\f178"); + } + + .ui-icon-arrowthick-1-se { + background-position: -48px -48px; + } + + .ui-icon-arrowthick-1-s { + @include icon-override("\f175"); + } + + .ui-icon-arrowthick-1-sw { + background-position: -80px -48px; + } + + .ui-icon-arrowthick-1-w { + @include icon-override("\f177"); + } + + .ui-icon-arrowthick-1-nw { + background-position: -112px -48px; + } + + .ui-icon-arrowthick-2-n-s { + background-position: -128px -48px; + } + + .ui-icon-arrowthick-2-ne-sw { + background-position: -144px -48px; + } + + .ui-icon-arrowthick-2-e-w { + background-position: -160px -48px; + } + + .ui-icon-arrowthick-2-se-nw { + background-position: -176px -48px; + } + + .ui-icon-arrowthickstop-1-n { + background-position: -192px -48px; + } + + .ui-icon-arrowthickstop-1-e { + background-position: -208px -48px; + } + + .ui-icon-arrowthickstop-1-s { + background-position: -224px -48px; + } + + .ui-icon-arrowthickstop-1-w { + background-position: -240px -48px; + } + + .ui-icon-arrowreturnthick-1-w { + background-position: 0 -64px; + } + + .ui-icon-arrowreturnthick-1-n { + background-position: -16px -64px; + } + + .ui-icon-arrowreturnthick-1-e { + background-position: -32px -64px; + } + + .ui-icon-arrowreturnthick-1-s { + background-position: -48px -64px; + } + + .ui-icon-arrowreturn-1-w { + background-position: -64px -64px; + } + + .ui-icon-arrowreturn-1-n { + background-position: -80px -64px; + } + + .ui-icon-arrowreturn-1-e { + background-position: -96px -64px; + } + + .ui-icon-arrowreturn-1-s { + background-position: -112px -64px; + } + + .ui-icon-arrowrefresh-1-w { + background-position: -128px -64px; + } + + .ui-icon-arrowrefresh-1-n { + background-position: -144px -64px; + } + + .ui-icon-arrowrefresh-1-e { + background-position: -160px -64px; + } + + .ui-icon-arrowrefresh-1-s { + background-position: -176px -64px; + } + + .ui-icon-arrow-4 { + @include icon-override("\f047"); + } + + .ui-icon-arrow-4-diag { + @include icon-override("\f0b2"); + } + + .ui-icon-extlink { + @include icon-override("\f08e"); + } + + .ui-icon-newwin { + @include icon-override("\f24d"); + } + + .ui-icon-refresh { + @include icon-override("\f021"); + } + + .ui-icon-shuffle { + @include icon-override("\f074"); + } + + .ui-icon-transfer-e-w { + @include icon-override("\f18d"); + } + + .ui-icon-transferthick-e-w { + background-position: -112px -80px; + } + + .ui-icon-folder-collapsed { + @include icon-override("\f07b"); + } + + .ui-icon-folder-open { + @include icon-override("\f115"); + } + + .ui-icon-document { + @include icon-override("\f016"); + } + + .ui-icon-document-b { + background-position: -48px -96px; + } + + .ui-icon-note { + @include icon-override("\f24a"); + } + + .ui-icon-mail-closed { + background-position: -80px -96px; + } + + .ui-icon-mail-open { + @include icon-override("\f003"); + } + + .ui-icon-suitcase { + @include icon-override("\f0f2"); + } + + .ui-icon-comment { + @include icon-override("\f0e5"); + } + + .ui-icon-person { + @include icon-override("\f007"); + } + + .ui-icon-print { + @include icon-override("\f02f"); + } + + .ui-icon-trash { + @include icon-override("\f1f8"); + } + + .ui-icon-locked { + @include icon-override("\f023"); + } + + .ui-icon-unlocked { + @include icon-override("\f09c"); + } + + .ui-icon-bookmark { + @include icon-override("\f02e"); + } + + .ui-icon-tag { + @include icon-override("\f02b"); + } + + .ui-icon-home { + @include icon-override("\f015"); + } + + .ui-icon-flag { + @include icon-override("\f024"); + } + + .ui-icon-calendar { + @include icon-override("\f073"); + } + + .ui-icon-cart { + @include icon-override("\f07a"); + } + + .ui-icon-pencil { + @include icon-override("\f040"); + } + + .ui-icon-clock { + @include icon-override("\f017"); + } + + .ui-icon-disk { + @include icon-override("\f0c7"); + } + + .ui-icon-calculator { + @include icon-override("\f1ec"); + } + + .ui-icon-zoomin { + @include icon-override("\f00e"); + } + + .ui-icon-zoomout { + @include icon-override("\f010"); + } + + .ui-icon-search { + @include icon-override("\f002"); + } + + .ui-icon-wrench { + @include icon-override("\f0ad"); + } + + .ui-icon-gear { + @include icon-override("\f013"); + } + + .ui-icon-heart { + @include icon-override("\f004"); + } + + .ui-icon-star { + @include icon-override("\f005"); + } + + .ui-icon-link { + @include icon-override("\f0c1"); + } + + .ui-icon-cancel { + @include icon-override("\f05e"); + } + + .ui-icon-plus { + @include icon-override("\f067"); + } + + .ui-icon-plusthick { + @include icon-override("\f067"); + } + + .ui-icon-minus { + @include icon-override("\f068"); + } + + .ui-icon-minusthick { + @include icon-override("\f068"); + } + + .ui-icon-close { + @include icon-override("\f00d"); + } + + .ui-icon-closethick { + @include icon-override("\f00d"); + } + + .ui-icon-key { + @include icon-override("\f084"); + } + + .ui-icon-lightbulb { + @include icon-override("\f0eb"); + } + + .ui-icon-scissors { + @include icon-override("\f0c4"); + } + + .ui-icon-clipboard { + @include icon-override("\f0ea"); + } + + .ui-icon-copy { + @include icon-override("\f0c5"); + } + + .ui-icon-contact { + @include icon-override("\f0c0"); + } + + .ui-icon-image { + @include icon-override("\f1c5"); + } + + .ui-icon-video { + @include icon-override("\f1c8"); + } + + .ui-icon-music { + @include icon-override("\f001"); + } + + .ui-icon-script { + background-position: -240px -128px; + } + + .ui-icon-alert { + @include icon-override("\f071"); + } + + .ui-icon-info { + @include icon-override("\f05a"); + } + + .ui-icon-notice { + @include icon-override("\f12a"); + } + + .ui-icon-help { + @include icon-override("\f059"); + } + + .ui-icon-check { + @include icon-override("\f00c"); + } + + .ui-icon-bullet { + @include icon-override("\f111"); + } + + .ui-icon-radio-on { + @include icon-override("\f111"); + } + + .ui-icon-radio-off { + @include icon-override("\f10c"); + } + + .ui-icon-pin-w { + background-position: -128px -144px; + } + + .ui-icon-pin-s { + @include icon-override("\f08d"); + } + + .ui-icon-play { + @include icon-override("\f04b"); + } + + .ui-icon-pause { + @include icon-override("\f04c"); + } + + .ui-icon-seek-next { + @include icon-override("\f051"); + } + + .ui-icon-seek-prev { + @include icon-override("\f048"); + } + + .ui-icon-seek-end { + @include icon-override("\f051"); + } + + .ui-icon-seek-start { + background-position: -80px -160px; + } + + /* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ + .ui-icon-seek-first { + @include icon-override("\f048"); + } + + .ui-icon-stop { + @include icon-override("\f04d"); + } + + .ui-icon-eject { + @include icon-override("\f052"); + } + + .ui-icon-volume-off { + @include icon-override("\f026"); + } + + .ui-icon-volume-on { + @include icon-override("\f028"); + } + + .ui-icon-power { + @include icon-override("\f011"); + } + + .ui-icon-signal-diag { + background-position: -16px -176px; + } + + .ui-icon-signal { + @include icon-override("\f012"); + } + + .ui-icon-battery-0 { + @include icon-override("\f244"); + } + + .ui-icon-battery-1 { + @include icon-override("\f243"); + } + + .ui-icon-battery-2 { + @include icon-override("\f242"); + } + + .ui-icon-battery-3 { + @include icon-override("\f240"); + } + + .ui-icon-circle-plus { + @include icon-override("\f055"); + } + + .ui-icon-circle-minus { + @include icon-override("\f056"); + } + + .ui-icon-circle-close { + @include icon-override("\f057"); + } + + .ui-icon-circle-triangle-e { + @include icon-override("\f138"); + } + + .ui-icon-circle-triangle-s { + @include icon-override("\f13a"); + } + + .ui-icon-circle-triangle-w { + @include icon-override("\f137"); + } + + .ui-icon-circle-triangle-n { + @include icon-override("\f139"); + } + + .ui-icon-circle-arrow-e { + background-position: -112px -192px; + } + + .ui-icon-circle-arrow-s { + background-position: -128px -192px; + } + + .ui-icon-circle-arrow-w { + background-position: -144px -192px; + } + + .ui-icon-circle-arrow-n { + background-position: -160px -192px; + } + + .ui-icon-circle-zoomin { + background-position: -176px -192px; + } + + .ui-icon-circle-zoomout { + background-position: -192px -192px; + } + + .ui-icon-circle-check { + background-position: -208px -192px; + } + + .ui-icon-circlesmall-plus { + background-position: 0 -208px; + } + + .ui-icon-circlesmall-minus { + background-position: -16px -208px; + } + + .ui-icon-circlesmall-close { + background-position: -32px -208px; + } + + .ui-icon-squaresmall-plus { + background-position: -48px -208px; + } + + .ui-icon-squaresmall-minus { + background-position: -64px -208px; + } + + .ui-icon-squaresmall-close { + background-position: -80px -208px; + } + + .ui-icon-grip-dotted-vertical { + background-position: 0 -224px; + } + + .ui-icon-grip-dotted-horizontal { + background-position: -16px -224px; + } + + .ui-icon-grip-solid-vertical { + background-position: -32px -224px; + } + + .ui-icon-grip-solid-horizontal { + background-position: -48px -224px; + } + + .ui-icon-gripsmall-diagonal-se { + background-position: -64px -224px; + } + + .ui-icon-grip-diagonal-se { + background-position: -80px -224px; + } -/* positioning */ -.ui-icon-blank { background-position: 16px 16px; } -.ui-icon-carat-1-n { @include icon-override("\f106"); } -.ui-icon-carat-1-ne { background-position: -16px 0; } -.ui-icon-carat-1-e { @include icon-override("\f105"); } -.ui-icon-carat-1-se { background-position: -48px 0; } -.ui-icon-carat-1-s { @include icon-override("\f107"); } -.ui-icon-carat-1-sw { background-position: -80px 0; } -.ui-icon-carat-1-w { @include icon-override("\f104"); } -.ui-icon-carat-1-nw { background-position: -112px 0; } -.ui-icon-carat-2-n-s { @include icon-override("\f0dc"); } -.ui-icon-carat-2-e-w { background-position: -144px 0; } -.ui-icon-triangle-1-n { @include icon-override("\f0de"); } -.ui-icon-triangle-1-ne { background-position: -16px -16px; } -.ui-icon-triangle-1-e { @include icon-override("\f0da"); } -.ui-icon-triangle-1-se { background-position: -48px -16px; } -.ui-icon-triangle-1-s { @include icon-override("\f0dd"); } -.ui-icon-triangle-1-sw { background-position: -80px -16px; } -.ui-icon-triangle-1-w { @include icon-override("\f0d9"); } -.ui-icon-triangle-1-nw { background-position: -112px -16px; } -.ui-icon-triangle-2-n-s { @include icon-override("\f0dc"); } -.ui-icon-triangle-2-e-w { background-position: -144px -16px; } -.ui-icon-arrow-1-n { @include icon-override("\f062"); } -.ui-icon-arrow-1-ne { background-position: -16px -32px; } -.ui-icon-arrow-1-e { @include icon-override("\f061"); } -.ui-icon-arrow-1-se { background-position: -48px -32px; } -.ui-icon-arrow-1-s { @include icon-override("\f063"); } -.ui-icon-arrow-1-sw { background-position: -80px -32px; } -.ui-icon-arrow-1-w { @include icon-override("\f177"); } -.ui-icon-arrow-1-nw { background-position: -112px -32px; } -.ui-icon-arrow-2-n-s { @include icon-override("\f07d"); } -.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } -.ui-icon-arrow-2-e-w { @include icon-override("\f07e"); } -.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } -.ui-icon-arrowstop-1-n { background-position: -192px -32px; } -.ui-icon-arrowstop-1-e { background-position: -208px -32px; } -.ui-icon-arrowstop-1-s { background-position: -224px -32px; } -.ui-icon-arrowstop-1-w { background-position: -240px -32px; } -.ui-icon-arrowthick-1-n { @include icon-override("\f176"); } -.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } -.ui-icon-arrowthick-1-e { @include icon-override("\f178"); } -.ui-icon-arrowthick-1-se { background-position: -48px -48px; } -.ui-icon-arrowthick-1-s { @include icon-override("\f175"); } -.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } -.ui-icon-arrowthick-1-w { @include icon-override("\f177"); } -.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } -.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } -.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } -.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } -.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } -.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } -.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } -.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } -.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } -.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } -.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } -.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } -.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } -.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } -.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } -.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } -.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } -.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } -.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } -.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } -.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } -.ui-icon-arrow-4 { @include icon-override("\f047"); } -.ui-icon-arrow-4-diag { @include icon-override("\f0b2"); } -.ui-icon-extlink { @include icon-override("\f08e"); } -.ui-icon-newwin { @include icon-override("\f24d"); } -.ui-icon-refresh { @include icon-override("\f021"); } -.ui-icon-shuffle { @include icon-override("\f074"); } -.ui-icon-transfer-e-w { @include icon-override("\f18d"); } -.ui-icon-transferthick-e-w { background-position: -112px -80px; } -.ui-icon-folder-collapsed { @include icon-override("\f07b"); } -.ui-icon-folder-open { @include icon-override("\f115"); } -.ui-icon-document { @include icon-override("\f016"); } -.ui-icon-document-b { background-position: -48px -96px; } -.ui-icon-note { @include icon-override("\f24a"); } -.ui-icon-mail-closed { background-position: -80px -96px; } -.ui-icon-mail-open { @include icon-override("\f003"); } -.ui-icon-suitcase { @include icon-override("\f0f2"); } -.ui-icon-comment { @include icon-override("\f0e5"); } -.ui-icon-person { @include icon-override("\f007"); } -.ui-icon-print { @include icon-override("\f02f"); } -.ui-icon-trash { @include icon-override("\f1f8"); } -.ui-icon-locked { @include icon-override("\f023"); } -.ui-icon-unlocked { @include icon-override("\f09c"); } -.ui-icon-bookmark { @include icon-override("\f02e"); } -.ui-icon-tag { @include icon-override("\f02b"); } -.ui-icon-home { @include icon-override("\f015"); } -.ui-icon-flag { @include icon-override("\f024"); } -.ui-icon-calendar { @include icon-override("\f073"); } -.ui-icon-cart { @include icon-override("\f07a"); } -.ui-icon-pencil { @include icon-override("\f040"); } -.ui-icon-clock { @include icon-override("\f017"); } -.ui-icon-disk { @include icon-override("\f0c7"); } -.ui-icon-calculator { @include icon-override("\f1ec"); } -.ui-icon-zoomin { @include icon-override("\f00e"); } -.ui-icon-zoomout { @include icon-override("\f010");} -.ui-icon-search { @include icon-override("\f002");} -.ui-icon-wrench { @include icon-override("\f0ad");} -.ui-icon-gear { @include icon-override("\f013");} -.ui-icon-heart { @include icon-override("\f004");} -.ui-icon-star { @include icon-override("\f005");} -.ui-icon-link { @include icon-override("\f0c1");} -.ui-icon-cancel { @include icon-override("\f05e");} -.ui-icon-plus { @include icon-override("\f067");} -.ui-icon-plusthick { @include icon-override("\f067"); } -.ui-icon-minus { @include icon-override("\f068");} -.ui-icon-minusthick { @include icon-override("\f068"); } -.ui-icon-close { @include icon-override("\f00d");} -.ui-icon-closethick { @include icon-override("\f00d"); } -.ui-icon-key { @include icon-override("\f084");} -.ui-icon-lightbulb { @include icon-override("\f0eb");} -.ui-icon-scissors { @include icon-override("\f0c4");} -.ui-icon-clipboard { @include icon-override("\f0ea");} -.ui-icon-copy { @include icon-override("\f0c5");} -.ui-icon-contact { @include icon-override("\f0c0");} -.ui-icon-image { @include icon-override("\f1c5");} -.ui-icon-video { @include icon-override("\f1c8");} -.ui-icon-music { @include icon-override("\f001");} -.ui-icon-script { background-position: -240px -128px; } -.ui-icon-alert { @include icon-override("\f071");} -.ui-icon-info { @include icon-override("\f05a");} -.ui-icon-notice { @include icon-override("\f12a");} -.ui-icon-help { @include icon-override("\f059");} -.ui-icon-check { @include icon-override("\f00c");} -.ui-icon-bullet { @include icon-override("\f111");} -.ui-icon-radio-on { @include icon-override("\f111");} -.ui-icon-radio-off { @include icon-override("\f10c");} -.ui-icon-pin-w { background-position: -128px -144px; } -.ui-icon-pin-s { @include icon-override("\f08d");} -.ui-icon-play { @include icon-override("\f04b");} -.ui-icon-pause { @include icon-override("\f04c");} -.ui-icon-seek-next { @include icon-override("\f051");} -.ui-icon-seek-prev { @include icon-override("\f048");} -.ui-icon-seek-end { @include icon-override("\f051");} -.ui-icon-seek-start { background-position: -80px -160px; } -/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ -.ui-icon-seek-first { @include icon-override("\f048");} -.ui-icon-stop { @include icon-override("\f04d");} -.ui-icon-eject { @include icon-override("\f052");} -.ui-icon-volume-off { @include icon-override("\f026");} -.ui-icon-volume-on { @include icon-override("\f028");} -.ui-icon-power { @include icon-override("\f011");} -.ui-icon-signal-diag { background-position: -16px -176px; } -.ui-icon-signal { @include icon-override("\f012");} -.ui-icon-battery-0 { @include icon-override("\f244");} -.ui-icon-battery-1 { @include icon-override("\f243");} -.ui-icon-battery-2 { @include icon-override("\f242");} -.ui-icon-battery-3 { @include icon-override("\f240");} -.ui-icon-circle-plus { @include icon-override("\f055");} -.ui-icon-circle-minus { @include icon-override("\f056");} -.ui-icon-circle-close { @include icon-override("\f057");} -.ui-icon-circle-triangle-e { @include icon-override("\f138"); } -.ui-icon-circle-triangle-s { @include icon-override("\f13a"); } -.ui-icon-circle-triangle-w { @include icon-override("\f137"); } -.ui-icon-circle-triangle-n { @include icon-override("\f139"); } -.ui-icon-circle-arrow-e { background-position: -112px -192px; } -.ui-icon-circle-arrow-s { background-position: -128px -192px; } -.ui-icon-circle-arrow-w { background-position: -144px -192px; } -.ui-icon-circle-arrow-n { background-position: -160px -192px; } -.ui-icon-circle-zoomin { background-position: -176px -192px; } -.ui-icon-circle-zoomout { background-position: -192px -192px; } -.ui-icon-circle-check { background-position: -208px -192px; } -.ui-icon-circlesmall-plus { background-position: 0 -208px; } -.ui-icon-circlesmall-minus { background-position: -16px -208px; } -.ui-icon-circlesmall-close { background-position: -32px -208px; } -.ui-icon-squaresmall-plus { background-position: -48px -208px; } -.ui-icon-squaresmall-minus { background-position: -64px -208px; } -.ui-icon-squaresmall-close { background-position: -80px -208px; } -.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } -.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } -.ui-icon-grip-solid-vertical { background-position: -32px -224px; } -.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } -.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } -.ui-icon-grip-diagonal-se { background-position: -80px -224px; } \ No newline at end of file +} \ No newline at end of file diff --git a/jacq-input/src/main/sass/_landing.scss b/jacq-input/src/main/sass/_landing.scss index 75774844..b025f634 100644 --- a/jacq-input/src/main/sass/_landing.scss +++ b/jacq-input/src/main/sass/_landing.scss @@ -72,7 +72,7 @@ padding-top: 80px; height: 623px; background: { - image: url("\#{resource['omega-layout:images/landing/section1_bg.jpg']}"); + image: url("\#{resource['saga-layout:images/landing/section1_bg.jpg']}"); position: top left; repeat: no-repeat; size: cover; diff --git a/jacq-input/src/main/sass/_main.scss b/jacq-input/src/main/sass/_main.scss index afe9c509..efdf98dd 100644 --- a/jacq-input/src/main/sass/_main.scss +++ b/jacq-input/src/main/sass/_main.scss @@ -11,345 +11,394 @@ html { background-color: #edf0f5; } -.wrapper { - padding: 0; - - .topbar { - @include transition(left .3s); - position: fixed; - right: 0; - left: 250px; - height: 50px; - background-color: $topbarBackground; - padding: .7em 1.5em 0em 1.5em; - box-sizing: border-box; - color: #ffffff; - z-index: 101; - - .topbar-title { - display: inline-block; - font-size: 20px; - margin: 5px 0 0 15px; - vertical-align: top; - } +body { + .wrapper { + padding: 0; - #topbar-icons { - float: right; - display: block; - -moz-animation-duration: .5s; - -webkit-animation-duration: .5s; - animation-duration: .5s; + .topbar { + @include transition(left .3s); + position: fixed; + right: 0; + left: 250px; + height: 50px; + background-color: $topbarBackground; + padding: .7em 1.5em 0em 1.5em; + box-sizing: border-box; + color: #ffffff; + z-index: 101; - a { - position: relative; - color: $topbarItemColor; - margin-left: 20px; + .topbar-title { display: inline-block; - text-decoration: none; - @include transition(color .3s); + font-size: 20px; + margin: 5px 0 0 15px; + vertical-align: top; + } - &:hover { - color: $topbarItemHoverColor; - } + #topbar-icons { + float: right; + display: block; + -moz-animation-duration: .5s; + -webkit-animation-duration: .5s; + animation-duration: .5s; - span { - &.topbar-icon { - font-size: 28px; - } + a { + position: relative; + color: $topbarItemColor; + margin-left: 20px; + display: inline-block; + text-decoration: none; + @include transition(color .3s); - &.topbar-item-text { - font-size: 20px; - display: none; + &:hover { + color: $topbarItemHoverColor; } - &.topbar-badge { - position: absolute; - font-size: 10px; - right: -5px; - top: -5px; - color: #ffffff; - padding: 2px 4px; - background-color: $topbarItemBadgeColor; - @include border-radius(50%); - } - } - } + span { + &.topbar-icon { + font-size: 28px; + } - .topbar-search { - padding: 0; - position: relative; - display: inline-block; - top: -4px; + &.topbar-item-text { + font-size: 20px; + display: none; + } - input { - display: inline-block; - border: 0 none; - font-size: $fontSize; - background: transparent; - border-bottom: 2px solid #ffffff; - outline: 0 none; - color: #ffffff; - width: 100px; - padding: 1px 20px 1px 1px; - margin: 0px; - @include border-radius(2px); - - &::-webkit-input-placeholder { color:#ffffff; opacity: .7; @include transition(opacity .3s);} - &:-moz-placeholder { color:#ffffff; opacity: .7; @include transition(opacity .3s);} - &::-moz-placeholder { color:#ffffff; opacity: .7; @include transition(opacity .3s);} - &:-ms-input-placeholder { color:#ffffff; opacity: .7; @include transition(opacity .3s);} + &.topbar-badge { + position: absolute; + font-size: 10px; + right: -5px; + top: -5px; + color: #ffffff; + padding: 2px 4px; + background-color: $topbarItemBadgeColor; + @include border-radius(50%); + } + } } - .topbar-search-icon { - font-size: 18px; - position: absolute; - top: -1px; - right: 0px; - } + .topbar-search { + padding: 0; + position: relative; + display: inline-block; + top: -4px; - &:hover { input { - border-bottom-color: $topbarItemHoverColor; - &::-webkit-input-placeholder { opacity: 1 } - &:-moz-placeholder {opacity: 1} - &::-moz-placeholder {opacity: 1} - &:-ms-input-placeholder {opacity: 1} + display: inline-block; + border: 0 none; + font-size: $fontSize; + background: transparent; + border-bottom: 2px solid #ffffff; + outline: 0 none; + color: #ffffff; + width: 100px; + padding: 1px 20px 1px 1px; + margin: 0px; + @include border-radius(2px); + + &::-webkit-input-placeholder { + color: #ffffff; + opacity: .7; + @include transition(opacity .3s); + } + + &:-moz-placeholder { + color: #ffffff; + opacity: .7; + @include transition(opacity .3s); + } + + &::-moz-placeholder { + color: #ffffff; + opacity: .7; + @include transition(opacity .3s); + } + + &:-ms-input-placeholder { + color: #ffffff; + opacity: .7; + @include transition(opacity .3s); + } } .topbar-search-icon { - color: $topbarItemHoverColor; + font-size: 18px; + position: absolute; + top: -1px; + right: 0px; } - } - } - } - - #omega-menu-button { - display: inline-block; - font-size: 28px; - float: left; - text-decoration: none; - color: #ffffff; - @include transition(color .3s); - - &:hover { - color: $topbarItemHoverColor; - } - } - #options-menu-button { - display: none; - font-size: 28px; - float: right; - text-decoration: none; - color: #ffffff; - @include transition(color .3s); + &:hover { + input { + border-bottom-color: $topbarItemHoverColor; - &:hover { - color: $topbarItemHoverColor; - } - } - } + &::-webkit-input-placeholder { + opacity: 1 + } - .sidebar { - position: fixed; - width: 250px; - height: 100%; - z-index: 102; - @include transition(margin-left .3s); - @include background-gradient-top2bottom($sidebarBackground, $sidebarBackground); + &:-moz-placeholder { + opacity: 1 + } - .logo { - text-align: center; - height: 50px; - box-sizing: border-box; - padding-top: .7em; - } + &::-moz-placeholder { + opacity: 1 + } - .profile { - display: block; - text-decoration: none; - text-align: center; - padding: 20px 0; + &:-ms-input-placeholder { + opacity: 1 + } + } - img { - display: block; - width: 56px; - margin: 0 auto; + .topbar-search-icon { + color: $topbarItemHoverColor; + } + } + } } - > a { + #saga-menu-button { display: inline-block; - margin-bottom: 10px; - color: #ffffff; + font-size: 28px; + float: left; text-decoration: none; + color: #ffffff; @include transition(color .3s); - .username { - display: inline-block; - margin-top: 8px; - - &:before { - content: ""; - display: block; - } - } - - i { - display: inline-block; - font-size: 16px; - } - &:hover { - color: $menuitemHoverColor; + color: $topbarItemHoverColor; } } - > ul { - margin-bottom: -20px; + #options-menu-button { display: none; - background-color: $menuitemActiveBgColor; - text-align: left; - - li { - a { - border: 0 none; - } + font-size: 28px; + float: right; + text-decoration: none; + color: #ffffff; + @include transition(color .3s); - &:last-child { - > a { - border: 0 none; - } - } + &:hover { + color: $topbarItemHoverColor; } } } - .sidebar-scroll-content { - display: block; + .sidebar { + position: fixed; + width: 250px; height: 100%; - position: relative; - - .menu-container { - padding-bottom: 80px; + z-index: 102; + @include transition(margin-left .3s); + @include background-gradient-top2bottom($sidebarBackground, $sidebarBackground); + + .logo { + text-align: center; + height: 50px; + box-sizing: border-box; + padding-top: .7em; } - } - ul { - list-style-type: none; - margin: 0; - padding: 0; - box-sizing: border-box; + .profile { + display: block; + text-decoration: none; + text-align: center; + padding: 20px 0; + + img { + display: block; + width: 56px; + margin: 0 auto; + } - li { > a { - position: relative; - color: $menuitemColor; + display: inline-block; + margin-bottom: 10px; + color: #ffffff; text-decoration: none; - font-size: $fontSize; - padding: 15px; - display: block; - box-sizing: border-box; - border-top: 1px solid $menuitemBorderColor; - @include transition(padding-left .3s); + @include transition(color .3s); - span { - margin-left: .3em; - } + .username { + display: inline-block; + margin-top: 8px; - .menu-badge { - position: absolute; - right: 15px; - top: 14px; - color: #ffffff; - padding: 2px 6px; - background-color: $menuitemBadgeBgColor; - @include border-radius(50%); + &:before { + content: ""; + display: block; + } } - .fa:last-child { - float: right; + i { + display: inline-block; font-size: 16px; } &:hover { - padding-left: 20px; color: $menuitemHoverColor; - - .menu-badge { - color: #ffffff; - } } } - &.active-menuitem { - > a { - border-bottom: 0 none; - background-color: $menuitemActiveBgColor; - color: $menuitemActiveColor; + > ul { + margin-bottom: -20px; + display: none; + background-color: $menuitemActiveBgColor; + text-align: left; + li { + a { + border: 0 none; + } - .fa:last-child { - @include icon-override("\f106"); - font-size: 16px; + &:last-child { + > a { + border: 0 none; + } } } + } + } - > ul { - background-color: $menuitemActiveBgColor; - } + .sidebar-scroll-content { + display: block; + height: 100%; + position: relative; + + .menu-container { + padding-bottom: 80px; } + } - > ul { - display: none; - padding-left: 20px; + .ui-menu { + background: inherit; + list-style-type: none; + margin: 0; + padding: 0; + box-sizing: border-box; + border-top: 1px solid $menuitemBorderColor; + border-bottom: 1px solid $menuitemBorderColor; - li { - a { - padding: 10px 15px; - font-size: $submenuFontSize; - border-top: 0 none; + .ui-menu-list { + .ui-menu-child { + background-color: inherit; + } + + .ui-menuitem { + .ui-menuitem-link { + position: relative; + color: $menuitemColor; + text-decoration: none; + font-size: $fontSize; + padding: 15px; + display: block; + box-sizing: border-box; + border-top: 1px solid $menuitemBorderColor; + @include transition(padding-left .3s); + + span { + color: $menuitemColor; + margin-left: .3em; + } + + .menu-badge { + position: absolute; + right: 15px; + top: 14px; + color: #ffffff; + padding: 2px 6px; + background-color: $menuitemBadgeBgColor; + @include border-radius(50%); + } + + .fa:last-child { + float: right; + font-size: 16px; + } + + &:hover { + padding-left: 20px; + color: $menuitemHoverColor; + background-color: inherit; + + .menu-badge { + color:   #ffffff; + } + } } - &:last-child { + &.active-menuitem { > a { border-bottom: 0 none; + background-color: $menuitemActiveBgColor; + color: $menuitemActiveColor; + + + .fa:last-child { + @include icon-override("\f106"); + font-size: 16px; + } + } + + > ul { + background-color: $menuitemActiveBgColor; + } + } + + > ul { + display: none; + + li { + a { + padding: 10px 15px; + font-size: $submenuFontSize; + border-top: 0 none; + } + + &:last-child { + > a { + border-bottom: 0 none; + } + } + } + } + + &:last-child { + > a { + border-bottom: 1px solid $menuitemBorderColor; } } } } - &:last-child { - > a { - border-bottom: 1px solid $menuitemBorderColor; - } + &.ui-slidemenu .ui-slidemenu-backward { + background: inherit; + color: #ffffff; } } } - } - .main { - @include transition(margin-left .3s); - margin-left: 250px; - padding: 50px 16px 16px 16px; - } + .main { + @include transition(margin-left .3s); + margin-left: 250px; + padding: 50px 16px 16px 16px; + } - .footer { - margin-left: 250px; - height: 40px; - background-color: #ffffff; - padding: .7em 1.5em 0em 1.5em; + .footer { + margin-left: 250px; + height: 40px; + background-color: #ffffff; + padding: .7em 1.5em 0em 1.5em; - img { - vertical-align: middle; - } + img { + vertical-align: middle; + } - .footer-text { - vertical-align: middle; + .footer-text { + vertical-align: middle; + } } - } + } } + /* Responsive */ @media (min-width: 1025px) { .wrapper { diff --git a/jacq-input/src/main/sass/_theme.scss b/jacq-input/src/main/sass/_theme.scss index 707d5543..62963585 100644 --- a/jacq-input/src/main/sass/_theme.scss +++ b/jacq-input/src/main/sass/_theme.scss @@ -1,23 +1,74 @@ /* Theme */ -.ui-widget, +body .ui-widget, .ui-widget .ui-widget { font-size: $fontSize; text-decoration: none; } +.ui-timer { + background-color: #ffffff; + color: #000000; +} + +body .ui-inputfield { + padding: 4px; +} + +body .ui-button { + margin-right: 1.4px; + &.ui-button-text-only { + .ui-button-text { + padding: .3em 1em; + } + } + &.ui-button-icon-only { + .ui-button-text { + padding: .3em; + } + } +} + +body { + .ui-chkbox { + .ui-chkbox-box { + width: 16px; + height: 16px; + + &.ui-state-active, &.ui-state-active.ui-state-hover { + border: 1px solid rgb(105,109,49); + background: rgb(120,124,54); + color: #fff; + } + } + } +} + +body { + .ui-selectbooleanbutton, .ui-selectonebutton, .ui-selectmanybutton { + .ui-button { + &.ui-state-active, &.ui-state-active:not(.ui-state-disabled):hover { + border: 1px solid rgb(105, 109, 49); + background: rgb(120, 124, 54); + color: #fff; + } + } + } +} + + .ui-spinner { .ui-spinner-up { .ui-icon { margin-top: -4px; } } - + .ui-spinner-down { .ui-icon { margin-top: -10px; } } - + .ui-spinner-input { font-size: $fontSize; } @@ -29,7 +80,7 @@ padding-left: 0; } } - + .ui-selectonemenu-label { font-size: $fontSize; } @@ -49,13 +100,13 @@ .ui-selectcheckboxmenu-label { padding: 4px 26px 4px 5px; } - + .ui-selectcheckboxmenu-trigger { .ui-icon { margin-top: 2px; } } - + &.ui-selectcheckboxmenu-multiple { .ui-selectcheckboxmenu-multiple-container { &.ui-inputfield { @@ -109,31 +160,31 @@ .ui-icon-arrow-1-n { @include icon-override("\f106"); } - + .ui-icon-arrowstop-1-n { @include icon-override("\f102"); } - + .ui-icon-arrow-1-s { @include icon-override("\f107"); } - + .ui-icon-arrowstop-1-s { @include icon-override("\f103"); } - + .ui-icon-arrow-1-e { @include icon-override("\f105"); } - + .ui-icon-arrowstop-1-e { @include icon-override("\f101"); } - + .ui-icon-arrow-1-w { @include icon-override("\f104"); } - + .ui-icon-arrowstop-1-w { @include icon-override("\f100"); } @@ -146,15 +197,15 @@ .ui-icon-arrow-1-e { @include icon-override("\f107"); } - + .ui-icon-arrowstop-1-e { @include icon-override("\f103"); } - + .ui-icon-arrow-1-w { @include icon-override("\f106"); } - + .ui-icon-arrowstop-1-w { @include icon-override("\f102"); } @@ -169,26 +220,26 @@ font-size: 16px; color: #fff; } - + .ui-icon-arrowstop-1-n { @include icon-override("\f102"); font-size: 16px; color: #fff; } - + .ui-icon-arrow-1-s { @include icon-override("\f107"); font-size: 16px; color: #fff; } - + .ui-icon-arrowstop-1-s { @include icon-override("\f103"); font-size: 16px; color: #fff; } } - + &.ui-grid-responsive { .ui-grid-row { .ui-orderlist-controls { @@ -204,25 +255,25 @@ box-sizing: border-box; height: 23px; width: 24px; - + span { display: none; } - + &:before { position: relative; top: 1px; } } - + .ui-paginator-next { @include icon-override("\f04b"); } - + .ui-paginator-last { @include icon-override("\f051"); } - + .ui-paginator-prev { @include icon-override("\f04b"); -webkit-transform: rotate(180deg); @@ -231,15 +282,15 @@ -o-transform: rotate(180deg); transform: rotate(180deg); } - + .ui-paginator-first { @include icon-override("\f048"); } - + .ui-paginator-pages { padding: 0; vertical-align: top; - + .ui-paginator-page { height: 17px; } @@ -271,7 +322,7 @@ padding-left: 5px; } } - + .ui-datepicker-prev { .ui-icon { @include icon-override("\f053"); @@ -307,7 +358,7 @@ @include icon-override("\f111"); visibility: hidden; } - + .ui-icon-bullet, .ui-icon-blank { font-size: 10px; margin-top: 2px; @@ -318,39 +369,39 @@ .ui-tree { .ui-tree-toggler { vertical-align: middle; - + &.ui-icon-triangle-1-s { margin-top: -5px; } } - + &.ui-tree-horizontal { .ui-tree-toggler { vertical-align: middle; } } - + .ui-treenode-label { margin-top: 0px; vertical-align: middle; } - + .ui-chkbox { vertical-align: middle; margin-right: 2px; } - + .ui-treenode-icon { vertical-align: middle; position: relative; top: 1px; } -} +} .ui-treetable { .ui-treetable-toggler { margin-top: 1px; - + &.ui-icon-triangle-1-s { margin-top: 1px; } @@ -449,28 +500,28 @@ background: none; color: #fff; padding: 4px; - + &.ui-growl-image-info { @include icon-override("\f05a"); font-size: 36px; } - + &.ui-growl-image-error { @include icon-override("\f056"); font-size: 36px; } - + &.ui-growl-image-warn { @include icon-override("\f071"); font-size: 36px; } - + &.ui-growl-image-fatal { @include icon-override("\f056"); font-size: 36px; } } - + .ui-growl-icon-close { @include icon-override("\f00d"); font-size: $fontSize; @@ -484,7 +535,7 @@ &.ui-carousel-next-button { @include icon-override("\f054"); } - + &.ui-carousel-prev-button { @include icon-override("\f053"); } @@ -508,7 +559,7 @@ top: 1px; } } - + .ui-menuitem-link { text-decoration: none; } @@ -520,13 +571,13 @@ margin-top: 1px; } } - + &.ui-megamenu { .ui-menuitem-icon { margin-top: 1px; } } - + .ui-menuitem-link { width: 96%; } @@ -542,7 +593,7 @@ .ui-menuitem-icon { margin-top: 1px; } - + li.ui-state-active { .ui-menuitem-icon { color: #ffffff; @@ -569,42 +620,127 @@ } } -.ui-datatable { - .ui-row-toggler { - &.ui-icon-circle-triangle-e { - @include icon-override("\f054"); +body { + .ui-datatable { + + .ui-widget-header { + color: #222; + font-weight: bold } - &.ui-icon-circle-triangle-s { - @include icon-override("\f078"); + + .ui-datatable-tablewrapper { + width: 100% } - } - - .ui-radiobutton { - .ui-icon-bullet, .ui-icon-blank { - color: #186ba0; + + .ui-row-toggler { + &.ui-icon-circle-triangle-e { + @include icon-override("\f054"); + } + + &.ui-icon-circle-triangle-s { + @include icon-override("\f078"); + } } - } - - .ui-chkbox { - .ui-chkbox-box { - color: #186ba0; + + .ui-radiobutton { + .ui-icon-bullet, .ui-icon-blank { + color: #186ba0; + } } - } - - .ui-datatable-data { - tr.ui-state-hover { - border-bottom: #d5d5d5; + + .ui-chkbox { + .ui-chkbox-box { + color: #186ba0; + } } + + .ui-paginator { + padding: 2px; + + .ui-paginator-current { + margin: 0; + } + + .ui-paginator-prev { + transform: none; + } + + .ui-paginator-pages { + vertical-align: inherit; + .ui-paginator-page { + &.ui-state-active { + background: rgb(120,124,54); + color: #fff; + border-color: rgb(105,109,49); + } + } + } + + .ui-paginator-pages .ui-paginator-page, .ui-paginator-first, .ui-paginator-prev, .ui-paginator-next, .ui-paginator-last { + line-height: inherit; + height: inherit; + vertical-align: middle; + } + } + + thead { + th { + padding: 4px 10px; + background: #ffffff; + } + } + + .ui-datatable-data { + .ui-datatable-odd { + background-color: #fafafb + } + + > tr { + > td { + padding: 4px 10px; + } + } + + tr.ui-state-hover { + border-bottom: #d5d5d5; + } + } + + .ui-datatable-footer { + background: #ffffff; + text-align: center; + padding: 4px 10px + } + } } -.ui-tabs { +body .ui-tabs { + &.ui-tabs-top { + > .ui-tabs-nav { + li { + &.ui-tabs-header { + &.ui-state-active { + border-color: rgb(120, 124, 54); + } + } + } + } + } .ui-tabs-nav { li { + &.ui-tabs-header { + &.ui-state-active { + a { + color: rgb(120, 124, 54); + + } + } + } .ui-icon { margin-top: 0.6em; } - + > a:focus { outline: 0 none; } @@ -630,14 +766,14 @@ } } -.ui-fluid { +.ui-fluid { .ui-selectonebutton, .ui-selectmanybutton { &.ui-buttonset.ui-buttonset-3 { .ui-button { width: 33.33%; } } - + &.ui-buttonset.ui-buttonset-6 { .ui-button { width: 16.66%; @@ -659,7 +795,7 @@ border-bottom: 1px solid #d6d6d6; } } - + &.ui-buttonset-6, &.ui-buttonset-3 { .ui-button { width: 100%; @@ -687,17 +823,17 @@ a { .ui-lightbox { .ui-lightbox-nav-left { letter-spacing: 11px; - + span { margin: 5px 0; padding-left: 7px; padding-top: 3px; } } - + .ui-lightbox-nav-right { letter-spacing: 11px; - + span { margin: 5px 0; padding-left: 7px; @@ -714,11 +850,11 @@ a { &.green-button { background-color: $greenButton; border-color: $greenButtonBorder; - + &.ui-state-hover { background-color: $greenButtonHover; } - + &.ui-state-active { background-color: $greenButtonActive; } @@ -732,11 +868,11 @@ a { &.yellow-button { background-color: $yellowButton; border-color: $yellowButtonBorder; - + &.ui-state-hover { background-color: $yellowButtonHover; } - + &.ui-state-active { background-color: $yellowButtonActive; } @@ -750,11 +886,11 @@ a { &.red-button { background-color: $redButton; border-color: $redButtonBorder; - + &.ui-state-hover { background-color: $redButtonHover; } - + &.ui-state-active { background-color: $redButtonActive; } @@ -768,16 +904,16 @@ a { &.aqua-button { background-color: $aquaButton; border-color: $aquaButtonBorder; - + &.ui-state-hover { background-color: $aquaButtonHover; } - + &.ui-state-active { background-color: $aquaButtonActive; } } - } + } } /*Navy Button*/ @@ -786,11 +922,11 @@ a { &.navy-button { background-color: $navyButton; border-color: $navyButtonBorder; - + &.ui-state-hover { background-color: $navyButtonHover; } - + &.ui-state-active { background-color: $navyButtonActive; } @@ -804,11 +940,11 @@ a { &.black-button { background-color: $blackButton; border-color: $blackButtonBorder; - + &.ui-state-hover { background-color: $blackButtonHover; } - + &.ui-state-active { background-color: $blackButtonActive; } @@ -822,17 +958,17 @@ a { &.gray-button { background-color: $greyButton; border-color: $greyButtonBorder; - + &.ui-button { span.ui-button-text { color: $greyButtonText; } } - + &.ui-state-hover { background-color: $greyButtonHover; } - + &.ui-state-active { background-color: $greyButtonActive; } @@ -841,7 +977,7 @@ a { } .ui-fluid { - .ui-wizard-navbar { + .ui-wizard-navbar { .ui-button { width: auto; } diff --git a/jacq-input/src/main/webapp/WEB-INF/beans.xml b/jacq-input/src/main/webapp/WEB-INF/beans.xml index ba9b1015..12baef60 100644 --- a/jacq-input/src/main/webapp/WEB-INF/beans.xml +++ b/jacq-input/src/main/webapp/WEB-INF/beans.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/jacq-input/src/main/webapp/WEB-INF/faces-config.xml b/jacq-input/src/main/webapp/WEB-INF/faces-config.xml index 2d7f5068..585f737b 100644 --- a/jacq-input/src/main/webapp/WEB-INF/faces-config.xml +++ b/jacq-input/src/main/webapp/WEB-INF/faces-config.xml @@ -1,8 +1,10 @@ - + en @@ -30,19 +32,6 @@ - - org.primefaces.component.OmegaMenu - org.primefaces.omega.component.menu.OmegaMenu - - - - - org.primefaces.component - org.primefaces.component.OmegaMenuRenderer - org.primefaces.omega.component.menu.OmegaMenuRenderer - - - org.omnifaces.exceptionhandler.FullAjaxExceptionHandlerFactory diff --git a/jacq-input/src/main/webapp/WEB-INF/jboss-web.xml b/jacq-input/src/main/webapp/WEB-INF/jboss-web.xml index 8095cb59..dbecf0cd 100644 --- a/jacq-input/src/main/webapp/WEB-INF/jboss-web.xml +++ b/jacq-input/src/main/webapp/WEB-INF/jboss-web.xml @@ -1,4 +1,3 @@ - jaspitest \ No newline at end of file diff --git a/jacq-input/src/main/webapp/WEB-INF/lib/omega-menu-1.1.2.jar b/jacq-input/src/main/webapp/WEB-INF/lib/omega-menu-1.1.2.jar deleted file mode 100644 index c33c579c0b20c5e6be2561b5f668e2e6fef09b7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10197 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 K8q|MF|NjFf)kGKo diff --git a/jacq-input/src/main/webapp/WEB-INF/lib/omega-theme-5.1.0-jakarta.jar b/jacq-input/src/main/webapp/WEB-INF/lib/omega-theme-5.1.0-jakarta.jar new file mode 100644 index 0000000000000000000000000000000000000000..3b2fde28cc21e65a85a63987428e6f92e7d55bb4 GIT binary patch literal 101567 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 z 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

TK9?6l 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 literal 0 HcmV?d00001 diff --git a/jacq-input/src/main/webapp/WEB-INF/primefaces-omega.taglib.xml b/jacq-input/src/main/webapp/WEB-INF/primefaces-omega.taglib.xml deleted file mode 100644 index 9004bcb5..00000000 --- a/jacq-input/src/main/webapp/WEB-INF/primefaces-omega.taglib.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - http://primefaces.org/omega - - - - menu - - org.primefaces.component.OmegaMenu - org.primefaces.component.OmegaMenuRenderer - - - - id - false - java.lang.String - - - - rendered - false - java.lang.Boolean - - - - binding - false - javax.faces.component.UIComponent - - - - widgetVar - false - java.lang.String - - - - model - false - org.primefaces.model.menu.MenuModel - - - - style - false - java.lang.String - - - - styleClass - false - java.lang.String - - - - \ No newline at end of file diff --git a/jacq-input/src/main/webapp/WEB-INF/templates/omega/error.xhtml b/jacq-input/src/main/webapp/WEB-INF/templates/saga/error.xhtml similarity index 87% rename from jacq-input/src/main/webapp/WEB-INF/templates/omega/error.xhtml rename to jacq-input/src/main/webapp/WEB-INF/templates/saga/error.xhtml index fef22685..aab2a729 100644 --- a/jacq-input/src/main/webapp/WEB-INF/templates/omega/error.xhtml +++ b/jacq-input/src/main/webapp/WEB-INF/templates/saga/error.xhtml @@ -17,7 +17,7 @@

- +

@@ -26,7 +26,7 @@
- + \ No newline at end of file diff --git a/jacq-input/src/main/webapp/WEB-INF/templates/omega/sidebar.xhtml b/jacq-input/src/main/webapp/WEB-INF/templates/saga/sidebar.xhtml similarity index 72% rename from jacq-input/src/main/webapp/WEB-INF/templates/omega/sidebar.xhtml rename to jacq-input/src/main/webapp/WEB-INF/templates/saga/sidebar.xhtml index c0355bb2..91050efb 100644 --- a/jacq-input/src/main/webapp/WEB-INF/templates/omega/sidebar.xhtml +++ b/jacq-input/src/main/webapp/WEB-INF/templates/saga/sidebar.xhtml @@ -3,8 +3,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:p="http://primefaces.org/ui" - xmlns:po="http://primefaces.org/omega"> + xmlns:p="http://primefaces.org/ui">
@@ -18,64 +17,64 @@
- + - + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - + - + - + - - - - - + + + + + - + - + @@ -83,7 +82,7 @@ - +
diff --git a/jacq-input/src/main/webapp/WEB-INF/templates/omega/template.xhtml b/jacq-input/src/main/webapp/WEB-INF/templates/saga/template.xhtml similarity index 79% rename from jacq-input/src/main/webapp/WEB-INF/templates/omega/template.xhtml rename to jacq-input/src/main/webapp/WEB-INF/templates/saga/template.xhtml index a185f39a..309bf387 100644 --- a/jacq-input/src/main/webapp/WEB-INF/templates/omega/template.xhtml +++ b/jacq-input/src/main/webapp/WEB-INF/templates/saga/template.xhtml @@ -14,8 +14,8 @@ JACQ - - + + @@ -43,7 +43,7 @@ - + @@ -51,9 +51,11 @@ - - - + + + + + diff --git a/jacq-input/src/main/webapp/WEB-INF/templates/omega/topbar.xhtml b/jacq-input/src/main/webapp/WEB-INF/templates/saga/topbar.xhtml similarity index 95% rename from jacq-input/src/main/webapp/WEB-INF/templates/omega/topbar.xhtml rename to jacq-input/src/main/webapp/WEB-INF/templates/saga/topbar.xhtml index 9286ef3f..09d8a773 100644 --- a/jacq-input/src/main/webapp/WEB-INF/templates/omega/topbar.xhtml +++ b/jacq-input/src/main/webapp/WEB-INF/templates/saga/topbar.xhtml @@ -7,7 +7,7 @@ xmlns:pe="http://primefaces.org/ui/extensions">
- + diff --git a/jacq-input/src/main/webapp/WEB-INF/web.xml b/jacq-input/src/main/webapp/WEB-INF/web.xml index 8c5afa60..56bc8d2d 100644 --- a/jacq-input/src/main/webapp/WEB-INF/web.xml +++ b/jacq-input/src/main/webapp/WEB-INF/web.xml @@ -1,31 +1,31 @@ - javax.faces.STATE_SAVING_METHOD + jakarta.faces.STATE_SAVING_METHOD server - javax.faces.PROJECT_STAGE + jakarta.faces.PROJECT_STAGE Development primefaces.FONT_AWESOME - true + FALSE - javax.faces.FACELETS_LIBRARIES - /WEB-INF/primefaces-omega.taglib.xml + jakarta.faces.FACELETS_LIBRARIES + /WEB-INF/primefaces-saga.taglib.xml primefaces.THEME - omega + saga com.sun.faces.config.ConfigureListener Faces Servlet - javax.faces.webapp.FacesServlet + jakarta.faces.webapp.FacesServlet 1 @@ -43,18 +43,18 @@ 500 - /WEB-INF/templates/omega/error.xhtml + /WEB-INF/templates/saga/error.xhtml 404 - /WEB-INF/templates/omega/error.xhtml + /WEB-INF/templates/saga/error.xhtml Resources - /javax.faces.resource/* + /jakarta.faces.resource/* diff --git a/jacq-input/src/main/webapp/pages/livingplant/edit.xhtml b/jacq-input/src/main/webapp/pages/livingplant/edit.xhtml index 573b6218..200b2858 100644 --- a/jacq-input/src/main/webapp/pages/livingplant/edit.xhtml +++ b/jacq-input/src/main/webapp/pages/livingplant/edit.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/jacq-input/src/main/webapp/pages/livingplant/edit/derivatives.xhtml b/jacq-input/src/main/webapp/pages/livingplant/edit/derivatives.xhtml index 09e9d509..7ccad323 100644 --- a/jacq-input/src/main/webapp/pages/livingplant/edit/derivatives.xhtml +++ b/jacq-input/src/main/webapp/pages/livingplant/edit/derivatives.xhtml @@ -49,7 +49,7 @@
- +
diff --git a/jacq-input/src/main/webapp/pages/livingplant/editsimple.xhtml b/jacq-input/src/main/webapp/pages/livingplant/editsimple.xhtml index 245e3eb0..672b896a 100644 --- a/jacq-input/src/main/webapp/pages/livingplant/editsimple.xhtml +++ b/jacq-input/src/main/webapp/pages/livingplant/editsimple.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/jacq-input/src/main/webapp/pages/livingplant/indexseminum.xhtml b/jacq-input/src/main/webapp/pages/livingplant/indexseminum.xhtml index 1205652b..4ade6460 100644 --- a/jacq-input/src/main/webapp/pages/livingplant/indexseminum.xhtml +++ b/jacq-input/src/main/webapp/pages/livingplant/indexseminum.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:p="http://primefaces.org/ui"> - +
diff --git a/jacq-input/src/main/webapp/pages/livingplant/inventories.xhtml b/jacq-input/src/main/webapp/pages/livingplant/inventories.xhtml index 1eab2897..8c92fb21 100644 --- a/jacq-input/src/main/webapp/pages/livingplant/inventories.xhtml +++ b/jacq-input/src/main/webapp/pages/livingplant/inventories.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:p="http://primefaces.org/ui"> - +
diff --git a/jacq-input/src/main/webapp/pages/livingplant/inventoryedit.xhtml b/jacq-input/src/main/webapp/pages/livingplant/inventoryedit.xhtml index b511f876..688ef5c1 100644 --- a/jacq-input/src/main/webapp/pages/livingplant/inventoryedit.xhtml +++ b/jacq-input/src/main/webapp/pages/livingplant/inventoryedit.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - +
diff --git a/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml b/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml index 4d66ef6d..72b990ce 100644 --- a/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml +++ b/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - +
diff --git a/jacq-input/src/main/webapp/pages/livingplant/revisioncreate.xhtml b/jacq-input/src/main/webapp/pages/livingplant/revisioncreate.xhtml index b4fa4355..03a6b7f5 100644 --- a/jacq-input/src/main/webapp/pages/livingplant/revisioncreate.xhtml +++ b/jacq-input/src/main/webapp/pages/livingplant/revisioncreate.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/jacq-input/src/main/webapp/pages/organisation/edit.xhtml b/jacq-input/src/main/webapp/pages/organisation/edit.xhtml index 3086abff..bf0f7289 100644 --- a/jacq-input/src/main/webapp/pages/organisation/edit.xhtml +++ b/jacq-input/src/main/webapp/pages/organisation/edit.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/jacq-input/src/main/webapp/pages/organisation/manage.xhtml b/jacq-input/src/main/webapp/pages/organisation/manage.xhtml index c8e73f8d..7af055b9 100644 --- a/jacq-input/src/main/webapp/pages/organisation/manage.xhtml +++ b/jacq-input/src/main/webapp/pages/organisation/manage.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - +
diff --git a/jacq-input/src/main/webapp/pages/seedexchange/edit.xhtml b/jacq-input/src/main/webapp/pages/seedexchange/edit.xhtml index cdd1fd1c..e0022cd0 100644 --- a/jacq-input/src/main/webapp/pages/seedexchange/edit.xhtml +++ b/jacq-input/src/main/webapp/pages/seedexchange/edit.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"> - + diff --git a/jacq-input/src/main/webapp/pages/seedexchange/manage.xhtml b/jacq-input/src/main/webapp/pages/seedexchange/manage.xhtml index ceb1c8b7..ac3fd62f 100644 --- a/jacq-input/src/main/webapp/pages/seedexchange/manage.xhtml +++ b/jacq-input/src/main/webapp/pages/seedexchange/manage.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - +
@@ -17,7 +17,7 @@ - + diff --git a/jacq-input/src/main/webapp/pages/treerecordfile/edit.xhtml b/jacq-input/src/main/webapp/pages/treerecordfile/edit.xhtml index 2936b73a..557cff58 100644 --- a/jacq-input/src/main/webapp/pages/treerecordfile/edit.xhtml +++ b/jacq-input/src/main/webapp/pages/treerecordfile/edit.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + diff --git a/jacq-input/src/main/webapp/pages/treerecordfile/manage.xhtml b/jacq-input/src/main/webapp/pages/treerecordfile/manage.xhtml index d8e7647f..322b7b54 100644 --- a/jacq-input/src/main/webapp/pages/treerecordfile/manage.xhtml +++ b/jacq-input/src/main/webapp/pages/treerecordfile/manage.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - +
@@ -28,7 +28,7 @@ - + diff --git a/jacq-input/src/main/webapp/pages/user/edit.xhtml b/jacq-input/src/main/webapp/pages/user/edit.xhtml index 75a09062..6f72eb19 100644 --- a/jacq-input/src/main/webapp/pages/user/edit.xhtml +++ b/jacq-input/src/main/webapp/pages/user/edit.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - + @@ -93,10 +93,14 @@
- + + +
- + + +
diff --git a/jacq-input/src/main/webapp/pages/user/manage.xhtml b/jacq-input/src/main/webapp/pages/user/manage.xhtml index a478ebf1..3b64df34 100644 --- a/jacq-input/src/main/webapp/pages/user/manage.xhtml +++ b/jacq-input/src/main/webapp/pages/user/manage.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:f="http://xmlns.jcp.org/jsf/core"> - +
@@ -35,7 +35,7 @@ - + diff --git a/jacq-input/src/main/webapp/pages/user/update.xhtml b/jacq-input/src/main/webapp/pages/user/update.xhtml index 6684527e..56d85b0c 100644 --- a/jacq-input/src/main/webapp/pages/user/update.xhtml +++ b/jacq-input/src/main/webapp/pages/user/update.xhtml @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:p="http://primefaces.org/ui"> - +
diff --git a/jacq-input/src/main/webapp/resources/jacq/jacq.css b/jacq-input/src/main/webapp/resources/jacq/jacq.css index 45b52696..69d269ed 100644 --- a/jacq-input/src/main/webapp/resources/jacq/jacq.css +++ b/jacq-input/src/main/webapp/resources/jacq/jacq.css @@ -60,24 +60,6 @@ background: rgb(157,160,72); } -.ui-chkbox-box.ui-state-active, .ui-chkbox-box.ui-state-focus.ui-state-active, .ui-radiobutton-box.ui-state-active, .ui-radiobutton-box.ui-state-focus.ui-state-active { - border: 1px solid rgb(105,109,49); - background: rgb(120,124,54); - color: #fff; -} - -.ui-selectbooleanbutton.ui-button.ui-state-active, .ui-selectonebutton .ui-button.ui-state-active, .ui-selectmanybutton .ui-button.ui-state-active { - border: 1px solid rgb(105,109,49); - background: rgb(120,124,54); - color: #fff; -} - -.ui-paginator .ui-paginator-page.ui-state-active { - background: rgb(120,124,54); - color: #fff; - border-color: rgb(105,109,49); -} - .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { border: 1px solid rgb(105,109,49); /*background: rgb(120,124,54);*/ @@ -97,4 +79,4 @@ input.ui-widget, textarea.ui-widget { .jacq-icon-small .ui-icon { font-size: 0.8em; padding-top: 0.2em; -} \ No newline at end of file +} diff --git a/jacq-input/src/main/webapp/resources/omega-layout/css/grid.css b/jacq-input/src/main/webapp/resources/omega-layout/css/grid.css deleted file mode 100644 index 55061905..00000000 --- a/jacq-input/src/main/webapp/resources/omega-layout/css/grid.css +++ /dev/null @@ -1,347 +0,0 @@ -/* - * New Grid CSS - * Only necessary to add if your PrimeFaces version is older than 5.3.14 - */ -.ui-g { - display: -webkit-box; - display: -moz-box; - display: -ms-flexbox; - display: -webkit-flex; - display: flex; - flex-wrap: wrap; -} - -.ui-g:after { - clear: both; - content: ""; - display: table; -} - -.ui-g-1, -.ui-g-2, -.ui-g-3, -.ui-g-4, -.ui-g-5, -.ui-g-6, -.ui-g-7, -.ui-g-8, -.ui-g-9, -.ui-g-10, -.ui-g-11, -.ui-g-12 { - float: left; - box-sizing: border-box; - padding: 0.5em; -} - -.ui-g-1 { - width: 8.3333%; -} - -.ui-g-2 { - width: 16.6667%; -} - -.ui-g-3 { - width: 25%; -} - -.ui-g-4 { - width: 33.3333%; -} - -.ui-g-5 { - width: 41.6667%; -} - -.ui-g-6 { - width: 50%; -} - -.ui-g-7 { - width: 58.3333%; -} - -.ui-g-8 { - width: 66.6667%; -} - -.ui-g-9 { - width: 75%; -} - -.ui-g-10 { - width: 83.3333%; -} - -.ui-g-11 { - width: 91.6667%; -} - -.ui-g-12 { - width: 100%; -} - -@media screen and (max-width: 40em) { - .ui-sm-1, - .ui-sm-2, - .ui-sm-3, - .ui-sm-4, - .ui-sm-5, - .ui-sm-6, - .ui-sm-7, - .ui-sm-8, - .ui-sm-9, - .ui-sm-10, - .ui-sm-11, - .ui-sm-12 { - padding: 0.5em; - } - - .ui-sm-1 { - width: 8.3333%; - } - - .ui-sm-2 { - width: 16.6667%; - } - - .ui-sm-3 { - width: 25%; - } - - .ui-sm-4 { - width: 33.3333%; - } - - .ui-sm-5 { - width: 41.6667%; - } - - .ui-sm-6 { - width: 50%; - } - - .ui-sm-7 { - width: 58.3333%; - } - - .ui-sm-8 { - width: 66.6667%; - } - - .ui-sm-9 { - width: 75%; - } - - .ui-sm-10 { - width: 83.3333%; - } - - .ui-sm-11 { - width: 91.6667%; - } - - .ui-sm-12 { - width: 100%; - } -} - -@media screen and (min-width: 40.063em) { - .ui-md-1, - .ui-md-2, - .ui-md-3, - .ui-md-4, - .ui-md-5, - .ui-md-6, - .ui-md-7, - .ui-md-8, - .ui-md-9, - .ui-md-10, - .ui-md-11, - .ui-md-12 { - padding: 0.5em; - } - - .ui-md-1 { - width: 8.3333%; - } - - .ui-md-2 { - width: 16.6667%; - } - - .ui-md-3 { - width: 25%; - } - - .ui-md-4 { - width: 33.3333%; - } - - .ui-md-5 { - width: 41.6667%; - } - - .ui-md-6 { - width: 50%; - } - - .ui-md-7 { - width: 58.3333%; - } - - .ui-md-8 { - width: 66.6667%; - } - - .ui-md-9 { - width: 75%; - } - - .ui-md-10 { - width: 83.3333%; - } - - .ui-md-11 { - width: 91.6667%; - } - - .ui-md-12 { - width: 100%; - } -} - -@media screen and (min-width: 64.063em) { - .ui-lg-1, - .ui-lg-2, - .ui-lg-3, - .ui-lg-4, - .ui-lg-5, - .ui-lg-6, - .ui-lg-7, - .ui-lg-8, - .ui-lg-9, - .ui-lg-10, - .ui-lg-11, - .ui-lg-12 { - padding: 0.5em; - } - - .ui-lg-1 { - width: 8.3333%; - } - - .ui-lg-2 { - width: 16.6667%; - } - - .ui-lg-3 { - width: 25%; - } - - .ui-lg-4 { - width: 33.3333%; - } - - .ui-lg-5 { - width: 41.6667%; - } - - .ui-lg-6 { - width: 50%; - } - - .ui-lg-7 { - width: 58.3333%; - } - - .ui-lg-8 { - width: 66.6667%; - } - - .ui-lg-9 { - width: 75%; - } - - .ui-lg-10 { - width: 83.3333%; - } - - .ui-lg-11 { - width: 91.6667%; - } - - .ui-lg-12 { - width: 100%; - } -} - -@media screen and (min-width: 90.063em) { - .ui-xl-1, - .ui-xl-2, - .ui-xl-3, - .ui-xl-4, - .ui-xl-5, - .ui-xl-6, - .ui-xl-7, - .ui-xl-8, - .ui-xl-9, - .ui-xl-10, - .ui-xl-11, - .ui-xl-12 { - padding: 0.5em; - } - - .ui-xl-1 { - width: 8.3333%; - } - - .ui-xl-2 { - width: 16.6667%; - } - - .ui-xl-3 { - width: 25%; - } - - .ui-xl-4 { - width: 33.3333%; - } - - .ui-xl-5 { - width: 41.6667%; - } - - .ui-xl-6 { - width: 50%; - } - - .ui-xl-7 { - width: 58.3333%; - } - - .ui-xl-8 { - width: 66.6667%; - } - - .ui-xl-9 { - width: 75%; - } - - .ui-xl-10 { - width: 83.3333%; - } - - .ui-xl-11 { - width: 91.6667%; - } - - .ui-xl-12 { - width: 100%; - } -} - -.ui-g-nopad { - padding: 0px; -} \ No newline at end of file diff --git a/jacq-input/src/main/webapp/resources/omega-layout/css/layout.css.map b/jacq-input/src/main/webapp/resources/omega-layout/css/layout.css.map deleted file mode 100644 index acc21f00..00000000 --- a/jacq-input/src/main/webapp/resources/omega-layout/css/layout.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "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", -"sources": ["../../../../sass/_variables.scss","../../../../sass/_icons.scss","../../../../sass/_main.scss","../../../../sass/_login.scss","../../../../sass/_exception.scss","../../../../sass/_utils.scss","../../../../sass/_dashboard.scss","../../../../sass/_landing.scss","../../../../sass/_theme.scss"], -"names": [], -"file": "layout.css" -} \ No newline at end of file diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/404.png b/jacq-input/src/main/webapp/resources/omega-layout/images/404.png deleted file mode 100644 index e8a10db6967db983c0cf5e30b82c39a972d7f92a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11003 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 diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/access.png b/jacq-input/src/main/webapp/resources/omega-layout/images/access.png deleted file mode 100644 index bb8b1d378bce81f71f8e9dc563e34c9405b4408c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3756 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 diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section1_bg.jpg b/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section1_bg.jpg deleted file mode 100644 index b55b3b0ffdd0dc4991951d71e9d6660510d0eb7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144066 zcmbTeeO!|F{y%;pDru!{v84^fvL$S1naMff4T3dA@D^-0hk4Ypli)e0B)mzSin-Rt z2sCM$A+P|^ZRR@DWi8a&6l+IOa9ZZn#3Up$6TBhC-`n&3eLvsFi=oCqFc<{If?v@3W9Z}PGwc%(l#l?u13}Ox$OZN~1P8BR;1_hB z4Y~gJH3aPi|Aip90``C2Rk-}`cij{U`2T+Ga%$rX*JmL@GV4_CDK6_&j(^C${Se_0 zHNkb`yMgP!uiyUf%WZ>b;X^U>Z&wT7qvqN2p_27Z=(SBQr`!~9*lx(>H5mLg*!r&! z2HcSw?7!E4KL-AQxxiiB+!32RJU4?cXx#>G9S(PKg}b?J{1{jT}ImiQLmEUX%ICTBa8;pS$dqR$#KI`H6<_;gFHa9mfzu-(Eul%!fpP&EYOTon|$)&HWYcAJbRjSnW znuf-2|NUc2>rXe@Zr-~4%dcJCx}JOY4aULWhlU?K9Crr&XQO@?=2g)`f z4^@71{fY$4(D;zPShg`0e?Pq5XGc|91mB`~PcX|1+@vGpym4*)pKBd_6Bzg&;KT0V_f`*t$N#+dfBj

m$$>I1Fqi_-haenitt_q8r_Dg`FAwq_|>=*H?- zdNFD!=+i~T@mv+=T=)pz`^jt~=6+Q`2Q$@FUJFGDS3AxHk!XZF4&#sHU#xLsRcL-! zxE9(QJ|GC&(jS(ku_@q09X-x&iOC6}Fx`U;B6c`qp%%gwWh}&o#F0~J>32or%v4AJ z7H=9NJ8{L?(gJauMReJiq=SZNeoX$=ncLRoclT?)*Jv?2WLO(ysG2EmQ@~|4UE!jn zC$R{15YrXeasP@uk^!9KA-_NeS1 zcm!_^3J@A#>yT9eN0l;9UDt4=x$3DLFDy(eNq^p9l3b;}&tw%Qn0n@k`L z@wY7KvkxR9S`lc6p_B%t712k;oS6N=!z27HGIqFK-J>%I%>pPm&bAKO4LQ64J+T2= znkkWFYB3kElYH;y$1z3ub5#2*rSw$xpI|zJSf>s$4GEVlWSC?6tj7%2Pm;Nt?46j`n;cqXm zq@1i#6FFo=>;CO$dET@%u1F$<#R>D~$nM^csmsS1HfM{hp1(cRO5@0zkOdP9bL7o^ zT&k58#!C)69YXfFx5~2EEpc7j%;PTq&KYoT z#70h8FQ%{RC+rW1o9aD|d8+ti@KCjE5GpE_8VYQ7rKUsexAqiP=ptHWvQacSLqh| zEO`?}W15Y^e5p3AZhcEjP(Yl@M}{k9;uq@YBpMb*yp@bQ6(I0uBc3{J7AI8hES8GHdvR+cuAo_;hC+F>};7)5Yi3R zyDZ+TmrhoTR#csHeqm<;U7q%1j(*dL^Z?6j7B_y+N2!#7OqHzO*TS3KoP7 z^hMUKv0y}R^h7aDQkv8^;5i|CdMFAZ;M&5?0|-ZKci$1!<>46>!n{)!J~8 zt(eq@oh5sQO^TZWwU~489mt|dK4%TPwDCX9g7Bx*O3b!S{!OxZ==)L<8C%Lo< zv>U4Q9LlaK#`@H_3%NR^qQI`!k<#y0Y}KW%Lse0|IArEV@fEE-#jNpC96Q79lQkaB zl9sk<(F$HEZ-NfW+FLS3><9WpTbmgV)!?DXmS;S?qn z=o3pqq^^~OqIa%hVX}5fzPc+2E^6sK`5sc;z@_-VMdbUu750#yt=~Ntv<1<<8Q38t(7sP>w9W&nvc0`9)*(+4NaT zikz7d=xc7mnZ`$|r0dWHxTtg|6n~=H*V+|$BXowHWFaF?C0Qv1wQnDFx(aoI?>6UPFccLiTsy5p0xyoJz2!ABETDC7PB7*0S=Jsn8DZ{Ju1=mkvkpbjWrKVK zvRsp$#w$VQn}sQmwKov$7UV80k?<2s_1TbmEr#vwTGG;)%rQ0vqMt5;CXAyee3kECDspv17n%Eda@FVPoaEF7 z?a6f*iyO9a%c>~o=zSzTEzCYk-g?KToW~dS6Rb`y84+I|?bmXCw4`Oz;is&KvY~3f z7I~A)Hi36Qs9K+WvXsPx4ub-wUJ6BOe3t6hp>q)Oe8WBU;u;Yb#sTH^QIo&9HjI7; z3DqI+-0m;~$G{J-Bzv5ttV~z=$uEWXCxe3Hy*@B68ZEsLq*YdcgMzyb{3ktukXNFEB7r$bF%39z&avSVl0DEvbNof+OgPEh}MbUx< z5b@T49**bGN_UaFECxZMO3ymVur3mL|l=BE*!}48WpitSw zFLGFS@Tu-g<^{#e(k2|bM`<0Y+1llrN5nm_t8@ef98(u~G*K6Cc%2Q^{XkGJft?vF zTOrIvp%#W}JVc4uxw$x<&t$nS{Yk8As7WSKj){1=(-mMJ!3rb#Lziabx{&Sn3kzv7RL8rC5(vS?AMG4QuP zQu~-j>gJpYzP{bX&X!cyRXvZEnsPo}y#uC{)rAej+0>oA(7^^xfse}C8&m=yMe^35 z5`szrw_2m$!zA71yLhoCh4VTj`1HNm;U<67PL7KJIu+RD$5ZpH*Q#vaZrsI#xT0F%RsMKE!5e#VGXjt zWQ~Q7h%^X6D9T`Jf&x!=tnpZ8IWt`+2$r$=yw|$WNnrjXrL}2=U>AT5b^*OGRE<6t zctg<(A-+M5{Sm4*V+^8>Ni4L=_9kMT?Je41QM;^#9}N0BshOF|;B6_Whb5SiZBKcI z)0B1=q`qTQS#>W}-AOCG{yTo?LdS#+$cL)XoeBik_)=Nb8`z2_b=M$#oJRneQB6t& zWY>W)QC)ax7%c+}PBx=lHp<9#){ANT_WI04DRSp1$j*@3!_s1wjyopILM6NSfsUkq z9FqwC`q~;6(jm`_pTrcixvNjN$x{c)%h>Ucro)7v%ue2(&79TS~tv#n@fA>Jp?ok zad-yz%QdQFxQ)ZtrPVE~edc1rJoBSwurRW(CL@KbqZK68@?m;ra;RB2AluJ!O17lk zUQ}C#g@!z9*S@e5{4Kl!Yg`{2L1bYrK|w#@JtHN6}o}(IvkQ{lkhHuca;5$DyXD|Ga}^bQ=*~0rL=<9z?aG!t^0SN7~D7~hwQge;eA%0 zPGJs@NknU>!49T_j)J0>1LPRe6*#;O{Z95URBO`YhH8WsWhVmgxqa-4B~Cz0fOe_P z^J+7y)ZT~yIF9sA@XCp5^aUh8$tVc3t7qfv_|6mF*})@HL=&QUi2v3jfD24WRe^FP z*##=8QJaPxj0q8&&7kb}>!SFS!>`snR5T6V?i&al?<3xX8VVV&M zZylfi*=Hp!>TX;)ONlV@ovX-Rx7bZKS zfNP?}-4z*`THiTJN-yO1i*{eqVVi1B>}@7C2inrp0t}`A_6ID&^Din9wfhGgAbE+lw%&gM7Lm zS7SnWgjb;|qI@vf1ysN^Ejv6pwr;DB34P0`ZPWxbLA%VF>_m^QeMAROkm!8q=y#Ey zMyINh$tH0^a+7&g?+I*c(z zB}blbnpPZ}vOAA-3{@FKbxDuOn`yy@DkEOo0Cfemz8y4F*6 zdR8`OEAj;M2bW2BhIwjYCx#i>0zhS&i`;v>jEWI2?#RKjOcMQxcyP) z@@RfMLpohi#OR0VPqx%KiiwsaOEiSCSt*~=$E{S^@}dH+4Z1-~EbXqo0jjjD?&&&2 zxGDykO=6K}Y6-r`{Ef=_H_&x@k(q$Bf+iKJ?7-)Dq2T0AVUyJYH&<|59n3I#CyJ2^ zI37|{nXsfr0W=OyR|BCNi`3o%J*ph^K)d=5s7Y~Rrxp@s)shiId@rS+q%Nry9m858 zvLFY2T#yorg`IIQ3e-MV`Ce-*X6HWe*_ z3I_DgL!4z$#gFm54^!45X0;l^&`yRp@sC#++M*bG9REG`W_T4OGP$ZhAW$Fv5Xl)3AC!T(}O=LOOj^cK|q>N`}YYF)t{`!48dE zZMcI#mEa+H+9238=hX*AS{6iP-)2)w4 z^JI@_#YK!fYhuLw@<8S20#I{8M&;dQD+2fM<8-?MZo~tvHtFaX|ETKHu#px>pG$qZkh&XHky zdhJQ?%<{N0$`6W!t!Q@ft$}hrMU4VG|8r@T$X0_l4c8vpP;4^ns)#M#O*lL9vU#`` zIvl0f7>6XHFh=ff{#)R5C~bNkBla05QWS&+=nC8I&O~n9ljvd+3UZZeDK9k|FmgiW=H1A%$QBivC&BYmq%FZWB8O|1% z&aOso2``aoL>){b7G=o%;kFa04XI5`a;cU(TVp}FNIP#+Idau12oMZCvL+(sJRb5w ztaPE4ro~M95FcW5W88dwyY_pg8j1#nHK2|?5~P*BbLu8itGCtj)408X2JvrJ3KI%d z`zkd^3B(z0MHb_VlA-VdrI84vVo&Hm*phltwTLXnwjqqIK}1Wa=J?V#{5*>Y7jBwY zTXkx9^McBSGiV;E9swOf&x8nlM0S{Wyzv$&V7iDBe5xxt{Fvw_=6?AwvZL=S{%C;` z-b4^OvPP=%OYhcohI3bJN+aoh)u3lVAUN^f@r=x}7$VEr(FE-ap$>z(F+NnS0mV`} za3^r63LL((A@T6a*uv@RpTcTsA3{q+T%n$si1_C#`Z(!6-;*AT4UqQ3`bt`gb_Ulb zp8<-QVN;s6gCElPF))2Ob8^)EOWSvRM^8oBdCEqwYM z^?4Y5^*k>=nZMO%4}E1oPA6}!vQlfAA!PSN*5Vx58UtkdR7XjR6v)>&F6j1Y<4jVu z+JE(_!p$6tmx`M(hVm{5-N>`eQXd62GwEcQFOo~4lhM6fT*M_U?M_LSupeTfG7I+*7Gy<;GiS|se6Eep(#8=BcMW+U0F+h&+jrG?Djp`Hm< zEvg+QNJ!q~Z?!8&%BsrA?nJB-spUyQKhDzd2&=aYYq;=!mmFTH{pp6(H&pGj%I3{4 z_rr5ofyC3S&|cr?IKEs=i=W8r3QB*Wf&-M|ipq5uGTSs5T4D?ISxIi)TI1MS<5noh z)xfoq(QT6=g2L4aoQHC%fxknn1{=-jOz_iP!@?4YD|Zx?#@aNUg{q^+M^*KrG7Un} z+N)%aUE$gt#w*Fy2rD}k4ttls8St{6xgN##VfA~vbTrpMEy{`aBX;Psz2Pg#`phkRztK2d*IVO|3yU(zBDSW{`Nv9h} z;N*#^GPuEyJ$SurBnWTu`1>b=(kE^lWq0<$|OLAx21EZ{Q zI_7?u?ds>jIqo=a9}!0&;wTYb>yQDoRbE;hZofA^*94T2^xvBN^=Nh!s3l}V#(#m4W8OxCiOacD^9Wu)T=yPw7g*pd{E|}~V zWz{`Z9~*j2wyajJvI*9)n$1sHvt7Osq7un=0Tg~rz)WPp&L}O^dlB^ER%l<5S2W6D zLh@v`BGDk!QsiLdPFAA<5EV1SgmkNbbWZ^fi~uSu!>brOQ%dvM{0vvv4XC-_bh+r^ zQX_=9gj=;-t(zUdzdI1XJg)uTokE5QmpimMs zY)MJvY^?iaEv(oQ{7CIOS?(y2JlJ%=8_S_SU1*g^!&u@AI5 zh(jx4WR435X33i=hAPoRH9&w?iqWo=g+#vzEvbARj48XtLLq=nw>NBn;$u=Hp|J#i z{DfE7z$4^ym)r>hYH`&PYwBpnMi|I=S+I~dV5M-aQ9dREa4iaz4#O*;fdOlkSmL_?NZ=4=!Zn5pM+u%@X5ep|%2SptGbZdn;@8vv3oC7zWt2o4bXJ@hH~eC?!9xCQ zx`HRePH<@)fMh&`^J48A zHw|L*{Q2LuejTffT)~eMR+XITJ|nTZ#;?%>dYq@MpF*dCTo1pY@+Wy3%P$LY@)0yFuQ=~ z?yIwFGRqytC|&yf>XqbON9JSLVVuM@7GwrhVW?`X`jHmGfVb#&E7?vgX2Dof9O}lQ z*K3&R)-f?J4WQJrZ&(h7wqinJJWfe zyUf?7X?(kOt+6I@E#%F!R2e}1Hc}IIPN((vZcz8&rKK_)&>g|_w)%H-EK#~_h)KL& zMU~lZf#p)9CZK~))UZh`~fy}-e>U#;0( z3#=Ap8QJpy8v*cj87(Oi$Y>MC>D`5R`C*VPi0(`a5!I+2hApC&;zE_ngqL;=>uZTJ zIq3KL68v{`1gg=6N@1o=Df3PRa%jkC{~0ryW$l7?fvOqYi?u78TY+kW+l0QUp7JYH z&Ca+%L5)bi+w^5diKHKKvL#E-OdCx}@~MYH)^Me?U_J1(icavo)u^2Wq_Q7Slb8fR zAqCK3JuNMqk!7d~o$7ZP&^@Ngy9N8;eC0?jP%Z6-JBghJbL00=;mq{| z8v!2I%?2C}-0G0n9D5)E4%8y-oCQ=EBtP9CS_2IO_rPtH^bUzhOXoqr>}7|q0if9O zF&v{tWeL(G;|sl8;6oSdC`0_6yrNo=AsG?_u>lfn*uw_9b*ReH>;D$O$GXI`bX;NdcBYruQsF)rCL8WvO;EhReUSvjZUFCND5)Gu<}4Ub zxMBO?D*!P=bpZlslig&Y&afZ!;WXDaDWIw2_Qk6rDWez*`6`FCxcW){p+&1*g)X#E z>T$f&tZj8${nZxg8h~V_Qo2pu^|s4)fNRpQYd{rX!9p$6vbe5YK-Ndphs2P200KL8 zgXg-xOkT=N=Yk5Z?$k9MM9&WaC^9^sx*!5HqmK}=7OI+EeX37BX6ga$Y}){{HD~i``MHv z<|$yjB*PmE>un(70>qGWk%P)+Ey^J5-+#4&qhqF@YDmwa3aUbT^Scz`1zcB zO5rPjjWkL3#TK&Hy&Gzo<jZ;y&?#tMKNM@B_Jv+OTWE=elg?q+*tbnYtX`81 zl_I4jxkV1ci5gGNpn*$CUluWB}l^^t%@Y8T(k~CVxBfrVd0-3c(&QLQ$1suRu|P7I|A@o@@xR)+#n?QIr-CqKe@cxnMgsN zw=2c!{b(tM8E@~}W!3^KWS)Y?sz5fS{h^{tYM|>MlQ+e<1r70o^-U;|1d<%977d=L zK&0WY&X#1Do)+1X)f%XU!cmjL6reu2n9&JAiP~F6ZX5{Gv|SYtpF&RwNRHGq*gABP zzXK&>rN;n1R?lX^uybWA1677 zwyL|&bm3NUEl|Ema4HSAMzn;z@a_O!mDc-7l!IY74r(~1o)s8rdv231;yY`+WrobGzL4j@0*&UA)Q9$vqPnLP;;s<&F zRw8n#%l$4KN(AEt;Kd+wwxWu>`gMg2yRGHCap+<-F#m(co3;2dF)*SfT=Et|H$scI zHF_13JWrCeE4c~^h|5Hl3kn8}Neau{kc6YNrakT^Y>OsIk10W3?D4RSwG(5gZYSat z7=UOY^1#MH5W-*&Rc1o{bhQY$8oHCV_OauTLC-+Txcb(&1BqZV{E<_|*uKaXsUZbc#K>3cOWFtdDX=8a!>bhclmRbQ*0Bmi zJ4>HJNo0os_G0ssNV960NlpIVpwSPxpkgA5l^1y}_d zc+`<+D|kyP1;Q^0zul3-6|E>keG~{FAvn1SeK|O4=rkWK2gxZXe!SU2IR&b%Z(nqf z9Yhxm$4exT$|V1kE=%xr0pFbG38gn!<7(OWB7x2wu|W0;99~JzDYR0Z(LTKpc0+|X zMHF1+qr82uUKvN@fG7ZH%9$>F=1V1@49{28b7j4FhFLgSvw1H1ZQptq)3Bjh9Z2R- zYd?a4gMcP^(%klYH@&wP=p0yB(N0_#Jr+)E3=J_tZ}b3YdolELW>tk!x4Btu_+A z{U`hzM{+pBiDqNlHb-?5W`K~u8SXcfAb-UqZV<)GtL#M3%MkHi;RD0XPvRaJKz9d) zMEMhzREd}RQT*ic0~P>-$+TFh zG_Fkrl+C?GB{IqALRXk*9WpmT`1yo@)(9iV(T@N*lzl}8bAW~xS+0hwi_ZIK!+0ro z?De^wyX(gI?@N?bmKj_*=3G!Bu!%RL!gxgkx+h>wM7SvArgU(R&q>> zE0ESLmV}-ep7GzYR`R*ovsjaldxfnR3tEc;n%CoR8!0ZrGP?rd-Rxc+Y5R{|2M{7m zq*wdapQtlh$j|o`8Gp3uS}B#w3~;M86EUH91|thd(*X;bETQ+%6*(A7HHS_AFdeQAXrL;JkT>Z4L-i!_toJuW8zqAh^o-*Ps zgBc;eUlSWRR&DKOLyzsffj3sVu(~8#;sY@IMRpC`+I2A0IwULu@teq11AX`bZ(t*M z2?Zr(hm6)HS;vGT8+6;S6k1;!QZ+~R)|WCvM5TSW_Cd}gE7@xj%rh;1U>uq1W?5z! zc^Ny?mg`}1T6%W8sf-NHq#iG);k=6IIXgntDt(jRioy+5-o926U)CC^HMPtmhQ22=|1#ozPFa&vbAjh+r zN!D1`d#VUIFLb7K?T8;gPvP1ZR*VaukFx2Jqb5z7q~EItX((mJ&zHq|5%3=)rhqLX zqi87?+ih??y77Sr%;u{`lP<-0#oCFuC{VWHx@I+;c%GKk(dxTrAj9u1QBiGalwpS_bJmyyoDQ(?F@>o$oK($==a!MpEB)|0#IO@p zgt>UfanGEHdGco6W6BdjVo80Kzh4+wq1i;RwjgX%HLQk6fz8?8PpqK3s2$1hTe%9} z^p(oxMYU+C+89J*)$(12V(vexuI-4;ux3>gE&c;ohtKn^+vcVINlwk#Xz!UX92MDaP=-A@d>xaS*#!`DNJc|=b1r?6`5Dp zaHDzkGTGp-L1}~1T4ICA2UL(pO{fB!gRWx|99b&>--v06+5-s~ruR$5(H;v0q)d~z z&S;m6sJR#fh$Li(12@(+A`djtII0dL<){wh^%Xik%fQ*5a#oCS`KVIC#OPu$O${oqg6qW_TYIP=gPBl_r?;TM9P@Lg)j8_)5az&y@F zo1T_BaTZr@p?Rlq?kJ95`J8~fz4UFre(T-Biv4+rlTSi@(VP_bSwmSpwcpkoR39Dl zmLNwLzd+WB+Q3;{ny}ZyWow{Gr{CxQupqO2Q|2&+<*V1+AYDOk&~VdUc6c#%+lw=H zzd=I|F?yFjS5PLG)hLd)XZ<#3iJ2F@bNyuT1?;J`LC+^bb9wA1ZPUs>DicN#N!?|m zR|uiR##cY{e$Su`8gB?+CA&V>&V$gv2fr=pA18hU0`h~f$VtRrnKwGSEwoePZdV+? zNs7dFAty_peWLJA@4mTT<`oEWc8KuAWvN# z?%s;&+HcX3bm#6uj zp_XU_;-v~kd8ty4)OdQ#QT2&~+IdGm8v=2MLmU@0EJ!B6fc0a;Pu>+0P2Rsp>Hc2l#4x0i5>#(5)+LIH?V(G67{R13m628n{?Em(T-pdC~mTDnQ?(4~A+ub`^YK zlxN7o9F9k5!{@Jdl2%fFq;E<2aWGfqVisqoPFCFLFjId<05-Y93i4m)k)yRCGr?pp z(pm{S+>E?TY;fIp4}G2HF*kO(BCNEMc1D5V#Cm5^rHrgL&|3n9JLBgQ%s0#w6A->h zkup$ZI^H=^x>h1N87S0pQ80O%s-gg~Q^!7m1}-n^hFF^#pm%=oCI$$w8D zMZ1^NySF$zIT6Hzt$^aaP`i57S#Aa@rpxY_jIB_3yE_XZOre6zEqnnybHD?0C(1Y~cCFZ+&)bcQj&mK+iFbKGaU4 z*|+POKE3le2^IADuZ+}pwO@KAzu$PVcj-5Idl$tsq%3VA^ICo5$?BoREeEbW@hsR< zBu`I2+*RyqYMgu=?3ql}(zWmXn)3;9P;;EqSdb}&ygW>RZKUqIKAHdZ;iLc9tt#!F zxgWPLlo6#ve{m9;`lsHFqmzZtK^Y-%R84SnA{{j>Jg z_PBz8^YoKnRG!rDQ9Sv`*D^kTb^pyj&*u;LDX%Vn{?cj0nKB}-FW~OvvEQ!{-;m3zU)nYAUOSNZZt%YM1#gLXMWWy9zRSL+`71Rz zx$hTN>cZy}Kap;Q59McNwNO)MJfJswKf0KDl;2~&wmo6qdnC8}!j0G$7lgASkG}B+ z9nWyRz49vjz1FZFOSdihot5L>xmASzl>4qJV*8`jMa|bffkwgf)!!8dy1)8z%V$E( zo=nB=*7v{pqU+tAF|7XAaRCu0Y7ElHgm1e#eO9wo9}O8sdrzP|z6r=ZzWVDnpZ#c% z_CS9AP&4fkiW+=-rQs{b&d+{Zm_-D(Ic!(&o__DmDf-VCrjq!d4+ros+k5)|{)G*F zW=+N zB&hyp*UK&y9=^x^;9DzKZ#Mn;&bl5tBg^Ty4x^6r(9-+FrX zyk>XTc*{K8FP%S~GisR1`}WC;14-r&E{wj*LAQup|NS}3__Ny##qibUn%}nya*oP% zmJi@lyp#oC=c;!<_@_L(erzgCsG?&h@?vtvYkBTsKrjY@cD@)Ft8`Al|&EN8SVp5^+RU(>~S@ zUcROw35Iu~h#|-z`P-~x{Lykpt$1%;*SpX&@j}JFeb-p`EU_L3a1?@X!;gYg0O7rz z#jGBC{qbYfAmtgJhcXL}MmSKD5|jX{D!-?m6`Uy4WC3@U=P_M@TC|ey+JL56PBBsC zG>_+Qkgr}F#0#CH8t3bwLV}XmsRGagq%(jx*4+AD2oVb{VlEwQ4$y8jRJ<~h_j2sI z!wG~QHA#lkUN_W2#9$-7W?GVr;5vSXYD^l_8{fyXDP9{)*|xekSw&)=jM>lL?6m?Iy13zLjTf;I;G|W9Jlz~iP?pU_e;#BM z(5?L`9%@tVhc5Ax)&55^Wn3|hQ8+tC>kKETTx~igo2XBT!lx-FL>hmukXrJktW~oxU?5;c9?wi10Q=MhPZMyuy{D=NTaN3&FB&g%_6igEYuP<~Ah)&}|dO$V@B3iuFXbYm% zWd}&7udT7}Ab}NEysQQxA5xQxH!Z0th<6G+9J_IM&fF8?7YbMWdB=ckOoGbAZ(1K* zE$X*FDv%LQUH$s~Zl7Nt#S$i_%K1r5$DzOdBW4}??8CjSKmTR%#nl>FZ!KwW+9Ccg z(|1n#>^C=}t)^wwU;gv&m)=K>@|kx_^vQMqe7mKvZnCoWZ`!Y9-hS=V?U%ljqkUh6 zw}{`rHBVfd{`+A4#ln8K_k#9)z&kE#n_c-Z_tq=s-IMQqvGvA{u?+5TN9p}G`3>JA z?-PP;0pIba6&FvnY$LpN`T(Jc@gdnR^UJSWn8e?@ zN8dzY76kKe{qW-a<8D*N-!r26*j?Y&fMR z?uW=ve;W1KVn&yG8mm6O^=T}(1ykea;V9~VIzu>dfHoW{YFjS9uy2!XZ6W=gs@!kl zZn>g5pbJfd2c!Cj(d&@Md%ur;drSKE<$r(wy(W|J&y#Q6^w0O1_((Eh-QRgP_TlPM z`lU;?5&7>NGUX8OOg6PnsYed|`lfHs-^vlq=+A+;cZz z{MffgWaU45jsA{VrZS1q>c6}1cIjz2{T8OXeYttlz@M)l4N*N-?cE=+Z|X@B;c21m zjsDa#;)JtUb6w4;v6$Zjx70;hWZCHOkZS}pR>S>f{)TWisJWWba{1zr$Bw=VUEAdy z(|_HK@`Jro{EzcHTYes!9!vI|a=9GyVDvSs;r9Hs>9!M>Mjt;^{lXP4B8;RTdy*7;3kNRKd zWeIFwb@=`DH|5QY>q&pv#Trta{_)bgbw@aT?-uJ18CE|ycs}ny z72!eGuCF{7i{mWB-I=TDjp9{|^DO;jmG*r$`;7B3YBVIq91HBRQ zc{L?%GjjB%ujR+|-Aby@!heqcefK;1xiVQS%G6ZY{oR|IyoN7L>|=hJHF2+_k*D{2 zd9H>0?fc44P92DQ{rSCPy0e5C?_~1a$D6-@)bz0S@z*m0v1dblZ`}WOQ@9{=dJFF$ z^WMq)-#@+Id*vsl>L*A1>)CFyCuAxN@uy!da&1$UhFjRFV_*I3IX|I!h=8s+au4wYDxOW5om5KW9&IRhZyYKNvru)CHy{{ECJlEF#)IOda@Co1Yr1ExffX}MKA$alg6*0E#G7(wIP8Nj|NK`W{ZYu}OyP5Kr`IRV@as0sv;Vvq{Kx3hndbptz2~ffHsKVtf>q{L7yY+_aAT zd-v&2LRV)VRQ-6Q&hw+7&!>3ck?;)HS2@}L?g>77#{TV`|A8$PC6cWz?6W>83v%-j z#?cC8eQ?!>@T?9K*|=A~JRp0=pF4bmbSa`1;t(b)_D^x+?^$D$rhyQ*AmZFn>)(K# zj6#$pZIwk?$**UjaUuQ2gBd4;KxKkGBoda?TgPfX&ca_dk*1PeA1+yAVnQdCe+X?L z>z^=j-FGSv3EKx6b;`y+vOvF8cJcUhU2n8}!J6n-4wO>;4fV!TS1BQ*2B10kdFYs_ z&KCVinJw%3WPK+o$7hZz`-6Su)@%0ZvpMVs9^k3gA;rO_n5{wJ8TgM8C+B2W<+5K| zqer>D;RQ#jinsNC+Qw0vm44h$CV4jf|4?+^@l^eP9KX79ktk7QN14gYHLjVx_Y6fu z!oAnLvWw`t_UyX$-bF}O#=V3qJ3ALQJ3I6HJHNkq+{ba8`#JCT`}KOh-i0)h0Kq3U zfGGhwa7~3_a9afW@?NrHJtJW3g4ow*uhG-1Ke7+C0Xe|6djnS^;97FdT)ko7OLcxV ztx)1fmOOyg>-`mE;Egv`AtwTE$03POh9V+?{eM**vq06$;EwAA(fL@C6ILYsO2>O%b?K!F;E1E%=6U+U1d?iifk2a1watd^H>E zSNciobYvTUC5$V1tw)QEJ?rhQS->ew@sP)p9Q(546g6xB-vZE1q7B8lyM(t}%O|k_ zCJG);!PZkJKnEhOY4VqtDp%{!hsyZ{i;v_&*ugps9FmwZ3aHfP5v*L{=O!SmJK@W6 zgGP~Avge_xSMFaR^$CMA4WM1@u=p>SAcGQ6pJ||s3~eYOfLBf`$3Pq)hH{a0g!fa@LFb?- z$W;^wAg5p%5h{mfr&V60rPAGY1H{`0nj|elz@O|U*i0Zv`EC&Ra-U?E61Jub<}lYe z#rP{Xb4%O;c@bHQ9m!@sb0s8Imn1@2!{;2Ezk>$%D0N^qyuBhg+Cy7PJr$ zRoc~ZR)DOMoM+lOfDsXSVyp~tIw)k%*$0eZ@kJ(}AwvU!11VR9Ln*(*2N@Z-@0h8A z5|xSM>2NAHL!fvgX{dwmKmqF+xs^kJD4VNld>NZOml~#ed`HnkU&T2gVzxWu$qkb-M9$ME{bV5%5b76cgGI2x6{A6!4U zbXqc@4kk8w8?-X`|MqqqV;MZ08d(DLaR?~1Hp3;OO) zRw+X^mY7Xcu+aBrp~9rV4IGUk?$9)XYWqA`*h1JfX?(BbW?W}*F#ew@Pet7mDt?PJ zyW8M+uNnivQTw4hHA(ipXr->1$-VNr=C}`JFaDK-QE0(a4EfXK&04fBI7JUd|(!V#8;zN7JdU2o)0wQ1I_bg%GQvqDr^h zW80Zq{))Wc()F#LntN8~Gv4`d^@hxRJOsP7gG1Wo_wUxu@Tj8T9rz+=ks;d8jRx9^ zxQKcMf);U(9}AA(-?2hW9n87HtUq&{ZZ6!d)Mu*@Wm%bNlT45ti^Z&-1~p35$zavd?RLaE*A`(x@qekA#5{&tk#eM8goPdKxS zO}*x)*qd)(x6gz2538eKn$9N@w;c`TKY)U6%rc6Pwh6!g+@vgq#2)++B2JI#lqdv` zVxYh~{h0;f2qtv+BL2tI1pxvdnRjw#&Gy=(ADhC1QX6AtM)zNENR&W0u}4*7lX(&X z;2-gM5BrWPXAL#7UrWo8n;aDl7E)h)oN(P)%OXD*cYIYv`2KP{WXGU^;@gkxW_#@` z=>jXZb#tA_=5Y-xau{qw+Y^#O(4q*!3CGm8@Tj*N>zc0%088s+ zC65f( zuxTN-ns!f~+$t}=e<&RTT#SM-cAT2L&r4SVi+8WB8O8+^O7&&;lMYKWq8&TXr}6Gl z)?AJ(eSCFg-|kPuMDpnw{?AChuohO5a5@KaLrHtv@WiEA;`lu(5=?Q?^# z6hr*)mAn3foAmw%>cXDFl^<9UrSjS@9Bg7fvKB{yF6-$Ua%}A4zvnR|K%9o$7B9Jm z!e_5JVGdapOmLTnG@gO@k#PI&w~L`VlGFJMGqSld$dRyS(M`ZjyS8|&FeVE^_A#}5 z9tsr#W!x~3Gt1mrn5c-vEoEcT{<;45=ZH+3%VY9i_rwjZ<7S5?>`3RQBd)DtobW8u zPC)SdLxBe{IR5rlNyVIOdByh2uOQ>g;L;)aVPqBvKM{VNg@u*W3Pd+Wj?Mts#6d0u zKu?}27AGsk6sG~!XuH_B4Dy2r1W;8p!j;8bHex?00Al{DTR6x>f^TkwIzJR9)Soy} zUSsD36n!R9FoC-w?6&~Fwl2yn=>0|y&$9)rk%ZAKDYpbX6I;{dg0(^o-w~lA$5%-u z_eoO&qf!>~q!j&fSk1|nL7(iPdgoHy?D4t475yp2gSX@wl5vC*U5HP!0)=ukc;nx& zRebA6K3^h`xF$a=;eopVl13y?OjY=6jOR0K$A&3eYTeFS#vQxX3>FfVV`500*il5_ z%tYQJH0Qy`3xVs`KqM(}{F^a~-aw|7J*4t2PXZCjw4JSVI!>>AOeh08tpRoY`Go)_ znZHWIVICd1MN~YXKV^&r+$Gz9W;uRSVfoT5HyN0ZUhNC1FTlx<0hsZ@YFP7Q@4%uV zIWy&-IW||8e@SK6Z5ZzyE@4@W#4iXN`bWiSz(2%I#z;8Xr}Og7uAon5=EjM*k z^bE5F7_%#dQI>fd1a32EZWK2E#^VBdq&Z{6G&n8h5rbKJd{_ZwK04p#? zIxNTql8-j@xvvDb)9RsrCjUDf34xY_I0TAd2u-O>{C+O@%T<2XB0Lk;=m9@?J{?*J z6AT3+t&sCc06)PEIX^oc@%z8AB6q}B0Wj|@a{|6)l|tUXfWH;Q?pt^|k^}`*wq8kP znn{j7Ln!0H2N0)tK%kj8SNq_v2cIv}|8<|5S0Q|KEjCJ-(DbYx2U^S0icz-u9qk!( zA-u+r1Rq(6QAzMr_WMi2pAh;z_qobh2ksv^tDfy29^9U%q!aP-KhR2{TZ25%1TEt~ zv$1jffTq9pXhW~1{ z>AqHACx>b3Sukh+wmQ%61aowsqL$LE&F9tKB&wSioy8%%Yguo4?FVPAf1Q&A9Iqu= z-AW_330muNPrvDrf0Si2V;Zf6Rl&P zl!A;5jpIGXpE>-v-o%cfk~e?w40`kvT8^3yO%UNGnk#Zck3?@|8E{E z{dhWrybTqn4l7vQtoD}nKx=FKP_qydor10^Z&Q0jSA@kTw-0qcI?lmA^AdRG<(p*-4_RqAcDXlj{hylaD ziPZXhy|*mLh=J~<+PpW+CLLrJ?p@2#Wj#T%>|x)I$vCD|x2&4T#&I&2JPC749QxTz z6uuZ8K0BRYO;dl?Lg}i&jt++Qh!MX431CYh#@MZG#d=%S=DER-F^$y+Y+%NcCQ<_* zf{#EOcNVP}ITjo&%soH2;@gk2f=BVT|JG)Et?qG%H<&8w=NvW7)%3Ag&Mx_*uBG=b zrFz&DzI-{8ob#(m@rV`s8P2$id>xGr^gCfJJrFr$ zb7ZL||1?r;@%X{FmM!}A_c8)+#IKJz^*bQb?s^7zm&~yF3xQVJqDO!Aqy%a2`r-=s@k1aPzL5f#y0!Kb4`ETW{ zT()?R@Gs7)SEXrJB|_|lt?VUx3-~atuLh-Nj`*@yel~Iae#&&`-E)HMwUfjRqo3mj z4L`>eTAJBWV~U}J+j17r*8aVKA&`Pu1^*y=89*!U4Ef&FZl*XQN(-n45=TD0UM2Jf zT>1vPbbx$vf62%8FOv823g2*w#~Smq;M=8gf@)A852O@*^Cd3LSSnJAPewSc z#4p6Q%7ni2J^Sdug6IemYvHr!oUck+&uq>SQLBkaHrMll+YiRyy8%g!xv4m&r3zg{x8dLfb?8RsY?Lb*_P+1>3% z_a%Y*elPoLX=}H!m^F(ajAH%OU%1#PG~W1h8lqDN&SG-Mfzy>UHbgpu(oLY z;8R#CWJVX+tGyBLaa{45+XRBd+o+ke6@BV(g{`f-Cx-kgBRQgsKWm#LhnvtcNZtQnTf4=sF%5o~J( zjKOCkwbv2?m|UyXWiXN&@IiS{^J;v^!N+KOAg9e0%g~!a0f;Y#N@azETqEJvh5+lH zM34!P_fZJMsm(I%7ZUUE8?jzCFHemmRD;IoG=i_oLpKhJ*#XV#yX-0&Q(w|licP4e zrhx#{7alyW{H+qUq9Pxg_)Ch^MRIS*$8VUw zEp!e8@lxfwI!<|pw7QkX5WamrapL%TAv9u8*%H2ZSV{AMbJi?vk|)G&cQ*LtOP%84 z-|(E0DoI%S#-JHJ&Ekkc6Ld(>s^p%_n_KZ!LR!?6hs>#b3yQX2FBYN$>T0KQ5V=9o zByccp5q_yI;2FFjy&a2RMQG|_ejSwr<`yq2+)U7CFCa_#A0HG2p4aa)2r)QRAs4*3 zTf`SJukPv_ljc~wQUj(@u9HjxNgI6rWpY{)Xa?5vb)#8wEBv@|N>oGg#7Nx#t|T6yWu8GvjYTrP6bRM8)hsKVWNf7~ z_sSD4N%9qiSro@4k#MFxkl_rG<(pPGaxA9 zf%4MJpR?f>l=vWTp9&`Q;LZLeT%Q{u0wDvT6HvwVeA|V?GRjDnK}BQa?MSCq1sT>s zb9(KiV#-UithFaYuMCF=1jgqYF)ZsM%>f=DwJg4{ts1#^%6!;6;HbXj(c zPy!N5`*8pqt{$0D%f{||56iYNUqQteeqxr3Ho5EE*-YLofs|MNQ@CrMa4UZACC3l< zV8Je!P_2hg*=>V`s;hRNaVLOb6}zivqIF!9OLJApPcrK*=Sc|_v(u}}KxQ8Hpn$)~+?qz=ki*@v1M50#WPG2MwRqVz z{%--S6)@<_?Q7`s>*x)GTSk1g0M*_&2|#3l{2c(19|{LbZ72jF9`B_CEdO-)wez*M z1Hghk{NN$KVHIluZj4%~H!1BSz{S-S;+4p)Kt5qBK%O~XGTmiRp#A^n(-f{t>I8qK z)g#4Hh5k2ru0|ze_jQpJwM^n1XXE9!bH>JfTQ(aJX4NGm6eXUIl+yj?Y<9Mr9rGoP`J=t|)6>l~9&FMWQ?? zLCSD;uRiuBa!#0rA$P`t4LwZWB=of1W)$$sWRvBxk7mBw({WZH)Un&xIDEu3_4juX zzbL&HSws%VK5n^l?@M7z!s3?@uaEF$$0K}h`9H+G?O$a0#lrUrrT!U}KU!SN2Ng%3 zH6`kikA~!AJeA7I^)gkbb3gca`jDuY4xjBEQ; zi|FO}-ZHHi)7nY@=QU`Gj%Oo9GV-RBRC5^AzFrKiAesA6g+TNeol}VVCHk|YPvLM= za5kE`A(Fcd^{DKR(Cg0k+({+>+EP{BZh&GMkVMwb9&1y=T+TmgKICbv`;&g$yY_mP zR77|fFF#DPSaZWL>Scd8y%`xkD^K4wQQDD5!x&oONyFKe3WbP-EjxjZ0b)mbcE~uc z(ru>RE229ZvcijlZD`pKdThg!hnE*gGb6P;j*@JSDCYwuo51IVQ8Sy8Ny4U?JtcY5 zZpYMn6#_06vb_kE1I4z6R(R?CT9y-kI#M;HvDJG*M*F6Gdh#f|b7t$`M2p@1*`V=p zb~@zPMUcrWli%_hbNbglY^oh)5Lls}a;|x&SwCd{DSbPul#tK*k#2&SQ2&y_dgHui zNST;%sq05W>Q@INqI1`3*yRaAIfzE5~ZZSzv~Q--hN;=5n^SVDIAQm$VkZEF0(~ z!xHK4>O5`)GokN9YilcBXRL0VWX|Q@cgap(Ie(`X`8e(c5@DMT6_L>F*W!ScU%jV6 z*AG&-3Yt)#?P+t=As0_9iL{4sDv@+xIQbb`E7a=e!f zyA%_gA#0AloYlH3Fc*78tRpfV-_nu^t(B_CYQMUN@8SNN(C;zolrW1J#ii7 zqi@R{n~>-jI6D$$6U|*_{tx7QR3^vNpjj}J^SLXbJpc_y2OFx{y7{zRDZ7t{%zs;V zxTSi-fFsNR9$tA)5z_=qBLuxyA`ic zRcOw@4Lh3!4_f>Rk-rV%-hBVhuee{m^qQf)pX(;dv){_-*|IL0r)BBm|p!o8~27dUgx;DkJ^0N(|)?D4SO7U%bJsSJLl z5-HsW0hDlSBGg_&J2yt_ixn2vK2kBzsrWp|Y0Ye4MPtePmE8JTwzdIW9lgS9BOCE$ zYf5$zmsv9J5J@4xoWZHhUSbeP#!YS5Wz8yz83ZoheKQjFuJGhNz{ZYLq!6e7c!j!s z9(X!;t+dyY2Ln@wy3_trh1YXt8yk6)`zJzG6Wc!-(RdXDFUQS#9e{rXIG~hIFdPF!N7r`gx5{AygvwJda6a;7S z1*p+LOvMS<;nF?p}4GQaLQe+Ym7!<)gh-gT9Kx>owSs_@62Ovx~63(pp9 z0%VL~vQ@p>Cn&_KU~;LM?h4i!O|B~&amd;6sn#?Ydy=*#{B_IW5Q`?AbswCPpcQ1R zPlhsYKH6{=RBv~=aRvP?d$|^8-aJ}AP_DC>^M-U#9(7n0@H=1{)^8OSkjyown0Z(Y z^Zij#+E|%K8%4!}(4`M~4o5qM$6}^e7w5a{K6@oF7KZhNZ*(4SsJ;*K9X@DUdD!*H z%WgdE*M@a%AAcHU2V`eEIJkVIP4+^FzVHW6yO2>wh&0tEJ<6w81e>V*<6YfE+$_=v zvVL9OTSW@&VOtSRt9aT3KF7iZpQj+{-N^`0IQIRRu zpNWDWi31{u{R@}ro~QHfErs1xmx1Jr-~vg1i~m2Zx@V}OrP0AJGag1(i;{;{;M4YwFIMxXvyP;)uGrTv* zgnTVQG1cPUvIIx=D@99>({KwHwy2DoPI^sx>2b3k*V_#CZizbNcCE5aHVS?C3>FkD z*c4+vYN}rBc3-4blXcK`-|PwvWtgxWD~OUJA}DC$#lU7!j6(cZm>VDak+i3mvgzIP zWnAvXC=ehYtb*gYtv!R$Ca>8Yw)T=wPGB0_W1nW2+)2#n>nb^%^Q>}u`HRb z`kc%^6v)|heAMH6b6xOy{l|~2lpy%pjy=3&P!y2^uT{pokKGa7xW`F?pySKW&di#! zMys6tPhYI-Tyqqi^$yL1y~@|5bmqbr1%_k?E-&Ztvao&L2ao11?@qUT2+Hj=SX|g* zSi;*kVDtTqD|}wFK3+tPHg2;;hvY;TIraIo-3IMpxg2`2jrV0em5cgc4|!DhDP5NP zXCVJgz*c@mjTguKG&ElrK1HLJYNcN5EDs*J_4&L>pgswQ1;ScOzl5z9Zu%8FgrqX| zH94M+Q>Dv-=ku)}qrsX2a_>&4!Lp@q-`=g>C$aX41eqD~7%6k#+%V|wcZq1#ZfOhN zxFQ^->3Vs*e^^n5sLX2>s1-^V{p>p^GiYo+*GU;$IfC{iT$*k2OFq#}E3U_lr-+7l zV6tV)x__XP)!z*nbSD#~TKG7dRp=B#Cd-@{|e)N z2^o0SbG_ks*0N7xk|*Zo9@XmH3ApR}ae*I#S_7cPff+~AR~n50tn`K!(BJ%YTz$xk z4mXMJ>)f&aooS%1y-G1z#Lt-Wp(t!A-Fqgh`~_i9OgBqbbHHv6@Adx;0HaUs|lBfDngN#d6p?#{Z3Sg(a} z<@`1Yd>f%eC=ahAZm2#sBS;?WHHu=fm$&sQ3T=u%h%R-xZ$;s)In+N52YbQP6 zW?>}-vlk~o=JVTjFPmp?eAZM%)vLNnH}r_opcKy5&}?X%#`P;rd-D+qb-n7E-_Xt% zLbsF8PffMhV>m7FBNZ{W3P;6BwpALlkA*5-mTj#Kbv`ADvknPA3Mebc05){IEaH7? z2j4nhTR$gHe11}1AeHZdOx76~#ZFioAlwb5Zd$wX@N%rbNJ`j#`UuBha1f;zlvUFn zk3zRA+@<;vVSMcFRl=O)(2QpmvJ-o@DXv_dneUd@T&78OR(Q zOSAcNh7D!j|Ax<1-Dvb4Q`l2* zNCYww3?^1Si6>|+2McBJ$qX)3Y0*sUA_~x$@dL;}Q@T^Lw_G$Yw7 zm?MI=WoKK%3axWMw>#{B4FDWXWsb5cH%P4CaVq?4da|7^4lTXn;rgs?19A6dDf%2G z+m{TpcAwl4aZh-8Pm=t z6rA7gS}3_*(V&!N;T&5QStMU4&Joyy1!vRhMQC(2cumnHJ`6o9q~U&-NG$jqd&T-A z|6gX~Fc#{JZEdAe)}{Q^a2Dev0E^IZM$BsP#f4QbZcuGv1$QUl;ev_;EF zEir#&Zpg)cYW$>hW53o%fl-N;jV+9$oz zDQiuI^C{p8MzfW@O?j+bS#}ooDw^NsyA`B3a;?JX<>FDzw*)M&r^)swco(7?Lxed6 zzc4&}PXcs`obQ#NTf!b=!#jz}N=0r1NS%**HGvd_*((tNcvYCXs}O znj7EKPbW^4KAbr^x+XH%>s2_I8fVAZahc2TN3@5P>1ufylnmkUXK=T$G`n7l<_z+^ zG{Yl8-vkb+!6T^G{$;%}+!sOQ%63qE1#iUfR+z}z`QH8XK!(vDOY)inpNtI^GDxCt z&LjeJ+w$%wpEnZ{WP5`RLyH9NBiNl~^h@IA%E~AUrkX|bMBsQjXHR=uG$V|HLtO7n z?JJceB~R}v|LO?_PUPp(vv~T0W%nkc+p%<0atyg+l!j5C-PsovlO%BLZdmIgi?7XT zs!3JBCCcx(nAQs#nUw$HM&j25S zy}D;t>BUrOZ0DVQdeFCJ_$6Zqq;Wst{2hkg(DS6+`$H$!&*1J&%7ZSAPO&XS?ab-fsty8;W%_7?V8=5{oL5+Gp=2zhq% zf1>wUW7Wme98$;VgCWJRb=m8w!5&17NDF^Q*8Rl94shio#`=y1-dZK2IHj&tJ9Hrn@LjD`f}r zN7)Xx2rH@>Hz6pdm8wu^Q6?$u{^**OzB?+wdd}`oPnRGF5fqDj>g?)gSkmekV=zjz zzfAooeWn3F7lPwbKWh5d*R>3Fme;tStRHt(y2q zwdGnvNawYHij?au?1@vZB~rgcb|N`ng2g8)%w#@c@5*3 z#q;J(n9vyA3md!&Y$1iY?}u|Z<{X)$L%bY)9{nbqDRD2kaktVq=)qFb&4!Qi+8tmP zf>b&((0eP@JmO8hD#DD*j#N`+`3QN(=CnY&LHn8l4-@)@wg*P@`r1D;B`=q5=XaLB zqx>S||9>nsR|kKWayJaq$bLF{o!#lO8G{$i6j0O1zCWSgn`d6zTzJ^9RP%*BwhRk#4A|N_ z4m=lX#g!mNT>i-G{0I8`0J@V?^yIm(&R4&>^_%O4C4~|x5`r$XehH5cdQmr%M`P7W zZRV!m))}+!-fWVGKQI6pL>aed&w%mR-v6>Vi?!9JOJCs6XcnJ?KABxGVE; z;7o`yzVx8d2KL@eukAjY_Mj@?{1o7KEF4YU={sNh0DTy5V^<{m(fwo{c?gKz#0~2; zeilfqe+I)z&%N!Z^WrBatP~qo$1=M!y_>Qxwx(Q*chrxWVXXw5bO=-JSxcnTjMS#6 zZ_r(pCenVz zoEn+;@P^L-1dif2VCmN*9ZBVG-UhKVZfHF2(Q9j7skZr{xmZS%$Z{I6m!H-9qknnxxaE3LebM2kLwl>rL|f5 zwJc_M(Y}zf!wNQ|TK-a4d4Ahpo$wyZq<^+izxz=|i;!3}is+x%mk8Nlz3G-vCSvF$2Ra?XF_>d(`N)ez~9D@o7@rR~uD z+i8u(#t)dr?P+wBUDae!NC>S`w0N;)T;LZyB%zrgcl(g*vbq7Aq^VFHb}TN^yd zKz`;R-uwFMwPinAghzXOz|d>|-(;5U4+ZZE9hP=)24z%m@UCT*=!AZEDx=`J_)bx$1w7$)yJMEr>5}TNZ`p~RoVh{)pY?cwR9WWM_~XB{7b9i}_|BSXzmE{! zoa|JC9Bs9Z@P!i{JX6VEql)<6-KDz68HbLVn^Bxk4e7GPLhs~wANX$GnVgR1xO#W} zNWQ?EfW$S>V8t#~KXdNhr(HX?x&nh6#C%$ik>Yb-)!CCJ5Y@7b5dnB9MlS!n;&Kfp ztPdH`!?e|VY4`CpC^$Bqj2n-6NMKB0U}Y&&I9%M`7$(PB+>!k>ng@ntW%JLbj={LzP{WT|%q;Xq}GBckLYax|aD*k)(K? z6fI?Pk*-F+dhucTb~nTD&sEnX_d9QrkUip$Wx3p_iua*QpMQiw@lrAT#?#sFO++&# zw4_-R=-aEz10#Y=)6AVZNmV?vpK9Wf`hJi^2XpO`2fRF)F zKP}Wdhcw;oiiDz0f8gfihlhX-Vb0g`F!VxjLA<>iA`6)|5RJ_;l;JR(DAg9=SeFzf zg^%P2Dy)`eVCiz)QBb1IkR~7-jO77pXf^V=F#1u=VVQ}~a}79-T=hJLx<~@On`Kud zm_DyRpt-lB&*D^xz_97$?nP~E@E~qIL2I0+Pc`?%8gObXot5%+-7sFT0`C&>zC~>;S*kM~tRNg(4 z`_9x1N|OKQE=w`g06d> zfwnJ8|FP1A*F?Qz^FFmz@~hmwUR%X~l@3D6CD&5zo0KLBW5N@tcsVE(LR!@+`*;m> zBUw5KUIubp#?$Gj!98J)?(oKi>HH+|+tidRb>HYjwbp5tFU@UH6?M;Vv2X4CGcSI= z_!MN@&cSx}!-8(>?h>r%#1u1&%F&4xOj4#A>7q5{@q1L+6!-!W1D_Lr-TXo;^j=T=nOS%o#ARkT1q)zFmAWXUR$goaDRZdNC%p z1rBM~?ssv&V4V&k<(;BNCzPOqoearDBlv|-V4QugXr&_X=(PWY&0o zy3X3TPP~1vVDa;{mZ{+WjO|Zvlcp3n7W7Vog{*G$cSMMtlc6Wk&*iz?BYq|f-JxKv z)qpMn&tt`lrL!lA?SrhWlwyQ!YP^YH@huyxp|39c5jusgrA~%E^*0?wPbB;7BLUdh zyfBmRE29<|QwYq;+y4WVC%*7^<9*t!B*wA`L}7lEHge7t{5^a{zy|5XgCErJYWbz<#}5?{q|J#Y`ko02DV+n8rJsb&JPztOe@(B-O<_ zh0YP&f3Pi>h-cTa=4ggq>!k`lod`1M6La>Ur%ADUZuNy;4LlmPu9z((NE1$txb|o_ukW0J-Aq^R#5PtW zgVGBxyoT2s^~e}i|IB*>9sbl(DQsuQ;(3}NNNsOLg>t_U)_#|OF?`sin*u#SK$Yx) z^E>TRN#@?g(yVhrNCd{w$Fo5ib146j5A)WKck=Y^y^pKpQfV4S9m5o{Xs*Y|_$saP zpM)3*c2b04zh)^OvR~ySH6%OYCOM`c>nkEoB^)u;r?7kR3P@roNRn1})FRiA2j9$3 zSFJR}#3(-P=&c+KCpPV1QfC8f9bz5R_H?dy-HWCS^QWgikA_ydR~hO;?E82p?R~l5 z5x_MQwKc`!Bu@#$Vt8y7GDyUonVM+ln*47Z8OSjfWLw5D$;VawitlUoXhkrc{G5jQ zbLb07C$1mouVf#2-t$4|?5AEHA!otoYmMnttak-+L@rd1iJk$MsqdumY2KErN2Gnu zhHuXUQ-ywQqd3~?d+!nBk)!;ROivy9&AyBnfdY1Nkl|U2RSm}1sOL1s``Af2di#;) z4RI!adhgNZi)0styg0wETT+z>I8W1E-K81oWA1gRG6-lB@OF{Y8K3jZ%$LPCvP&?t zlaQjhcFH?WEJ7;1voZ$XRvT__y+Bll&I3kmx^XBg{^mfnhwcO2Pd5+}2n2G&dJ;4I zRsPv1Xm?|0&EWnslXqd1x9xx>ctF0k)1c2v$eASF>pyb7gLcNLHZhEbp-f4E8A2V- zAPMb5@<{&WaEjQ8!f@BBT4alVW8St9HXR_P?me6NH<_fwVCX(*G^%w|LUK4cXQC$6 zSN5r!kIP>x4vXKm ztwN&zt}^|xy#f3<1UILyqfyoJG-h=(no>IAHO>iRb&HG=G=j43SHppEtI}mLx!2hFWp=Z)Fxt$hW~??pmA<*(=?b-8s*~gR$~08O&v<>YlW5{dM3KgT?M&*L$4p zo<1C({K%4MCaTk@KZlX*IIPtDknwGlpBGX}1{l9d)%Q9rHU+=9zr~tc#B{Q7&fUd9MN|f@dvNf%;<_$j;8aL6gNn9uNhrT_% zIUD=&l~b|wXuP=nnT6YmTSA@PYo0m+e>i4}Gqs@LX`qRR_G8w^??l=KPm>9RwbYw@}c z#U`b9w%TH$chllXyjn6v0|EEUhXZ3f~&MKCSc9984s4WF`#%5;cO8yPC-d`H#NS*Cam3yY{T-HUvFGP z0lSOKFOi^IJlZiYd~tXon9pa_1lz}q8%3yGPd+c7`4ZqYRK{psE6YBNwzdfP`;E@^ z{L(yz`(>|OT{X_>i-JqtJaqOBJc?-ZnYFvyHp6#xx;FqQ#h|2P9wy0m^@M~L}qqt%Aa;GgT!G_Y0rc-#-|pQc@vc-`<;9jN z5qz218)H0m()ils5sInA)^7GUTTMw4^m9$eLW(iy)Ny1yZ*-y3~^XD(`hH2}%@UP)i=2Zz`<``zTtJ4*6FXIYq9r{a`Fn ztKlc0%>&1^ks27^eR;sVVA>!fOdElDs-+}I_UCBNlYZ)%WiIj66P(NMMw*%aw3uCH)}t{5`lk34_e#m(RM|$;?rzJlmh28AcpvA!LNRn z{2MZU(k@xA#w;uxQsdS3g8}EDNL>N8t*fQlTec_=H~(Po^67%l0dLMo-WgL3Ynqr{ z^QIq~%kH2Y^T8BXfk1isXqQS2B<4Z&9KngBrAjpu^+nBMghX-x?X??<_HyxE)6D|Y zY`3ZR0-M=u+39>wFJ2*ROQ=7yzm_)-?BhnFeG4a@0?dN_VYKVJ_Vb{k*u~UG=mdx< z+OOhTFjHEa)tf81f{;~iAL(A{h3%BLw0E{|$bn}@cS~_g&&wn^NX0*A7Dk!l1?TG^ zs*RvJi$#)x5C7VfMG^WWMR*Uicym&E=+_CNTFvPPUmU(}?Q{a`wYT*Qqv!}bqt(Ad z(>jEk-;La4o%!j9No`>s$)z}>$k{*NATBlwoFR~jakHcu&hg??T(5w($TwGZ85Zu< zynX5$>7<|_B-RvYUg8emDq$LkqPWq4UX@}2FLO9B|ipJ`aae+gd zeo~b-6@G5BJFc>e01!T6@=d%~Xj4>_UQAnd`7~%;xaoO}Zu9qJm>3GF%2e}JLR9*3 z+zL7;L-2*^x$bDZiO_i3Crl?2O|Or*8>#2{rU&ePCAI_Wcw9-WhgCLn@!rCcWjzqe zYlJFUPmEF}^z(SndM)8_EvuET>)mGHsb!8EDpt-#FA64~49p~|+gLMtDZqTLTsBdd za$m2qk)jz{036yGS>J4O080unCvUy`7W4Ei^{9#lJ zK>-UDdV{?wU@&PF>OeC0yFa=EOWVA2u`3a zzXj2615J5mVp2%{HD{cVoy=bV9iM%nsM3Xbg!DD@mfKW5XQp|nj&o;SEbG5fi>OI?5*Mq@KZA~0 zi4Py}Pmhj@Vo&-Sn2mRus2^lcV&NBtS< zRaS*{yDCYQBDqfT2sLnI?Dj}VNPQ)3c@P_e{0(3{F%~EKPi4s9Rr1&y^}@AuiwT)Y zUFM!CB&C(eHZQ9OMN+`p`l}z`kh_+e^*>kZ{$7y2lnJOYCF0wlV~qp;Rjvht( zi0pu#$G`r}3;+B0I|nk`=~R}v+LZbvO5TUw35|Ub!;S2tl_kwuT*i?YuKkNuk9;y# z(43j1X;s_DqoqafSIZ$mFNx(${p;6K8Cz;72ePlK)51S^qV`zHN92GC(>WnT*_&M%oP+ zsg!h=NF&XLbc3Mc7+o?-I;9%{iP0b-NaJV(q$R)a-oIc!Y@d7geVylZ9NA)%Wd^6M zu>ACIff9NDo4k?Y5=$BjOqh~*z<|9dwAf!qgCiI37#B&IEoBJ+~8FrTyCk%-&|ptQW*2NnQHAX zmY4M8t9Z7}-1tP_XB@{g8WWnW01$kf5RSt+-0_tQA;%9PcBu$w@=f=R9eW-T&H^6@nS&G=PVye{ouh4q{u{a445xC;}< z37c>xLRs&Awe)T9&UJP7d)B)Y`c*6gIz%o?4vp54{FJ1|<1J>(4UAk^S((qzN*h^* zk8>ZDU?Wg1gX@v|npR{32&edjeDZt$A*1J2hP0&4`V0gK!@_a(R8b1P@G0o(*}e|g zJ|2yaf5XLZWT8gv<^x(Qe#$qD`15-k5M9Sake4E8+~+i0&6`8CoO zP2>8u-0iLWb6Wy&fH?Q`f=QkSnb57D^pbOca?zGxaM#+z@cw#~m{b4m%@lpgbuOV7 zNp^Zs0&x<|%DQ^X5w>{crE9*V&B7F04F;%uEw-e=YiD~Ni&L(Az`ZV6y>$}mZQiwD zK>zVJrB=|#Qu_7>^G&_`{HvIlB7L!<;~|VB-i6Ne`4_mtn{IGul%>Cw+K6Wa-7H_g zKKsYb3~avbGt>bztOtsHd&94^F9=`}Rohk_0O33Lbfm~Gfg?s;4v>ExeDq_)09j=? zI4Q=yO*N?2)1U^ACb}sb&HA>DPINUKQ^sGkd5RhSoGE0PV9n{#QqVTTPA2}FB;d_56OyO_`S7<99m6o2OwW{Pu4b%!Q zTlbZQ2!~lf+$no+3NZeELbKQ$^o@<41P)@hi4|ySw z7{wApFrIv6JHx%?OnG@T;y+%50I7oy-YOq3J34!nl5GwGBLLtl3^D_se-}*S9X+Bc$Y_1sM5xqI z%w^T9NzLtnJi}i#U3;A}LqyV$Prm`NL3Vc^=XXQ!Nsz!#SlHP z)x6Dne?>4ucSFyYV{WvEIt+g`E&A;S^^&asI|U|M`D(d3rB3PiC8iDZ4ArZl4X_J; zWr(fNB?;oElvUxlzJ9ckr$Yvg(>JePB%8j!8%T|E=Ht(I6|eX;r5Z!Hk{Z8tWJzCB zUYj7qg_4SEU;3rCd;+}s{Ya}*9h)sy1$r7i3w&2+GDG?PyUx5N!0M9YEGV{+6Q_86 z^Zd%JhfX4F`Hxk!0^*#_9Y0R93-{X$lHJ~>wLlG-58;sNTO3CTv+PmE$p^NHq*CDoGThlNDF3tSOd7P5CZOW3v|vO)yCQ z)*SW@RxX)T9{=uS$s{z}MM`iiMm-e*Oo}_X*9xzWXo&G<-(>+V~ul$rLaCXsaH2$b^&%l)F zm8=oF9~)soU5MLIYUDHy?z0{r`p6*pEv(96u9-q?dJEE2=(Z4B=F2*otyXcVH88eW zbS%#uPWZ+wQ%vBjI}6z%9d%XuV zCwnGR?=l9I21dov#r*u~^A#f#wVY$WrM#<1cVeg(OUI~{jkEJ-Kko>+KT`|Se*Lor zp#^6hx=$||s(rHD$`Qv-C%uby*^8!N)uC^H7#jyT9UwldNKJ3o6sq7FbA)nq#*JNpK3#+$;YG1$poux&HE3&If>YDV?6@Yf{h6=aExk;h`dCoz;woApE4Ff^$> zs!0`jQo1|1x0ijU>~!x7BMHCfvyk>H188%SkFdfRfwpY&UUF0o@S&nijK#Bns-u%F zyTK_xzN{IUcrV_Z&zP0Upl(hnRdkg$M4k*kD>qcX?oDm({7~l+qLZ)j&~j1F6&X7- z@{w_1n0ZWXZ-IT4Z}p8e5AC0zurAi_^ibN<;!#)Qp!j_72?i#cKX+d7*LDqR`5uZ1 z@Byw|&RDKPfB!K_DZqfp7k%ZH9R}fBB%x*)5l=KLUGsVwHuf7HUatP^dk^vjM`XeY zJMQMh)cTd(eH!=x;c&T{jAZG12@;+pSF(rx_R{z;UH5#a|0c^Q6g+Ne;29)6IK|Lw#_3~TDX=L2Pt~<1!Kc_x}m3R(G8XB zq=3rg2i=gbodlXd995e=DEx&*&A9H)UBJ)bK@dhdacvPTjPMQoA3%}M&P}c3SI9%6 z^Wr6LLQ?bdqH@^OhaSoiFHBU0B7e}7-pQ*QFO_h5UJ08UhuM(pb&9b1?d$xQC4c0q zyJ-=&>bnzp$5l)b7MYcMesTDDBrD&C1;(eM8@sYT#n~JR<9`NrM8NiAKC$q+IJ}Mj zzDE31A-kCQbjKP(;fHysBQYcp+CHcwN*#E8^*c9BhwgqF+z8Kc%2n+3W#`eb zXSF0;@G^|1L-x0ot#A#^$}H<%@=Khk``zVE_L=nSm-T;1mznW0>;!NY-%y`)gHw8K zSQxTvV0^NrC0?42v!A?cTWs#y*p!yC#naT{rXwIAQQDA~!@%KV%c7qEtk1%9Q198a zLyQLZa9Zq!&+Q8zK9*rBY~-C^mE|Z0H<7&k#kPtSe_@lXg?(mNur{-V=;HR5`p1q| zj89>QD<_pKPR&=|r`;7r-hLV3YhK}}dph$kxieya8LfWKwD_eyvIjxN)Ut2DV1y3d z16PgU-6c{C+4K5iseHklFG>qMwDebbF&3X?o-yf3ujqJW~#K z1nuEq1+H0LykjB*#cS`?(}w%SvUA2OMXGbZZm8B`!*V)sxjVXi`|j z!q!fVo#^jsFyZIQTQwA-JDCTSx)U!=go7AOSoms)Veoy!jF-F=b2ogaHIA^~rL@dU z0~c5NoEgVr9Maz|ewM!sP>j+?Q#%ROzAHrp^V4r+!3d#CmY%UNc3!fxff-NC5rF(W z5p&D-Vhin+^ICoFZgL>RwRGq3wA|-H8eDhNwH`&uQ318rttkmB1i#d+g~mf`y+^sTkwncT-Knf>7WrJXbyXW#F2X!;E;**708Md7c0 z$;J8|G?km~rfr%_Tf5Q5az0mfQ2im-3{KTiljG%PtDnuta&8SQ?(92yt=Jx6BII_E zw?d~c6KL`t!V=-VkYlmx{gt`B!~aKNGUv)LW7i;C*jqXEEqaxx_ND=1P77MqD?Iv9 zfJMG642L51&x3rfG}ZPplz1vimuL{#;D!4gh@4M7-*6-*BbL=D;310B%0k@kajkPM zGEh{&haG{_hDN?kbS*tk0St>5eF(})N4H|Xa?|>7&c?RS68gzWqqg>o&|t?XAst0~zjz@-+W@t{5=^>2mr;aD7OTS3l}tcZL=2M7Mj zvclnbbqD`lH0%}Xgs5_Rz3WkG`9FZOK$4QrZ^XfIeJ!~ydk~=zDhvnd$Q~-Z@@YEa zH=Q|f{Teje*gS7=CfOzelxo*kDZH_quieG{D~xXwXW+CLcxGj=;@q?GA{~TT1N}! zgHR76Xj1VbRFpN}K$6^lYZJRqA`{SWCDtbfs7VT-?+?I#<(BasQksgoLW3-u?7Rcx zTJOalJ9?&=!kTY}e+DFYIa+Ce{nk0cLohi7?f}AvhtHR&ZpU6%uzPCn8D6wD0ZG8&Y8OJn za{rsU5q(vNQh`pX0ZQ4Uo`nfhiKCSL&%Xx!C9fvK$((3ekk0@5f5q|j@LVwO>QVFQ z&c7+zT3Q34AKiP4(-2lFU}U||DCd0z#G40i1^Dl?9;k*IE9D0ZeShb?CYd~FLc_>g% zy7{rZIFF#fpMiFgES1`HkT7Ccel=amm=FmbvW;ggG@&)X;3VWv`GrJD<;3)`Y%Ga> zUFXFg!Z>~H7!pITPRCp4^al|k$%BEPBAEZv0a~`(B|H!yNcs?mAm zyQ-R+nh`TTLRkeI=NwFyby;DUPCMsHj9E_pk-APz!_1iIzN;*M$EmNZPL&_g!%g5; z@!P$O?-Y_u&{c~VMhEi}iwp;ZG{6&rYVWcT1WPI9zJua8jwGiN!R!V_CyY6_h0j7R z4UVW=b}(?frG7;HA&fn9L6f|LkOOwWybz-RO z%dS5=AJO8U*-|W6SCL_(O5Q?F$Ov(XvJEza#-2VslnhbZKtgZFvP}Gc01iE`E*UU( z`pfI5HuprZTOil$U%%hk^3V5PC(@f5+Sm|ms*XLLMcz%DYu3(QGA-If z6t<$>iTV}KN_(URF(F>zyV`5=Sko_Ssd(=e!<6^S3YdCC`HKhZIpg&i`*a!dG>;;z#4^ zoEpfJg18%ZQci2p!`jC6m0Q{bllwowd*{)_SNNep0Q%+^S)L+k zI#K?j5XtB3XzL-mXbxI7JOR6pEgQVuA}(&QP^)x|{gP%EEoo@6@!IKt*?Uat(Qkn* zKP5bnT~eC9L$(3rr1U9F)uyWoh}_qFsUY>J-dFVUjZaU6v@dSY@cw?;%k{w=Vf>rz z_ESNV*@yoqYGPxLQ}4diIrx6|fX@X`22jk53et^gQ}N0=ZTswdGkDA!$OceSGyC8Q zb-bF^DYalYSa($jc`E$HnARC&MaJl+E;tXJ8E!=cnSyYYF=&i6JfveT3(7w!=GF)$ zFR{xURuCqZp(O);4OOqtl_|?iF2B(7x+%L%8F{Q_#LR4W&u^>H^uwQI*f=YdlK7J+ z3ky)knm#Q?#RnB(M927i@HN}==>jLeSZS=>@G}1|4MpZ#P5FyiK#J|gx61!XfI&fPmSB4qDv=H=DY@=Ab!BIi z-hb+3dl^%GUj@LXu#}W^_Pd6&gC1Y=}g5!oVUn z4o8U28N!GFY>P*qN9+75sZ3sl5f{sL>>06qZ#H6Wy9zxk#~Snf+Y6(516^p`0tEiB z^&7&eKc;N4RM^^6oeV07tdB=#_m}i4FY`%%e4VUczj~c?R^Yn%X8u*>v_e-8aWv?V z(4{F-3w$)>cCJ1~8uA<(=r!3gxA~vj*7_My1Qr}j1>aIz(yaD|o*dIIaCFn<$7$|Ew)hx7T&0KfW~Pl!iQp_0y<_#cT1B3C>3DX*fKX z4434`gKo;opM4ETDP-;{iyeRyR66#cPi(>e%7hB;;c_b9s4L)aVhTB^smTC_f@ly{ zH`3Y<9LAqELoNHlorZmDxz#01$5WM1zPTw+nl?xq9286>+Bqx7Y)QCb9Mp7QTkVp< zE3VgJCye1}dM`sE*1jO9q@I27_{?cKN+%cTPxU=`@L6sJGM)=(>RxqT1= zUBBle%uGQJBi_?(6Gs~)?@}w=8Cu(34iKTVN!|h*UUJE$0$8w#YQ#V}4gDI57w$v@ zUTqVnJ7a-*>5ui_0X@L@qCkB^3dw-@z|--3}Eplwr>+{eeCrNyrFWlXinNBKSh<)O*ECGBHGs8{hJ$b(zp{oF5t`X*$NlZgyTV z4f7}Tc?gtj`%3mv8frtDe%}}DXcWEnC5lYD^+W{kIq(}9E0!@$9opGKFIKm9%nrET z9zXu%v(oH^=^P21ZjJt%H&d6@MBXlmkVp*9Iy6w+@0A5!jn9%B}4C5NQ=yiZN)5knFlh9(XX9RH_~XWfX|^ zwMZgsrtc}kb|!QwrM1-aId`Lw@qvz5cBGlsH=B<+8{EvR;1J6Ox=T*0b&RYLTYghX zL8BnfJZ0b5^BB{s^&ywu_-Hruku`(-{{WK4+_`^v|7tyuy1zU=or+_RW89I!0S4>; z%Fk>4iNwub{s@%5rdO0gf@^0mAe^LX6z5@ZULv5r&vT*1u2E#ug!V4ziaVH1CUD@Q5ks5JY< znA<>$GXUmfgACk@Pw^OyR(<&oq4De)Lbk&G7BoE<4oq`~$>O1Y(u-f3Zl(4WAQHY5*T{cA?>=Sah8cB{+{06UdemYYRc)%al8?XXb|RGh$7?D#(z!NNhL(={tb$8gQ!FUo>WOq6 z=9qQ5cO4AdSp~~qdH3=1r)U}dc;q6>{1(y#o+(+CZto@VnO7t}=RJr9(=7(Rz1jVv z#Wkph#Q5V#i~5h!yd22ozc)i}nZ(lo2{Bi!Qq}=EiziUF;cdAb5K9?&HDeXlNaMZ~YGx-LL+UBE5Ys}= z(;YY3c2c$=9Ka@*0;@qs?}|l8Pw4qbxkwtpc9xrHDQzoJ=i1o{1N|;VA8Ws*WJ>MS zb~CS^jwO>14g#WJPanUI zJsmf5V%}4aO5T@=+mrv;Xs_kpr;`HmYML!JnZg+ealo&np#LFQ1{Ud8fE0f4= zMbuwn{w?o|6ZbzeyPh6Z(PT4Q|{A$JZm`h``f!x`X^h4cmG*3 zvwON|*@pMMDzL0e-tX!M44wh!>-A9Y?CjV&&AJoqqJaqov{3{-#cJ2yHgadj!X6h_ z+*EyB6fF``8DV4fBVG>8yOX`QjpDP6t|^^3Z!=FXT-vCuK}UH~t7kVuYH*ceI@5Xe z_gDv-#Q1~LHG-Nq5|n-X-*1py(Id(?q_ydGeVV++-NejU(gc>xXvK2^rb_X4(>7^8dS`UU#l_G4$%rTQ;=d6E3x4AF z$;ji;OTm%*_-{>!nU99dy4QX)hXQ8x~(-&n*~pC}vE^e^^H;k96IN#ii%b6G9aR#GHJ zCHLa1?9u-KadM3WzgB8YwTVWZxuwv*EsP>qX#(H}^?7 z*=4%4rP&*@!=Y=+fbm>b-jZF7BL?J#fcfsT^IE}4x{G0Yz(VS-rwGO$&n&UO@}OPC zAL$b$CpuqXZI@9cKRVhCwNh1EKbcL6xjdVIi7HL~tLtKNn3SY0;tg9w5gx0o{<~DX z<$t6M;jhLkZtO!{3b&iQH0~@gQ8tEFk7<4-+p#Af2j36EaesJfd7v_L@ml=H2h$=O zW*(AzBK;~l+UgF46`BEmaZ>k>Qy@a^_2DSun!&|?u%&5CLxNNWb3V_~+|@)QMbc(k z!k#2MgS+4#+fO>RV(Dbc@dFBW#4H~nsoY;(4K?*~vrQf>JM1lCU5``?43V2##WMTE z%{mWzEh=hG$urCGLRWMz&G|P;4>+t%mCez)nE+-Lx6J z8}mY1bqm=K)XKU`CKsv^R1-KB!^zrh3G`;0oM16(qq?Xgk;M?(l@hK>rZ>OxX;QnS z>%u}(NIp!hei!K;a_kHWexsr0EAWC#D^nxW#|J{7_?Vk0Y3V7yH6&U0xw&fVa#)7eq)wE^lEBoeQZsivdR|)%9(;^*ha8nxTYKm%-U@sh# z7JSBFJ;gfwxCwIO%#!)WP~Mp3+eJ{q3SoJ!R^q9GUfKTu9WR&}Al4S_I{tdnF?}cJ z>XJ#v*{Y?9p0?C2%9gP06@3Hy7YiL~!**c-Q)HE{!{|?JMBGou@Z*RUu%T~4dIASz z7Onq0O0hiRVH50LCMVPygTMW)EzTH^=Mo-DikEtn=s&XCq8o z_m+F*XT+scDkJYg`+7EjI6;ShtzU|eZI<%m-YcDzp7*Y+f$VLE?a+FzZS+tIbJ1$6 zfG|%L!c#PVfyCW*kOUkN;5b>}Z}3~v@Y1iJyyO)+PZ2XZI{aCBOZ!ZGA5HJ^xNHFw?Y76qb+?%rC|*UJ$sWP)tBvCk6bv8a#@4z~8$Z+_4i z1_=YN9UDy0l1iL7 zSf8R#B-R~QDYS+7OYrxSoPk#v!bC7%lDIP4iu}bL{}x5`_C!#bK-GOjx`^W}5q!1q zF`BirQasDpcg2(b0DT8nJL#Z}*i4E)#B4->qm}S~N3UL5Y+oRU85FJ4IqAkK+xb<# zrw(qI(4>F$O29FViQcE|ts?4wnC)!t(%;Y;vndmi(Z!61vywqhn4k@)Cw$b)(vEBm z|EXCgpab<<^!rIwkdx`X>nAw@69TWB(pAPm+#m>y^ZVKL|h?$C443oz-EtQDRw0LaVy71`6A`?&?8B-wYz|Cghr#}0O4Y**Zj~JwMd3%S+`C9LdVg4#{}j% zulQx^XJOld7(C0(+{-fw55Hra>MpLMR{+7zN{*7w@=~j0=%u_%(>B>fcKtzn|E58B zwvL?uTY?T*kj9Gcyp;KD&xn}*-fDbjilM>y=-k`lRPGh9jz-EU^#1$XvvF%Z>4+W> z{~|S?g02OoQqlOPQT+0sjGV%M)@Oilq_ z8t)ksc5M*$;PySi`O$B_6rQ={e0JqVT*EXIcBlH++ITLv6%ErU=t#w z9<+Qgtal?6o?$CrNe0|>^~zQ|yWuncVB;k7FT*xAdX-v>CKM+z?$P6pgLD?YHr4p) z9*Go*H=qs=Ab2PXHNQwFJ}CbmAdop%tZ}pxLhDKDkDJW5GP^I}$rw*Ams^_uvEVh& z2ADE(I!9seQlF*P?3Asd&ELp~Jx~UHWg9^=74xp-O&mA>rNN1Xv=wU)1znt{%E{G? z$|9qr0x&*sf~QDCR>$NdCIQTUFP}p5d4=SfvA~QIMZd@d8@2z|m5#;Dz^l2IWf=F4 zb}U$EiubxU2dc0kJ+0S?%2g#FrZOJbP z9pJ1+h!{ca$+6WTDn+5+-#JPY6Zf){SI`4anaWnCG~HnEQnVIz|T+b z8j>@mdHVRDd<-gmAjTt5N|-jVtN(0zk*dw7dM*ML2Br{3)ytm~#SYP7ExS0@*6_%m z#Z9qak^=FR4|rwpSlgqLjUpp&J zb6kd@8Dnb1a~Bed=DsPv2n`c&*hbhYrEgg*x@ci;w&r+UHIAPHr2x5)oZY2yo~vs! zcv`=9K@Hxg+7&ykLXEtB@nrZN6u;q#GG@!4TKQXg0D2c@{qn!dS|rw&<7lcw$=G2c zE8nZeJo>*rQzAXJw?OFnxrEV96V-r`#r~rF24Iy2X)0o&Y@oc&q_Aj$T@6M_3~Eh{HXOcL-$ESi>k4#=0=KX?zu>2<`kR->Wc|*t zAMYVWp=RZv*ZSoVejB>=5x@&AztXyY4mFhrMV3$yTYC5SY~dS%t&A?_6DwWnJ9N)Z zOjIVnWrY8W`>o_1OUOsUAs zoXU*rel)|6%F7?9?gp2kqeiSL95>*sihO~;7uk*yO&ym zUo5&}!=XmnSLk;!n9>%5BOHka2N3NPT7T32-)bCeivf>z*q!?aI?TC&+-x^L#W2Ef zVmXbU3689)(0XCbHsFH`Oo$%rqWp*aZnjI~NMxc&n@8?eUZvb)N~@H|U8jEnXN)Ox za|w69f3lmUdo^h5;Zn6VQ`y~`fo}M%-{DIhIy6>Td5Bv3_3Yk`kpg+joED&)eXCH3 z%mz2c?svKqxm%y0$(8iLpRxHql=}el;yEpwumWqKQSEnsd1|7YP&TQV4{nY3z|=HG z@bQk<5@UZ_qZPP8VerZb2XS`QBw$C2F`uo`O;{KDs@Yj7>;BdC3@JP-d{j5f9vS zuJP2e0Ul(l9-f|;U+4&X58K^zsBlncT$KE7g5x(2Be(fx&;^BoG#~gl6iLYkVdE#i z^L#zv?P30x{-2^U;}w5YhyG2;)@ z=k^Tq5|(WqLYw|>fe8(<@|VLx>8`Y0`^;VVLgQm68(1Sbw5)z79ccH~o{3*w&1mDP44q_L#RerSlZD@bt zxBi5Q6ng=a{<6@HgvIOgtC{8^TMqe!wAw^C)b?Iks#ioWkN#B6IWFJ@b)O{f!2Sw> zNAl>|3(Njfy09#Yq;8U=xX?mVesSwaD@P1jkL_|v7uh(R1GTbsIelNjHI08kABhsLqLlX2O=KYn< zQM)sbiE_J8km^%lNij@M8NTjQI*5BxBS?Bwp(zD|oQU3^LP~Hiwb-tAZc|7e?RRv%ed-s0|Y)56wLm zTjKu#i1bjsk^N+p@7Poz9o!#eANy&&L@23D=cao4$`2Fsl>A%@InFeKCdL2tC$<3t??A8BLvKL_mEI{c**4d;_W zLA@;b@%|`e`@3s`XpC_6m+0qF+?dOGilv21$mm7cGQ+~`?duw|3$&?j|yMZSWAUsYz0@;A}v(pLLL#LdN2SAPo=a>9( z2u+rhVSA+M2kE4!(;^Tm?Ww4j20cE&GA($G(|UQB=+wXrmbdiTG^4R$I%l9wt1g4s?!!m+!QqN7@*6q7Mpp3 zw*5Lyvt^VLGD?)(T6Mlq2Zz#Fu5On1Klhg=uuw)910Q)wEh2?k+C@F3q#Zy+R@9K+LO?uo=0w-ci%NQk2{S-HAd|+Qf=*I^ZRV#HIr|1%szJOMx{bp z!XO(QIa>J7nrY0xuy}z_WKVziLs80v2XZPoxbaMQaP@lfi@sZ)v@nA#I2{BpDRE)UVf};f6cysf ztqJ|esiUIjFj*@Z4B${-AfcJ3d(lUK@1LHkVo!P(fA&)Blm66H(6BHdEFeJ%&~bsp zo^qARDpRRGhFaZa?Jy0&P@dE(78Gc@F_n--o20nB^V8hHga}lC*UyMVIf6p-DG&~I ztW-$|-`mp*Pns%(pouV4f!lv|*=4ML=SlP$31 zdAxGMv&DIu0o4QTzexvhiQz#PsHnIxu}hWox=kzWX_kZV(A@YS)Vh|8l}tAGv`-sZ zVopxa`^D7W(lkSfo@`qMoGrF8S*uy(kcClQy(g7Dy1x^HMibmf4NqOCr3T+TP~m`< zoz#SHgi;LKj%iDj`SMCf`%J(JfJcnUI9sjdjW4=m%32!$HomUrlMFKINNF|8aBZ($ z7tzJOc5($isd!|J8n_NDDL*DnA(hd*lqstDxHX({q=(}k5sUnR@p56^^uAzTD(~r> zyJ?S&%?K-k?2oYjS%rAU#67eU4KBtrVeTfEwQD^f$4o#y_7h5mx`il`XsYO8^>{!f zWfZGP>?)hV?bNvzugZaD)uoJZHO9Y;f4x>DWLo*Tq=&^{)&nxh_(lR5eh`$d z2N5IRQ${B1qYR(1w|?7Vo z2>0lJF|#i)bS{Pclt=wl_DO)&Z0e<4tH?1HZpN<@tovSQQS}0<^%5w4;^IbA@s;VP zmxQa-WZ{NMF6a+((NGDCKP%$d)p+PR2xd!R;fGkwr2m3ZN>L&YHB(S|?}>BI#d|Yb zhzPeKv-qpGh2ySz_f*tDwwMi=j7jJ2LWIf2=0d=vJCzU&f;W<&74dzNuR z+k1@Q4eAaP7Ml|PZ_2qBH%x6xKK|PEN`KvCN#?t7fa7vmy!;rf9H|2C&kJURu#4hPli!NZtOxNWJEwn~ zD?D3R=IFCf#YKEh%B#!?1TCrDBM0wCAv;o7f(^V|E)a^BThp^p5OZ_@`?@BsXoVK) z@))B0>>-#hRi8c@M3`K#O6l0mWc^6r9q_z))L^#(75pJTC^sCF=J?r{J)@?FeNSVP zD-Y1k4FX+u+`a)96|(8gJz+#?=@~8OhR5G^Mj3pJjAB5E%FEpbV3dc#vHREgQ$O=4 z7kR`Fc%}#?B^iJD^>c*E6k@jqrzjPgq~{;C!42zPz1Gj5n|bXy798+DKr|1Z&_etZ zCFJaU$^zo#v&RtdbtZzh^RA3auyWA$X)2#Q;@Fc{ZOj*W7ia*1d}VC=D0A`Uw~OwO zSop5LCyDH*{$ahfM;&v?OYKtdY-AEm4XTfs$1&Kne|JP>^RLdG-0 zE8g$-M|n}8Z4dQr&D_KwW^+GwJLcEY*i78ElH)&>Z~okcZ=9MAp$CtFuDSQ5zaoO) zS699El-6d(jfP`nQ&3|YMyvFnxG+9VkQk@>5pGS1nx9S=hlq_{(b!yub+nZmTk&l3 zo#79Y#Rc(C9s)6si9PklEsOUoZJOv=!k>*WWwHj)DC`&sc|3BdkyYUH=dfZ!i5ZW+ zwg0mZ`E}6)R=I$2?8BJ}mAxFx6zeTh!5(VmWf~18CY*^&6GMWBh^SbeEeE1=o~@%Z z%UNQ;P^4r(F8Km-Igx-WG1p)YmpKTcmd)7A&(O`b#lpBfssPM#QAQ`J_AD&L%y-E+ zD^W)4_uRADe3ey2K|_5Lgl76ZuZz|T36@@N>oGDsckXEkS5CnCNmFb-!0_K|p>i}v z>qm~3*8#7q(RIXwfwjR`!o1e&3Oe#(m3(rX~{;0X7$iUj9sAJX{jNE zk4-7;Pc9Ohuz*P~7{{Pkg)fraFYxseww_ycngY9Y)+va)r|LzZ{f}E^7w%4W3+v<3QWa znwMk#eG&_vc*4}+V?f3T!EF+%Ud%z2kds%*y;BeN9dFQ$-^y;u1F3 zDW80zOj8WNgye;3?$vzxF<{hsalsuH!opNx+HFMexIFuY?;Z~+=BhO`HAlW~`9hzpEk=Zo2sb=6dt5%s$qj4* zqS>8;=%84kmGe(_r59%;`WmT86IDdi3d4l>Gh;l+choWlvawZ%jQ)QsWx3~vux{Ok zkiDmJ`lA{_jnJevY;Z_D_LEMH9%8sTcaZsp&maNvxV>}Jd2d$X1TFtzI9j)np%vBxUTsiRgg_J1NqtLq7Kd?<6vrvTCz7L}}o9D6y-fo#kS+bGR18Tl`cFVMA;hp}BT&VA8Bwh-N&VWuVy(8{&`pSD97E+=`1>1Lj|zWLNqcV@MHB%=6%dINbqP zy2I?b^U|4j@7nCtroG~W17^PR8qj)rO>Aut&g-gbTAYW1!GPHtd2+RTttpGJ!F`QX zUWy2LJoa>pU^V5A9kz8K+e;WM?w$N_lgg5oNBmXXyo^2=q{e9qN(R?nK)(J=nBe4N z#seX;-=eF^N};OMKy8fxef#%5CJ}8&?3Hi7w9ZRRv^yBEBzEA(Dn*!+t6@CiX`AtJ zQ}6;mL&D%0PI6>q9WAK~&6p==1`@LS27^W}@;;oJ?Cxkw4YN*;W|I2~*;5Q)O$gkK^e)x}Q^>%?k z7gw_g2ZI5VE!I6B(K;AUC~?20(&C@un*0YfuR4;?Smn@7-Ow(Z50%}^LrTglUj{^(YMQMkU;i8LnSXV2Wtk`4 zgY;NWrF`!q&!!V9`+#^7}(&PpxE2kT!hJV;kf8iDZ&+?UQEf6x&9 zQ$Jz;vss2=PV1lX&u3K1W48Cq=9Lo_Sf3*%Pto+bY6B1sD=@KzJ*mT`fsalOvpJk?nVJbxgPUSPQ!o%>EiaM3hbJ0nF-LVs+-B2Nl5IYDsU-1gFaUj|qw~`Q9^*gfik>Z^EGbu30PSJ80zY5Ii-KK2B2~x?V>meJ z&!Erprblp$7CWNgs32pi=lUMvn>xhGfyKO!p2yasI4$L`)NZQ=V#)LEz;C`dB7(gM z%d5YagPd|f>Fv)^=~bLKmx2`bZh1Yqs^!TzCvfea)imt#0OuJ4?tn)g{S(#p9V z+tc-_{&|yW{vL-o9`x3URWlz1azN=&ASdPrk3mQ;eM#hyA==HmjzH;;YL*+Q&ys2Lb?ys15C8j3n=Tbm0t!M7I<>y6-*XvTQK9mjqujm_=J zR*TOvL6TKjw-6ina(N(sI%&EVv4~^>MRn(6atP>hJC9EFlOvYTCmpz?kSN@?w+^qc zg?4OXKHUy#Mz`~y%mjx1Al|;-qN_p>o$~F^Z(NF+S=vmpt8v?~1JZ|a+RsA8z>+3( zbul{OSYsd(KdoZOtdGtxeJf5otAP_IB~LBrK(e;)soj;|%}{yg8SnU20NMFF6W8C`tTccii{&kz zUmxc*nk))Oy;K4OpTb8^{{UC=q>{pT{$v7G{`7w~J&jDac~(XlY>1lW6>W~Rxd=16QY(BXiy?E);m}+9-f$7F*2cN>dGHo+TzmRz` zL22cv`C{E8$~u#R+?)}PYO7mmwi1SqPg|Jxov$Q$+%eFjzZgHlc^DQO9IhCoFs{-YAHo12f#0Q5)jTw|vcqp-E8NcN43Lx| zm5*R}&*B9;h4eY0w{cUStwh<$+<&ECxwX5naSiM(1eo2i#tu6laaBqyuJC?roP*Eh zOp&p^!N=XG6K{O!Bk22xumj(Z&S zCbL1!IClLgCQ(O5HFlOb(EQJxq>wUH`jLUwv2LUC=WVzs#FZY-IGAenNc!>=CnxMqPQh~T<46AxIUE`m;w}bIX#YP=W)v5 zbNnRw*7s*Nq-F#ps<0gndkU5WK*Kwmu?jKy8mzcXVY>QM{%Z!tLFb;rs7&mgDxJ3dplpeNS2D=WB_ zJegz4Ip=8s`RU1~Jn>u0A#lSd3b`sk9YOx5rDEXQDNUtgV*cFQ-YnXF;|y*9$lHP3 z5_hFmHA4PKi1dx+8}V9KKdDn3!1;2y%Ll6g`%@ARry>MJF% zF(3ucN|qy@y*cEbDis0vABX<{UZhNC2arAKp-XEKK69U1Xkq^V>#Gh_<%Tjxexjp9 zW0p`3Kh9_=JvAc-ka}XCGB8Qw)7F@Co@v9S17(B(i6CRpcBOBTv5wsH-kTcl2LqtV z=MjN$YZ#1PjEc2Pp?nwRrv>l`Oq|rKYx?Z9&y&KTWv3e z2cCrRN$sB1oEWL=$K_fUd1*jJE=eCK@6T#?BBHW2WVZ7aUk7_+43WV1_V=oi+eWGb zHVbDB+as?&m7<~HLiqWUhDYn4Pob^PvY@bAnInaw`GFY2uI}nFz&Jed#Z0Gd$b}}= z)7apnR*ZS0IRt^XrytU%Mh>TOAU7Ox1$7oSaB4G3ZK6bq1SQFEi?Hx8Pu^_s0Ljm% zBw=2~V{bF8EWl?tBt8cnS$Yy#j%5u zKoxyra}vn?8<4%vztVt`)TmszAxQxB_B5!(0g;doew6#XG>Yf~t0?F@^goS2=NOM9 zEV?lrcNE?!6wopLm1S{^;|D*b zRL`whj1U1GbJwsG5jCM`N5`3v8zTc9J#$irW>r>v5^zUQLFvh=>P)9&HZ#!nsUcIJ zFNR_3=~Q#I+=;LYDeiD_?M{id`& zXgIcC%|V4Y$S09esVgZY22wI{#sx~IGnEH+2OY8WsALSKSuz(G_31{$F2>XnA&{^w zv=BxP20HS4;<|fnLwj6CSUx`EfwzOk)9dZ)Ts^i-Vapt391g~=Lw785ZdMA%a^UpG zrh8_sKBqk3+p;@&CGy;YNeVNL$I^$mc9hA03E+(NuRhc+uBDJXn~(xe=tw}azI&y?lX5dyhXvYHqy+?oLS>7YKyoM;^j$pCM2_`f1sO`w- zYgUvG`=q=*A~WbI-D4&Oq5 zl{v_kFEp>+<0?C2A4(H)#)hcm!pmJHYvean3Q&)76BGA9D!?2q2u~ch9X4VxuP)bLwcN zj7AEP^I&am7&bc8f<@1BoN{>j;=EEn7ix!24HJdBx0)>B3oOwE!Q6T-Td(O}iKA0K0n zsRN959jh{RWg)YJjB);Z)y15ZB93igCP^F+y@6hX*YK)STSmOb;E|o*HgapDAR*qo zWMd!a(y2(1$Z!JuxB--4x7M^w=9CqT0EDn49uH2nr5p%AU^ATVQ{4Bfe`d%h-|17V zBx4vJr`DThai?Mk;EFi@bR?g;0mV6O_W;AMek#t)Hqpofp7o<{(jpj;{G@U9KJ_;> zj4z>@w(M7N!9YInILD<{Wh%j<$T%Q_)AKz=Zh21YlaHtvC+kV}b^sDV$8Sm#DZ{ah z@yI^z2I12gsRg6L{E$lHka!vTcdbEeyti*({S(wsWU)yhQMm5N>evVL zs1_ht?&*`7y%IzK7z2VjnvIdNRkQ8%^{6*$`;$PJ9$rQ=4?KZa#A?h~fsw{fHBQtJ z;NWl%;aWjK!w%dY#*;RJ(1qeT9FQ6?8(;X{iBLy>`sHS;r!LT!rN}H76 zU^E2qR2+U7r28HphQ3?S4|{9FHE09&+AlWw#0q+9(nbnn3qc17>cMP$;na%d*Jr`y3`UxV;Kxc>A>LU z{{XL7t|9%-#2bh^zxvft$;JpH9RU?c&P$;Wma-w~z{eGK(h{qJgP#7m_w}am+ge3E z00eL`T98M$?M&?h_=KZQ#S zLywStJ?idd%c()vaLzvR@%5_eu7t1it(Ldiat9S6#0ldaIXKNE!;?~-x-y)f%ht7^ zkckuyo%rUK7&+u|{Hok`;Z8(9MQHiTLxJAxFJ=U&0R-4MxIG4(b;YOL=RVEt+QCy4+(Zr2N^8 z^Mjrb9Wh;p#Hqf?;QNc6rI{v$Qw^}?$zB_=+n>&o-&09X_ikwMpB_gGJ)ep09th^t z?d{yetXM}d!FfO*GMtP!U_m*@O5nUnug|Y)Eq6MhVG7&)jk^e(sYBNQo}AS!Lv$_` z;RzxD!JF@uZh)RcW3M%klb<|D?Ylg5#aZS#Ib6GQHQn~v^%-7Sw;!HIExP~!G1!0y zJ;gQ%eao4>_WStbrDQ*eR@PVIiYE6=_vnk%0 zh#76j4p$v=2R%AevB(}2M;nobI%KK#>Cfp)GQ}*L)maGufWLP=#t*NxQZDH!ZQnL} zb;SiORfdJw4qN6^gOU8}Rx<&&Q7k28+}mXhfsagdJoGh`#lO}btaFcQxY9YcC~+(wkd*i{AC9u7i==ok-CQT?81Ar8^D+@G8HNc9GxNiuNEK3+yfbM5%l z&nMbL2Ow|3?f@&mq#GIG&isSP{Ay5MFbU%)^Ar`DB4TnCfzE!uhpk4yoRYgu2BxGp zOsFDL`?7JjJSjcE>}tK_Z@B!*<#;7~`~LuqQeDb-8kJ-$*(49GD+=1&eWuKi?8w9r zcm!kljCzWa9?AngPk=LedLApPz?4z%>zbAyjhT1Jg%Szx=e3odxaUVp-%k&HyBJdXIqD9$iX zPSqT(kU2bdKjTG-j^hl3;{yZJ(w_>v#77$Z-1o+5v8ZFF~qxAzm&_@E0A&1k6&7l zxC9LHbIyOlqz}dk+$sR4?+{Kp(~O6xUpirQ8MRaoBqOYf&vUjH~^jf{?)Fa1s9ihn{yS@6w2r760(y|8O zPfy3CTD^`0arRa&gmICN^Uq4EfyYk0K>AQWF@cWX!v~5{FUl0IKs@@?;xRLT5tz0! zvnQ`(=||X{zm@*1le7sq=l=k$PQ`N~66YsxPQ%ibrftGiY!Wctfu_j>u^o=QsUU&c znUjnW-}R)>@7Vv>{4U(UV4l6jF|m+;&lIfO{+!YbkVjhgR_BHykOe$9py1SC90UG% zsSxBG`&9{-BD<0sp*pDJ0I3-ScL(cTG&+s64IT1Ah)5*E46ZW02xM)_J#*f;_Rj@< zIjtQcI4*9&T^11qC5oOvABRt2N?pl&TfGc-a}^S#Su!8la1dg2aI}m?NyDI zqo*LaH)AX|m&s=UjAI9{9AmX;HJ#M)Bk5BqiXvBRtG77hb;(odnu}4lY4pUA&yzaz z0Q`ps7*p7uLBz4TJt9jDBLh20d=ZHS_Q%?)CjgILw6RN!F76Km zbmQwzl6{Sck6&JblDRtUPaU+fz9YeIyFurVuN7|erOcv96tBn!%t$94FdLw%R`Qb~ zW%jutLG;h^9<|%*y4{CSPF%Cnr>l1W^ubkk1m#~hZ8 z<(=V3?amvXhowGidq}PJ27ff;?~pk51L<1VR$6o{@>pD%AlMotkbx)%sBSTkeL9Y7 zHhXrC!DVS7XOXZ1NxjEBh8@11m2rI9ktNFPWyZ2Q2;mIQ#{pN8bLczQPi+>PZwyv? ztSDrkE$5-$=on#CjE~E)s+w%AVQy}g+stjjS=eJ^_2Iu>+}1po4K>3~{{TBVBM4x8)cdk)Lm+bb4LoyFx5x%NGqESQbzS z;O*{5T=pFYdcnGiYiBS{yChS{BM1Kg)M>%JnLa{bwixZm9Vv)5u?fJ>Cmm^2?>kon zp5FB*lvuFm6QgYkGU^dsd0A#w zjx~>t>Z7SAIX<;w&hB`e%96C8t0_Vb7=QJTH8t*)Y&S}*VJLVzGORzn*MaL(zLjeh zT1J*PAxcQYU%tBUo zFf`Zl?n8M?C;;Rz$oxfg5^5_W$oD9+Zv?t8amQiPjt8Y@wvzVDB=b+Bn*J#s4wKv0$H0qa{4 zr;z)J5=O(Ec0I?_-m2e849(^eeAfHJpdaH@Odhr}!RI;r=;yzBl1R#6;9-VGIqOUv zvq8P|xN;6b`qbkcbI$_?qizRGezY!Im2&2VOm^u+=8InrD5&MMVL8v9xU+K3>Q0_QhqT%nn!W5UXv#VB>?1++d7~ zq}{H_lUK6X#Q-w_p1ta3$z!+w0M}hrwwI@C5*4tHWS0eua4(skMGD1s^WQa_sOWc^ zY%$F^K3tB-jkKv^J9GYh=v5SVF%d*oGJtt^WW zTsKVg{7p)a9FQZyw%3zNYfnCs0j%`_5$kb`aym(jgJsv`PXqM2}5fxz@Vs(71% zkCH*^zNfEVDW)rnwvyv(vgEV4T!Hn)O>85CnLPAjqdR%$J+MXyrF};wWOmk`3AnwB zb%pJ-p^QH1%Rs7nmEDF?!0Q>r-}~qqJnST9`BF+T4*vEOxRq zQVgRE5O$rtbH^tf)!j1Q`ov2W{k*p9Tn(~DRkt3w7|%-E(>zUgrCgYz5nJs2*@i{Q zJn&fHu5-vEz71^Lc*@+^%;v@$i;0OQ>7;2Lob}vT22uw=4%#{87kd>d5S%$%v4qzv zBojmcjeyAC(BqIs4RJEbBF_G4%jXPpn!P3RNf0R??*SygImh@4$1s%eXhET5fBZbXq+QoX)!q&$wTen3$bLr52R3kT|K7xwjcJa?npW#;4 z>;us9c_z6{Ggr5}v=hb%jC`%UU3aO9Atm> zt13lNhG#LM}C9rLtRA~JJ{Dthd>v(8RY)}Dv(b3Q3EQH-8y9cCz{Qb z-AYG*tJsgrnxB8nsU$gN8QyyJ{{SYU#;Qk24EGF2oV!TlIpF?XYS41nJu{qprh0yh(*B2r>EGIs zrO6qy*Qe=`N{{UW{`j~R2%0Fgg$`u^-{{ZV!Y{BWk9mh4M%5$7!J$dSBzE~dA z(+5wnSSokTcu8Ov(u0Q_x{E{OHuKQ9=dl#YiFyp!7bJp}FIpnW+Ki z9W$KcwI<6*h(ZDoJ-zAc00a5dz-q4kwo-vFZ{{V$O5b^Cuw2SDwf5wMgV6R$LVYk1o zX;>4^F@eCSMz3uOgl=!{nvZD*ABS3>W=A+Q0#9qLabX&56M^H&lwpy!e5DYhubQp{a)Mt!R4 z@H$}ocKm9Tc{_RfeQM|gf$#X#Gom0@Bd<8`OaQJhI&)Kjk8IF-ao4wMMHOY-kZ*8UBOJ`|u9mHS_&jW6Z`whc6UWc))nH7@WNa2y>jlke;QNhn6 zq371NOO*1eRdqftg})DLH{Ko9?X`;r#J1172bGa=hDII34lB`obKZ4*X@<&>+5 z9^^vhkDHwBah<1v3Y=wm730VtBPIqO3(CvfB1mn5NVfHTnb%~5JL)Iv$%^#1@nRH{M(9P#WkO;ScaT>EvV zysTTM6!f4qdI3ZPhaW<;i^FHrr!^`%r%&QFKE!{Q3UCKQjwvwaYjU-~0Iu9;A2(8c zy474W5~PqP^2RY;pc<)hzf+WU%ooU1p#WGk7kFU9?l(uo#83v0E_a8O8pPcn0Bxjmx zBPwE0N1*hnG66Yk4%AD~9P(*cu4l1YLA2y#uVYab7{{$my>o`o9D5pTA#fcB``mH$ zpwW4eL}cCq5uaL@dmp{)$?r{A%6#Db-0}@Gap3j#q*K+7l`u;$@pa;vmp1X%$ zoe26?b;R=BS}=?%stx2W6r6R&IU^m7B6*$7DTjxm1}QNvI*7he$D!(T?^v_VVRGJD zui4NXC}3OjIpYM}9dWO4NsPDYWyEI91IasCtu zEpBM)Qn_^!B(ca80v*GRxZ?x?$E9Y((fOm!1g3s$ec~yHrZREcoYDn!mS&K zk}vHii6)7F^APZiSnyPJQahgYji%1oONDX@f{dh%tOhVY5y1DNbhvx4@uK-sN5osR zv@yXC(;59cRvf(y_9Va4?Ju*a$8_LG-#WVPC`aB080XTti8$c3r+D-%pvV6J*Q<$rajfeKD7?4 zx+3Gt_Kz*N(l20HB#a5+i#w%@B?b;MayaI**LHS+l7AZZsb)*taM8tXE}~W0v-;OC$4ti_3pq9 zlOrlY{J%VtTJs|vR^=bDX|D{I5y?&9ZKQ<-+?P!vi0%IXddg7a z1cE`%MmiJNS9ATnV{fL%r`^dN!!S~)iOe#u-7!YQsbT^&Vlv{^Ph zPZaCsNC9UAakHV=!z6-6J!&Z8E4KZnpDjPk-nAMk+=d4e$Nyad9o}Sgm1_uR5BlE9p(`GjJ(O*NV0dsRV`d$}hwp%;%!EKG60A9SD4k2Y1i>?be_&2Vx4&TSyU?Ic43Tz(ykcUMe@{Na(|JGu&}k@{`1K!BuMTO zR}64SLWcx5zg&-MlJY|((>n}>zyZAgz|IYIF=!e!oy0z6^UBg31qcRP+njJcNC(!c z+-MM+#~OU%Xk&7%y@C}Z-x&ObcSfXJI41_3&TcsZGYoz2P6y{tFM_38t}t`c*MY_> zZcPgE77>RVnRhCHS8(r)j-LJNKkWCAeC=w@2skGkbM7lnboOReeTd?@3mXXu-cJpl zgXlW`mFhOSMZ8gqiwi`a84*5vgfX&)ToZtB%uYzJID*OxtBB%_8r-|%a~=Ther$H> zUZTDkyVLE4t!Hz0Dk6dAM{(!I`*ZThI2%apITe*!v5k{C7jNG?VH{_xAp<9#GDjU~eCCmjHLl`K zrD^tR@kMfy*+T6Sx>>WfdgQtunc!~zRYbv{LAFG_GfyT1!XYt*1ZO94Jm-Pi88v9? zZuWC&mX@%zNQPKi+DtOwWQI8mPBEUj#c}@tXw){zEU*ai^D%N#U8kb}c`NQZ(@4ss zlGzWhGj%)07%s!Qt!K`&ZS7n&UYRG;;dVEV$aKVxsu|=?e~}=F&EwP<2db; zz$ZDbIO_S09wFy!JD&}~L&45KJa!|!U42qnBZ^q>Bo60r5|aCSV{tjar^_yeeCfY= z8#Cy-npiHSXJ>nGNj`F$Y{eRm3vfw1oM4Kdf|-1VU9U(pFHCYPAT;XsC|={ zxfc<>%aD#Uk++f0=};xll;0^OLC90vK9#3&b!=i)meXv&pOYXUC#U;d4z+^kEzk^g z$E|2)qMIf2WLu9vCwA=niq?+hC5hvfSMwQ8?alI@cmo5|fGY&#pP2FMN`#Do(wS~L z8Vh#z&+?W4s8Soa{6`gY%8vaN;Z#-`3<)C`u7^y$itgDUlgqedQ@RzsOb zsPA+(`DW6QqGk%FH4M9teY?E}UQab1*3Qh$(^k6N<7T#+1_98iZkg{;9lsnYM# z7HimqjTyp#au6J2cHTyF(yPa$Tgt&?Ng~~xZX+iincxiftL9tWYI5q1NR!YWJt@JC zIO7%3TE49X>NhVU zEjsmWvmB|qHaoBhLd*sS%sX;xNp6rs<}hd(NdxA~Fg}OV*0gP!*KAV+-5gjkhfkC? zdt*C+_pJni&heVodt_DwJKSf7Uakf>$lwfg^rg&}q}jJ(O*>C}g(f6f+iA+XY#%lV zBOH_LdesQ@>q#egC5>&HqZvaY?k632I39yM*HQhS8d|lbu#(Z_QzUXm#1QNENY6V) zIR_cf6!~wlBEhIZ_JXQ}$m41k=vx>#IXTBp^^B@LY;LJ5E18j5_)f~#$cAgVZ>Mja z$L<~zkKsoJSw;cLY@F~bKHExzP+PCQ%J$E-br+g%+M{NI z`XL_f84o!A>jFPeM?6+Ru<*Qa1_ON395P7H0?FxR8?m4SyWvrar4V4C**IsFqu+)E11+Y&kN}qgV zh`Rs|a4Ah}{b|NEyLmdf@aQO4QQi)h%vb$~6;4$%hmD*w?RcKHqhsv68xGph}pn~d$k&;LR z-~c(S<%?;h%H7Q&gh@GbEev(O(lonyKHsIRrIU0`8RTu?mu^7^)O77!*0bU!y0S3Y zTcxZl0=j}6F$0Fl8PDlg&aG>6Bi&qS=l~m4m40K#C4eIt?bwQoQnRwZ%+|`0&dR0Z z+*}aLm1HC30|TdA*6K?B@r>l!v`!Pu+YrMKOlP0Upby6)x^baEW)`h6j!Yc9i{(VP z8Di}C#yvXcr9J#3Gg*tPE6aPL0o@uBr>|Ja;zji%816C6Q>_)$Awo?zW0q6SN&G5R zRAvg?2H>8il3QtEc8*X{qa-jRxZv~9{YMnl+^1@s6VQWNqbVTU_lWs+^ap}}3XO;- zA4+>G&*jzR~@#C7AIE1`ySV*^18E4d(z{KnzB=g^Ls ztY|Io?%iUxSDA+jBL#>bhf3(;(pFn&&BXC5{K1#b2Vos@G1u5rx<*orr1Up5-w{G% z@(Z|PHVB*m7XujFILE#|wY3(ukk4;#F36xUg3_@kkU9g?t$F;~JkhYWgx2~_EHb#G1|Ox&evAFg4X8Pmq-~x0hWwQEaO!GdISBX9_8 ze1zws3>=?Yz}7rOmo~FoSk1aVM20iAMk~(MBoU1APaJX1Yngu#=166|KWvgNM1>Vx z5x@t#0i2cSO;fmyTav+$90EJ`^s7qd6O&q=yP@j?R<`pGEP++o z*I{PHO9kiU^yixB!%VwaxOn>Tf6gn(G(BE>X#UVj%7^zW9z-!mw0ya9{p{x*d)KGi z5MqqWhGs=#RQ!xjJbI46)UMF#5DXMZa0C84hCTB>ydSfTh@l4MgikZfG@t@~a*z?DKYNMH= z$`X0UVt6%SK|hT}Z?&VtW7v18Rj_vYQFBDJxc!Q8kIs}Y$a|BDdamJ)zLhS_40G>F zX_nkx`Tx2ONr=4l|xAWsDUB_w?#03tXw?_UrW&?<{8o4u49y z<=~yz=AY$y5AmmP0!9A_t+XLB*BrW@}PD*8zjtDvR9XcFWj!GMUm~)3Y4V?b~K5Io2 z%&l3r;#=iy1)O6?Z6x;na z?@mZ%nL%0CDBy-(INQdw#fG|1lPLTs3ZKUJ4rler}yNE0?k^Xv7 z%4Vi!U~j2_&a zegc!H2aFylv7P#cK68VPJ$UAsf(Zw=PkNXF4p+BYcGYDn+4*@Gr(jaC8%rM2%()=& z4K>MOyc`fX0CxJ+!XqHS8QMFX0a6&AJZ{=R9`x{At2XtOAmt z^%>%=ZBT=3WP5|uR1X?41TjU=0F0c}G;0~$8cee|($TPy`(^2xJw zgC2yQGu+h^5q1C`-{(H{U7{hdSZ*GjD!j-^JqaYco=!}R$2ldKw;q@^5t*6y2HT!J zz3Gh`1Chw}r2ql7$6vyv*FlE}NXHoZ(-pb~?NW$Yk6tOwZ_fl{s0NEM^T(+R5ucZy zDWGxB9^LDH(@L~&E=${?7;&AkFPOl3oQkObYj3|iTx^W zRrJv1OAxpR9@x!K7nG{ZNDxq@&*M)I^#6G{c4a{ zT>5^MA`W|F`qLDQ^ffbJ`(l|4cxMN$f5xpxd2~#0t8LmzTmhV)e)UW544RoXpg9@u z#VZibuF5egtTxtU&QNAVelv{av&XkQcC7tANm6XXA&p{__gNn?ld$w2{i{aaT_!fR zXs;zn03Kq=_kF-&f&lCdZ9Fz}I>yD?CUDTo3i89S+s8iQuyVITbu{N&VxDM?hzI8d zxeP}n4o5z`epNxV>j#alR4`Q|e6J=|f&174o(CWf{b+{&08WDDMf*}hCCZQw`nEj@ z802Sz=~W=pXNGpV((g!Oe|Z{!*;0AKWCN4i1B%IC&_;}26?qAo(@@@wyW@$*(o-Ma z9ANbAP5#fejx~|(f=q}0S`HK+eKar$2>F=ev3patI_eK0M-l^wwlCpT;CH6nc6313QjtVjz&J2 z$9kySc7e8MCc3gSjsl_MAO_BP+ki3c&2+Y!jCX+fdnLde6P)LabNxHlKM#gk*v}2r zBHIjsQ2Cf7Qx2-> z5?xn-a6a${rhN}e;&1gRC2uO#Rv?_HA9r!;e=gP3HQlY8d6CBCCFD?9zI7b+=jmMH z+-Q1=dH1lCo=FY_XB)lS@ZbUUs-&&0g!M2kZ)Kc=BWD8yc4O=AYevsimcR)tSgeDq zbZ^VQy=xsa!&5m(Jn+Lg9$>{{T3yq8r7P$h6cJQ7J93s4t9T3Ref}O>$L=a=Jyva!SS) zn`5DUun#?A5=haqOwHy4oE#<&@;eNS_pP07^F^@KS#RJMuoPJ4yNzBHVfRQ-Ip4Hk zo}6G+9Y;Wd=4QB>DW&;$M=S>qpHfabb_1`ut$SNkVAIdKPdPlc67pCa5*ct8fsUQ~ z)J_qcl;qi@D>z4$BbR+2Pnbz{r)sS=r^_NoBuDKBCxieUpn=~aqLMqEtp%mXl3mTZ zIfs_xEANta`e&~qx`cw=7JFf13dgxbfPAIFBX$^dIPKD_HjimEvP&K2(i|$=$tRkl zXDFrcT;LAe04sROC9AoGNjC0z)!mK#yMsJ(IV+IB?@yp*>5k*5s);4dtThQxtbE2NMw;qe8cXQJRY5Qaf*iOIUdy*vC1pEZ`wF2{ct_aYOUs>a^m3Igk;K=b}kV| zIZ(LIp!}-2BubJ-bbv?@OreKRpn_Zuqz^&q*ZEUFu^^IXpY748BoF|>AdKOMML6s_ zS3qtw$w>1O6=!mC>R~QG&jETj^{ao`wpS=_?I&G~3p#amVfT(WIL;~j zZXGp0v!oE4Ml!}?Sx)4hJe;$SZrwUoWzCiB1!h+(|s zkt(iZQGjuPJ9f{lZP{6PZq5l=^!vN{K5s3SW3h4l_|-u^xCXDv9Kg5bqL`Y01ZL% zzU1w2I6j%<91mK|Z3{xbxsy^?dwZLCx0MXe9Dois%{r|00I8bHSX_qrs|0LZo6-7daeq=k?@zk4 zkVaIoD(2D80F~3t+MT$YX?Oheu_iBuASP|47 z#CG+qtEumVQoxQ;mIfsWCBPUhgVQIk9M*=L;oB!L$o^zlY$32=n!z?0?m1P9=kTJj=f}WjoipA80$IClta<*ErwTU8zP#CZ>zS0@gX9`It zJ!-|quQPnEL2yss0D!%L{{VN=wXQrc!cF27jetARoP4S~agmyg_&7>}R=EhIfHs}v z=aJM7#-BYkt;pn=LJRBJip?Xm{#kA8zj{yZfzu><_8#@C9rPOrct~N5$_^Y7bH;E8 z8P88#(=Bv;E;kTe-Q3$t2ym!W5O$CW8+sGiaxvblU-*7Tk$jm9@f6ynGrdb-?_-W~ zd-N3!aBjo)b4ugqlFsE?>gXROdGgd1+By?~j`;rofYeh*Zh*%*hDZw(M2k3GyycE^ z2n8EeqKHc$?R2xz9(+=lrg1eM1{EuKbs!{C8zjL_> zCdg$hrCs(jtLIE)^b8z&vrETn-OSY1vHUeD~;#I&)? z2=XMh$%%UIF1X4t2fjUO_|;M<44yy>D&_X5B$6?b4?*9Krl7Uebu@1xe8jB7aYk>S zXuu?JPCFieRgq${MI-rZ=Yz{e`CfP&bC7xw(>>~J_LxhSTGJvPP>E*}h}4`FQIIqD zy7T(dM}Gt|35+DMQUO-n3N}U?jB+|;S34|n+ug|okLEVs2s@Pbz{jOkHxfdnfD$O> z$5V{w@W-ud?2|`3o4$voS@?ozHw#ON?YAfrz>HK$^6VoXnCdftIjSZhm7W`>x0M+A zdnGtkZU`vk3^C&)t#FU2vXq+MPbYf@WNf+;IvgDFj-s>^S%uEah@qJqbF(-(X9qmv zoD=z0KUPavqkpW;+U)I4m!xV^81JIDx|hw|@+k5oIT+YNoM0YuMo&4aU)m!=k~5=0 zF;^j(w;ihLag+*1SAn~6!N*Fc7OiHZ%#Ku0$V*^(hc15M2L*j|=~_#Br}-XS1#KNc z>O90@*_nC}c;s_a?Cz~4p-T}f-Y(3?ZB6y~RB9%9Uer9P6J#zJ?j=YZt;xuV#opF^2-H1NFes>_j^@)y?W-{yQ4d( zBWjbm5HBNoxA6{m^v7D(5lcv;ImyZMO`cwtazy2iJB~=`GxV*kH&knBlIX||2`v_J zkb8`94?l-$=_01~hmDnKKQaxvG^xVwop9Wwa^`QUuf$gB)x zdhiZUs62yNB=tzQHtlwH+E$%$K5gcZ-l-m1M=L^tB?N6BKP9n}2i(VAaa`T+h3w>x z?&C{$^Q_4;*|7PRJmAQ!oE2V#az|d36peXx4XypQ_@WGRC6wz$DM08WYiam@8>UrenzcsC>cw$=yibEuA4CLn$e(xO$?*kjh z@h{#L9p8p8Z5A)N6f6eW1cpH51<8wTCPI*bDY1)h39YxX*?D4#7ENn=O6V5TyKKxf_r|O!0{B0bNA(7)` z*&z}Ufs(_3qkcLH=Iol+F++G2m~k32YzI9<5I+nPT9%gDI!ARWg5uV6DDk%N00)Lt z1Yxt>5(?IJY?h|9d8GFueKsSk+DmO3h~x_(x5}#+$iT}JjmOjRu3k&GONNd}%EraM z_g$p=f&NWiOSB2*OBfTx%F#A?ARa^d;B@pgx&4CI%-7bk!*BM8yuoh!*=26(82z z(RXxT{;;nH`zYKVJ*vNZDn4*J5Oa=4dg?TNQLHC~dAs41sbRZmIN)*I3b!H>v(WYk z$SOkPDnnzwf1#}fmobvy5=IF0&wq38SXS3CmlF~ldE_3s=~tw{9Q_SV9NQ!d-`;`7M?(aRK`t;y9Xi&4 z&N2==VzF&*5?08`QO~_>XUtrN`7_mqNc^f9(+6~4OaY#~ja%~BaB>Q;$RpGL0IgXu z$+7mo8R}21YQZWH@k)CZjg;^he=x(3%B7n@rb8hcS07S6#aEZ*I2k?v02*@==RJPB zcc#hy&p7W*67@4A$>*g+v4#iK4^Aq?$_G!+)}mMAXE-_O{(4oIb=0KsE>|6K*WRj0 z7|*VGttUnYzIzX2RNv5?jN|D|8OaqCxU8Iuk|3%hawEebZ9_t-&EqJM^fcDqH3p_3QbHmkP&_ao-=(fJ8(t(n-rH7{_{8 z-1hH7E^?|5eouV#%|w_7jy**H*>5|zJ?Vt;!270!yK{n z1Gnc<6S(C5e$>PO{G{_hT(g`2LCD}!x*t$#u5-^!cFj3h=O2zJ3zqVEAXL~m$2`<3 zafS!{nz7D1dkRgIkmX!sv8gavfJYsv7oYRej!q79j-QPymKfvTJt?4(QxlW^O+|x} zcr+kl@=gz>JOkKt=9!F~3X~jXn-UzLk&2lP20dwu$ph3=h$D`*CWN>-{{R}1K;&{i zl|~ypdsM5yJ@e9mq1!;}QJkD^Rr!7}TV>j%g)k3=8hKP`y0G9WoE89C23|-&2njTbD#$ z@g(=qYBK)-YUz>b+JFIEEGr7I85#1_mCJW-^~kt518@t}4^P6jWfl(`Om2*_g;Yoc zY{wl5c?rSerZb;vqZOv&M^H~(jz`e?R*OV=t=?B=dkx)2;n4aIrB7!YnFM30JALX| z5CgRsU>?0PeKGxN?Yv>82#D_Fs2xc;>Fy|d4li35<l2-&m4@^*zp(v;#OZnk)Ot=dyg@8lw4zs3>Eqx@v5;7 zshDF>4gkUYfBjVfkI>eh%m&XSpVp!g1I`c9pD3eLpd!cDy#hS-&0S<%4l3eV!g2fT zAEtlEqm-{|P*|WKvoq%y0|J|{jj?BF9ZzFgpI~Kgk&%e#K?5NAimb>ESEdady@>Xj zmBcZIA$b6vPd|-JE&Kj8Ixf&YpO~u=sAk*v^V9RIQARVW?m)2aIT+*Dp`}{~k;hyf zj4I@67bGdiO1W$RDmNZT{3vM?2|JwYT0Bw`%2#JUHw4oRamn|-R_uEp!}`~4b6_sw zEIBGN25<=#h;*_@Ryz-4*BJVBsL<%Yj+J^F zAKf&E_i`%+48wu`M@ky994B{TidkWX#XXPjaGSpa+M$xp^&5APPfk#72R%Aww?&kf z(#B(aD zn~(w#fB^1Kui;e{b*VKUE3uklk()82D*IANXLf&j&^QO3#YhNpzBz4X@l(=+C7VAeAAswh{{U4}7VkUxK~DBRDz87SXz1`P z_lbxa=@5MJjGf-xfAy=cI$R~b(;^iM!p4Mt?DWgv=WaUnrsZc~P;XRa4-Tw$(QZ~U z2HP=gj=1?k`j1|Qpr20Ch14*ljEo!SS5PpZbCb}Yj5q2LNTd zjz1dYp=}gRV`JsCWB^-c7+~}Vuh-VOdA|1yTycZx zR_2q;P$i8^_Iz?jp~2>%0h>EOJaRf!SbXbpmpz9+(va@P593zMXBa#mQ%(j11TrQ1{1N=j;rYa&mDKt`dKmXGFL4eGI z=XP~GaKLRnx$BCE$8fS1nMeTq%n9InpIp_4Ygo>0;Rl1XxydAZboz=J5@U(xNZE%9 zj7SHs%sO-RuYJ28K9$HapLNw;o1r)#tukvhID2N^7;>29Pk&s~b_iS^fd2q|Wp`A; z-CNC#La_VAPilMW7qhXQA~a-)K2kdxP;xQX=~tuGZsKM!l_38Bc|(6NY8jdvmfs2p znDWRz=6zSw=}9(Q+fp?dBOaBbZ5%SV^T^xLuy6pZys$NH8-W`GG)XcH{H#jnKI_dh zHf&D1Qm6Vff_DTRs~aADHy*WS-&50KiQ$aR0!YD>gO-XwF}u*HJ$vGvre4DKvm`0x zO@Ic+3L8B@9dr5CWcHqHnQ`Phc6J<`_Z^Scg&XL}lSPTv>svs^MV?qPyTXJ9G5kdP zd-GP8`$E&Z?$PfsGwNhZ!&3PU_!G1oO|^@ zL&YadT+JH)0Na*^;2Gdzz-59tQ17<{kUJkv)vIfHY!F2kn>=%T+gU_ma5@IhBR;)r zoHj9P68)+xg;rp!$X6RlJq|bqx=8fMRicPU(zA{t+NA*<6|jC#eNSr6RMy1vq*#km zo`Ey7bQHdB0%)|@;LlJ`2RjsCpRVQYZWMWlN zNqr%#$2ow^9A>4nfbaTF=>bAGL{-8=3qcVKWc+l~OPt}_(lY!fl(dkIsaAD{#Cu18UVXzmL+1h+hA1JGpm z#cKq*pmMnb&ppg-mL!rljPTg?s*C0pRYCIu+Jw&Ru_M%url#|wPykLku>Sz-^{s87 zUt1c`={mG;yz++AHv6s5yeeBz9O{(8@Lf< zm*xUcV&L=qT~B-r*E=VOwc_f!UGcGsJQRu_-Kft^#YfCXzI|%<{3U)Yys~XCQND_6 zesFFONa)A-(a+2oy+>-sP_4|GO5cyI72ls^1x9^6s-d`d zJApg6BX=W@>sJ`HxSpul(k!l|n9Xk6T&~q(!9I550F%!imD1^=IPR6TBWo(C*u=3% z-VO#p>P|cJT!p>MM!A%L`5s>x=RHr-yPG768#v=C3+^su$lMNdlq4UNC>Vfbw0KxwN>(&I(-D+S>XFl0b1@baRK;*Kq;~DkoU8;DV zNL8)wBS`S16$q}|TaT0watQ1FYQVhFB`tAjW#x$ii6Vq$SbHe$M;@acDuBX^lgzkS!6n-)QBMOPb!NvSpcJ!eQCdkS zlVc0ne;AJ$-P9=^Mls3jnu^|iGWAP@@+6Uqg-`Deeqc^mXV8Lbn{8@=MW>DPZP7Zo^ z9Y;^ftJ_DbLv#I~dXMBx-#VNerG3^I$)3y?!+KD=X^iV92?sw~>~FLkGDsr4 zFvX||HUg3E*(|Cu$|c7IN8Luw>=Bb*YozMdvq}5NUfN{Z*>ig)!S+& z(kUNGl1p25ZSo*2RhV*IjNyszjAOPdhZ9Dv*RyuF;&x%`(n+d{=P9V`wi;`B7O}UI z2zHKT%!?rhDsl$hybddv9wI()kh`3cSZ>ZUz{YxjIl@=SmR>jjxevh}(n?ftUXK!8tyyoL5~ZX#2}knxqqVOxx2nf9+L> ztcx0$TXLby;fD*A$jM>OMr$VHTQCV1RhmeqR>0UXy>XTKSP};ved(}hFy2M>`Mk|C z>IT>$gC1MPPD_K5ahwgKgY8Nj9NzYX~=2 z+b%W@kqmEq`Y6c9*NVYSH(9W`HlBLTb0FNYtL89$T(IEhpaY)N`E4|t4a<4v-)b%M zNb$DRi2EF4CpaFMuJ}SPQ;J;4*_&26xRN;`ds89+cm1M39zpy>7FsobI7*0Q%4+43}hXJ7&cfOa9=$~YoB~B>PsOZmiO)P61^sFr*W~+&~$}9Q`YnS$1);NGCZt z;E#UQWpyin31T|^z%aNya6RdATVUo*YFqMrw3XzxX;@%w7-7#+FnB(MS5c$S;l+kD z)+Sq7h>=+%Lxe-pMq~c~Ex)=tV!1SsOBk$YvOPqX_!QG)6jSSV?}S!0lPDgah4FmR_FWRYCltS!~7 zM2#d0zU; z6m;VUH5DN4X-ZL6eGZcU07}s;FCmLiy}5X9u`5{wATJxXv5*b?;4o4TVrwT?zlZG} zR-18hlSs;ODk4UFpa|NdD}s0pobiH9Vt>MOuUy$lVXR2Hq!`RecA?Bq(CYr9bnRU9Fx3>3tFPpB*TmCswIimqT|#&!f(e((k=5oe zDG`!S%D6u+RgOUzKZi)Z%dTo~Eu;?{G&{p()fDVFAQFCN2cR8CHM^oc>*zDheQB6{ z{ib|viOML#k_H2CFvpL^pu4b-P+)HtVJ(y!{I}i*LW{$nan`yMS869KoUFO;V+#_- zvD)9;weAj77|TZ+=ak*Uf4nn_ZQiGG1>zb{7;fIphrAk=PP@@%*c!&?a#5#*&mH44Efx@J0#stm~f+U%?03EyGTM zh$s|^7YF#4oK)I<#rB*`j~|wVs+W~G8@SF0=to~_(pG4}MaD=?Vf85QrTx&{Tg;JF zLoV~^2X9I(ZWiK9+@psi?m>hnj0|Vc^IeShw$NL~Ah?F*kOT@FYpUde5rEI9UZSz) zTbtXdC1{MIFD$Q?GQk+*JGdvFqM<(`szEJ|lf$=akR_7GxT_Launb3bU_1K`O?8O- zrQF?n0meYDD6x?(HDK}=iQt2g4rDZJ48bvZjiq5}x3VITKYLu5! zBNp~I)rG^86kA<+BRjtujY%UC3=`it{OYtf?-~?FVS)$)0Oa-eKJ_Veke z9Pnyib67iQX%Kg9#y!32&_|6jOVMhzkQ$>c^T1Lnxkx+EQ8hbD&x8YE^ z7{`CDS%Z3r^6o!3867<;yYtBB`cu!S`U;CA3?818(K2@!Rf)*&O(2YW)cNi@;-g`b z393XAsUwd4DqQiw^&C}HKD>9UXrSX2ETl}5NQw%vT#OPpsmy_f(lJp5Ckjs)`qYaY zdCMFO^rOMj;B*wwMhALgxhnqvJ}PBpIL|}tQ7FeCWEyZ& z)brYck#NL-5UhG}pL(Vga!Bj^>R`-Q>)M0Uo+%=wsUFeBJN}f6pp2FZJv-8#N3BFi z;1Qf>ie%hb6KMfh5`7O(#+azw9-GG*;-f8(m(}{sVB_m1Ck9-9C(b$ zk?2A9{{RY%yRjR%00EKM4xH7!#9IuU?{E*V1CP>z(p!;$#Anlt{c2=m)BOH*5F~@N zrypNRU}`g-v=mmo zxl2oTxs?mXpL+l{(0h=2uc)t;JWTfbj-f5hj1b!-h1hvn1mNS4PZ{fu)$N}WZm(^$ z`%`ClZR3@lWQhn3DZs}aNM634y{qTRU~8ER?#mS%9x`)-?agZiW68$O^5yJiMx>7} zJOhq@Kk=u&;6poS1C`DgRLKLz>w%U$0D2SK>N8sG8b6ZaBC{yk=;LY6x3()raV<`G zmrMdO59iPFu7ggAV-Iz8BE%z5qvqO6lfW3~>x!ZFXyld5MX~{HtTJ#q^X=NKs>&^- z^B`u6XgisI0NnQN>zYkn6$fW?Hd}|9;itJF*}CJWwL-@@QONC6O$q_N5JHS+J#&g+ zwwSt!5U&1&jC=9;RjV1jUD&Wdv#}4IgE_}qmgYEsQy-U{41~{LLJxY8Wfo_O5AvZQOF|_F3!Vl}D%$l`0Cznq2^gP{ zjOUS`U#&G=#s^R6YOZH%mKsgjUVgr{e%(T#6MUfX2>$>*DvUPrNg&(6JqhS>=~}I6 za{Qf}anm{a{SVfZnlz^uxuBAyafByuJY@C!eW{JI=!m0I(t+{-IsE!#>s2F;a#G$T zXOW4*kG+HZv0GNQ#>0BgAXfXPB{?MZIU|GgtX+hhN&Gy`o^0MF07*?b`IFGIbZKE#yIq@a_;u?RQX|9Fh&X>EzWq{ zPDtaqs_;J6!g};QTkx)q-|euW@)6=^^-`dZe^Nc^q@oUPrjJBLV9BHHj`Gy`j21yO zM|^=#_nY`gJvrm0W_W_u#LR9q_wzjLJe!zq-hbH~0sc*GPiKE{+pZ&N6-MXC{bM$44m=Xum1pCQ~bD@fl-vsN}l-bnwm>?i~V5Q zLBSoyYBdLpoK(0LtMxY})j+n68zoynu1ggscgxc_>r6MXT)N5SDyQC&pMp=+b|2Ge5$?s6YYV=^{nZGNsIt-#(inv ze+@q|qT`ZD!6T3dx4*qRXiqk`Di!V1J*rrtO^(gRIT`Ox`EWMp+|pws=}N_OI~Cb; z&q|1{?rPagpXp85Jt(nidKAhnG^RN1R@r|sP?g7CYFaf@E90MB_M@LpJ!;0@a(fPx z){nTUv8Op78R?Np^5+NZQ*7POrAAi=`q0otqyN+VFD}3kKIuGjnu{Qu)W{;(#mU?` z3)-XGkU$*`d-gmO(P9g?gy(9wIT&$~k8IPVkqE?RY<-vdXT4P`gN$`F@s%V4jQaCJ zT7;d%2&cX(R0|si-N?oP98_D&5syl6Bd=d?rBM#$i6--i$|}Bjb>lx#(wMkB555mi zT7aHO9qQ;o97yB_E^(DPBikKwM&hzWk*o_MJgF+42xP|%+O-ni&fvV4Vb>rOba44% zdEQ6_)KO{aaEv9m*s6E|OLhEud)9pE90bNC6EYH@fyO)F{{Sip+`DySu%WhJH#sGv z?d^|l=Aug}E*t?9N6?&tTOG(z*A*lh#FmkiwTWUZ2I(?)u^zp@l?kq28N|}LVbJ4- zKaZ^r;z+X%h1H=;n@fGH&lyX`U=SmdxfNzYu7$*7WTYBa2OKiMmI+ukNZk$t^5MBeI3;%+u1^Py^O~}C_(Xwa zx(zVu*~)w8xcm)Z)bF8Ii&~>MQo5Q8Y(y0K+1-@d%0b6U%wx0X9{ zw#UqoxpLcn?{ZH;pK8F5%zze%vW`m({#=f~O3hPkYQei`cJo}uo13ff2y7~3b>yB& z&lsvVDP)$f(^Ony6LV|u@Y-cqk z)s@1kNpWi|a(&Itg)j$Cz1&sHxor0ZQ@T<23XdW}!@8bIP3lXNwb66?J66>qvbcsA z<6D3gB$hywqnGskT7?^riltO*i9Y>zA|Fu~+t zcIQ7RljMUe(LNZi?mCXx?g7RsB}pU^lY1jh?(#^bi)fKjVTmLN z0&hHq9Ch{2QB9t^s1K^pmkzo)L5 zcC$k}M{LM9#_Z%sIKTiL0tx(S#+}vCGoLH7GOkUp+2Fc^bkj=AvfHwpMi;3Mo_BWR ziki)BF8sl7Gs621?xY3&LH*OgC)@I?uqMc4j^fcDcG(TUbFo+xwTh0%oYN+T8D{%o zF*f`w$cOm7haB|wrqzn(R=KYfM8-_lprXc8X6?99&kNXb-_oGd5ek;TZS#$D#DBi_43LSBh3BsGC(m zBrx@3@9#;a*qf;k#2QIkh05@w)OG-S;8ez)x{gy%W4(vN_HN4s)z}-0KkpxD_6fHn zdz^HuPorEl+-+=$Byo_N)DTnBqq4KpArmqKEQDpB49%bK5y(Enf%sH& z$Yg~}(7=3avgWtVEG_WKF4bnxH zC8Tk|`T^8-^{H+z;ImR>krV;*GiCYo#YGQ_bT%s#vmY@=L2r^EPi`^~<5g+3p=m>A z%^QnL$zd_Yc0eOz7?dNrwlm4j3CAO)K-L;{z3-JUc9IM!GEAf9KDgkFbG(4pHNOa^G-2#)eZ9B zL!>vFd;rY%5W}>9!DPa>8RP;PhB@@9j;p3JG(y}Sa?(Z#&Up>NA%CTLt=-m%sNI{3 zm=TO%j1()s%NfCZ;C%r0t1)ZV>k`4F7y^K;pmMwn5)VU7(9-0p>h?!(dt*Jx zh4kc6Bt@MUfC&QtvHmOr#%qGsG~G@p#LpaS0LfyqZhQ>jgN0N8=L3=}e$wYqx`%m$ zKwK#vQ9o(1H8MU7=Upf$P$w)bte7rCDRS5=O-BTw+iMT#lIc=~=UhVoxc~ z))~r=;veVmuB4M!M=af)j*3f-F|L~8{%L2Js^OD(a)5t%NKupZtqUDPLxN;$J7W=+ zPnvU#{NLTl-LxLq=e=?8Tgf8qi8qBA+mVcWZ;F-o-xyJ>zYtq0<@RJ ziZ=F8-bcO&nIrJ6NbVu~41ybB6ptV;Beq8z;}`@kI3w4ZwWDg*cIhlyjA?Mr0a)YU zgvTR20rdB$n|}{n%RG88SZ);y#x7l&GCrpxBcDp1W}m!@QB8ZS=HZS+l1Z)n&8Lr; zaM}JGo)5R@RV8OEHv$0}To2RfT^^}ts`+rnKFFyoL(8{`^ME+Y?mw3~?NDe1<2MFq zR#N~TSY_R|Kz(}*1Ddz4q$Ov$&Z_y?^3KuJ{uQMSy24WG;x)NazxAgT@V3EiRvLx|?OXmPld+B9Od zNRgz|3v7@&I^gfxdMh?a2l?Z@aphPs+&*la=hnAi)siJ-mMzi**@C~s4na60Jo@|9 z8O&D~jVdUKC1AhdjnAv){N6_N03!Plh9wgRbk~t&0lYBr0U~mXtfUn&@i08d)*=ta0VXf~VNG=p_hUNikpRqxz-(41-HcU z#W~&qKr*3u$>8TC@${^@C(@oWmKGjd#fH{-i-5ffmFbh%_7%^fVZbMDdeovP3zRt- z{A%M18OnNC=xw!4V@C~cv$d#|2`ZafH&c^zZo9`@L4`@8@!=R|*OZzbO9zXYP(VkxkQ5T9XQ{FWuPm zdG#$@OP&+0+re{bBW)Mfyy0_=&9^usxIE&u7}@GjNp))!cd)`)fO4iy$S}PKV7{Dj zUUjDUg5uqh1_je=DNw~-i**3>1p4B&Us8d!DDN$rbZE-3MhF}?bbbI~?^w#4J0ppU zTI@wNwv*+p$CEv!%Sc3v78wQ)%fZL5QGyR@N$0<}k~WTECgaxyA7Jae`UCvyR>ND< zt|py6!lG%;;Oi*}Ne4T(Wc%?`TxqLt5ux*!0H{r&<7^D_S2)j4PLwG%qao8$SBtrw zZT*)xj`mpB?J;A^mL|&~0GzroIp?wC9S&-=klE_+yq1!pT`%8IN`f=V0CfYf>+4yD zceK2c4=LjEP6@_H9rNk=)w%5^d)2#%(=sq<=La7!87jlG06O%g$*sv%ow-uc9X^q& zCDI!!my}N$;4INz92Po>_}H-G<4>QdfoNgPQZkzLoBzQEnri zX8qf34j&ysBaVG)3+VL+1_zm~r35$156#pC+??$hF>d*?KOE~WczK6&7%g{y_bA^bH6E)7qKK)7o}Y5)=2SNO1BXx z1=8|1K#YI6B7^v6r+VlvZ4R+wF6M$bwN?NClR5$E^Y9LRJ!!c~Xvofk2XK_hNXI*fJCe#fnD zX+AHATtMw{Br`Ye<}zi`fjLredMWLW2TIjJrF3TT3Qo-Sa(N!Ym}K?iHP0@;Ycj}I zNZDb*FSshW;1*x@e!V-?aQL@Id1SZyK!xJ~vp>zB_ecaV`W|ycb=V~ByE-z%s5#9y zcRhRe;;LI}F={MQ*`b-63>_S2j@TW2$E{wDIA3=Ag^Z}|G56+W##{-V^^&lJ*^3&8r zdvV8KYOstz=Yl)>Q*oS*hK`xsdVVx+1flTQ93K7Y`OjW){&P_Qi~w`%PT+HnpRGx0 zk_uG^sXZznN$K9C>74iV=|C2gwlDxEy-tmsE1o;!sKrx_ojzgf)~-cy5~FWj%yY@_ zp5~J@i$kSSha-{n^{5MDKBAu`%RUJ>+tVFCDz3~A^fV>hQkJ?3P6-D*Q#T#i98(zg z%_i=-{ArLe$m+-5pC0Uk>DH4Vo!z}E#8YE-aJc||-2Psa4Q@k|&JSL==}s~;0Hl+S zc{OG)Ae>4G$u$dv4aa}df%M!|-q;{#0|$zfWaBhO50*-wyU>omolO#g!H-W~c%;UM zBVz>jJ!;B>A;Rqh4&6;8(i{~45Dyp?8b3H7H{(llMC|NYXJ*cQIi?;DKj$=ov5fWY zM($73@}k4Iqo>lGI`dJCb?fO)@7IpB0VrJ-jwe!FBs>xPa>qd3y?nV=l=lKrvt&G%#DZ5!6!fcdN$>TGBfMb z^PmoE#j|R#Xwuy1ts-38u$yuf+7UTm>fd7RN0wF&XWlN!!JR%gN|#>EVQj&@kDm92+$vy z%rl>Z`yfp-0X!>yg3Yvn3+tVp&~@BLPlMeXB-II#qUNnkID{jB4FS ze4JyBrn92F8haTbRe5?NV~G9KdgIorG1BHUn!Sy7bg?^?OdzOjpLwKi+@2R6wOF>R zcwX*S0x+bIPa8+@ryp~zONgbtV$s3!g9f0;8ovG2v%)VxB^wtf zgXza{=xbiW&e?!>iQR|Gh9n?gLyY32xsnLPb}@zAGqpg~zK!S2=ks z=D2^{NMz%TjkpBk0~~)!NbC?eG65h51ORX`>+M=s4DuHd%)VS|Neagd2d_`ly=R4% zc9BHEBgf83J3v09bL_8cu`|v!i*pOy=I;2avPsfT2flst-Nzt z&TbzE&Rv^!W1$)3k9yB{A8|OxTHZ0x=A4^)2$M{Ww`$0$cvc<$qXwR`xyWcEIU93~ zAE-I&Qp01`Mebmn{ zHQ2;DtBDsqFKN@LLGgmgJ_ek}nSi|#!lg$kK+K9y*N#yZeIJQ_fx$}&gO(yN%k z;PkCRo4RzW?48G@CXFLDQE1x)pU#?NC$(G0%a3|Y0o(JbXw^ufM>~1q>g#xgn z^`#9>!0$)afmnZFbIGgjwvmJ}N?un3cvUK>eE~mv^u=e7LCB>UAfCRbu%?+VHzx|? zBX=#=oMxK9j-sN^7(ZULzc*SgD>7vYRJ-JkgCEwO&A$o&9+gxRo_`)G;fVXE0Modf zOI}i_{o%uQ1C#XUr9`sGjCP&5;NzNuB%Jb3=Sm6aX;=BPeJ$=nk0OYHDzgl=v(N1!B9nAzd>vN!8 zU|ZYyF@cr)qz}3eZ1wzW7tEe#W0q%QlY(jjdmg!|l0^}fR2%mKB+1Af#xsf(QWMi+ zMMAg|-~tIy=Z~o$%8{j&j=)Ln$8kj0Ds^;(x4GETC`7^gts;gb4Dh{9KPuX=*KaJKOJpUa@Yiw1arr6k@!-kt8FwdAKAsP zlE;?;p;iZs;AHX8_BF@LcJ7OVxF^fKM$a&D_lKzb>a$!2IBc-SIXn^gQsjyz^Jie1 z&4eMtTS7|`R!CJ-jypIcAFWq9)}1IJ_hm*lNg6*H>~UPM1y7$3D!3RUx$J$ZT6z9K z<|~oNMFSqg80QsMOHk!(>eg)zapg`TgK+-s4CB9k)LW_xTSm@{?IEah}MWLZMsCDnM)wz@GRbuj%e|_+M5)%OW^f00S<6iy7x{ueEdSaOCBHJYxWD z{CKHQT+GT5$}kuKj?jLLeMKo+O2`yt4O=wz9cKRkR9Kc~IEbCA#uq%~9tl3?v2x10 z$vpJUIzcRIrNG-D$moBUN>I!r1pCmES|dx}QLA$@hE;YOy7P>K)O{*T zR(72L#^S(y-*o+ICqaRMgWP8{`*X5b+>iiZa^G}&oO6$*78|v$k+VE69Palpyk&sf zwM(cyx%57sl#pFOh{*ubKrO#B6wU|84*jS5y@%skRyy9F6o{IUmS{T|816+R?ie`B z4x^k`Idr%2=~8ZD<7$RuY!jau{*rk3pA zJ|xt<)N7-in9OQ+qmOV82OMN#rM2-L^fz(bM-u8TCTC9Y8L3i2STnxM;0T>fy16k?$1?K z10Cy{Fxg*ootW4=Ls6IoYbdojL?Vip3>{X;> z<*n2HzagU2QI*Mv8CVSd=!Q5Qh7NxUre&Q8R(1`ZLv;t=JoKr*(Z0|G0!Xur9^)!IUP6m494|+qqWSoUOWR5>Noek}!jRUA&`5$F@ z2hemG>-bf1JduMO4Z-R_X$~TtfE<9wBk;{4 z-rT5Y%B$`>h%20)zm-F4V|jfjg31XekdOkRl5%26>9Orf%06GKE{xsE!L@31U9DrNWsDpqBUWc!tsg$rdkaFCN9=?>c zV{mI`UxpiZ-e!?kpcyAUdk+5q(zfQ)>?DCFw$#j$k@H&~9Ao%FKPls}>s+ZLl6Vzz zI~_!Yk~>+Pk-c^yW3(T=fC&RV$i*&D=v#wQdwYggjSNo2Nf{h%J$in8cc`WSM-JG6 z#sh4Wb&vysbKf7B=~t}usPAW&?UJRmR`H2tX^D-FPCT%?N#CBh1TT8g)bBJo?IN|Z zvz4wle)8s7LT^woJh;>Vp!d&QQ{~q}9KGF6OtI;jX<`Q7UVkdQmaxi-L&}A+0eJpW zR~!SLPI}V5nChjT;uIlE2-xj*!Nvlf=R5<{Raug!3)z*Hc`<;@26KRW)M89AVgcQp zN@@-(w!S4C|Kc1heCN)9^{V0^q_ilAq7e32qPTS*6>X{sRg<; zk~iH|878eRk#i)i1R$%R`Gnsf&NGG1Gsiuu*t6HI?OI7KE~2&rV?NdhM_haQg29XN4dW)719Iy*qa&p8Fe`d^a}HwAy_3?axU*6}{%;yNP1JI}RJ8XYX(`_lV-9q{~gl*8GZ-t*B8jjueQH%LH?B0qc$5GLh|? zxo>lzTE#4}-Ce0pQZ^e~dF&YucAn&WRuuXj^gCMKCcIMH5ut)cUE}zE?g;~vR1YyV z%(oG%t86eFtC5eqINQPPoaePC6vr7!YIZGoJI2!(5=dEm&$Yq0?H}zP!{&I`&2BuW-3xSH)9R=uz!T})3E4kG!1nvo-`LRM9SQ#DI4q`F>LfZewp{Kj^o4D z_AqU~)@=;!ZYPAq{$xZD0aLf5E_vfQ>}srx{q55;Jgr?|X)PPeg&mYS$h|nu4sr&1 zo`$#d%}ReMR#~Ew@sG$I$dC{2;QXzT(~<4XSBpxr8e|u8Nd@J_!>mRhoD>^(edxC` z@9GH{I5mj&Huo3OTG&F*DRxx0h?|YzafsPKEst@Y_^EJ<&}yXNsoF!Xi<9!F?jvoj zBa);sKfo=Hh6GX*`HpVpWG3U``1g zh&jb{Yv8N9Ipeg}Ztbn6zqd*4?i@7sq%xT>^2QtH*rzyLsq0sCw7HUm=dG@B5MRoe zjewdgGK78z4b%cT#(BphHC-9F)4K?HarevnX(J zh6q`co|}Nk=cQV<@VAO>qZi zcQTbDZv6B;Ni-*iVmAp6rKVl!*K(q|Tv^0!Y@|{?QzCN6a6Wa(=d~v|?7|c(rFfc} zFN-wIMcrd_1gM3bT#OV0=01cE&a~(8u8gn*H!#XmqQ;qg_r?bx`_@E14}3p8q>xJY zOMF94liQ(aB#d?n!{y}dD&H_Zpw~MlnPp|CTS0T6YPPqs5M^lB%s?@X=-4a^b=rC# zZYw**onO3y*zGj$6X}|!qPCwrW&Y^E48)EU5O$XKJ$rLo`-tP$+PsGL*{ohB(=6_9 zqfwazw(_TxRE>olK*(;r@WaxzBk_))QcH`w8{<02gk-zI>H*&yDP9X6cLR`pX}fe3 zX5YkmYQIit!bM@X6~yZL`rK);+<0bJ`)`<=t!B4i@+0tkwPEuBNasB%nohZ>M}k!4ZFN3|A1yEI-v6;d)v zW1ROj0g#RjH6_`CxL|l8hDJZen#{d(k59&=ray2!I%BOa;&|y*jDQ{w0QIFa1N=Z7 zbQM-1vcjvjKsW$ol5vV@IOCoTF14T>pP5;5}ef^c)`&w5g&IFOV$=y=b)S(4f*S9Cj=wlHva zd#exP#~3|vR#0RooLyIL%zk&U;6@fC%cueFb?Z z_HC8CzHX(c#VoS|!ctwsk=&9pIq2Br*L!F1*6&@@((6gMw2~=Do{u4BmDO?`Lne0w z#!1FNJmVFkjAQW}KH9BYsz~J1RL~PpS>b|7?j#_|EY4)X?obeSG4(yGK5cUD<55W? zo=602S!2jtGW6#Ia6bIkMtm)EWq8_flTWd_ScHaK*@`6bwmIDKkpvr(w`oQe|vL0dUPh>!k&8)JiU?elOSwu+D-`esuEaU+eXr~ zWq=tk84jCzlaNmy^>#?b-L1)_zPfbs8OT9_v~iqt&N`oZZN06<*((SP-i*O=eX>Ss z=AYsHUjG1O$!#%-*Km`|J4*D(J;p{j&oneUT-%oruF^q2Gdm6d1Ft9X0-Ds$O3hrO z<;~`sWJWT5(x7DL&{e23%lVm9M9ZF=un*)&HMwo!{{RtO*~51VgtsZYlyK%GCmD5I zvJbEGrT+kgM^cqmXeV2;W%71LOG|^DueAKz4ml(OJBnQExoU*pLlRh}x0OWE>=@&a zLC4Vdrk~$AkdPF2>&K=mrNX^249Sp(oN_wxPuebo{a#7za>5y;V4!Usw{gMfYeqQj@Tng6 zBbgiJKtTTPPJhOqHP)YM(nD;r-AL?1&m-+_z$n|0N2weUT_kps%ctDRmhjCTmcb#n z5tbYAltw2k>Q6gE9C}i0aD#glk+j>Gk~nYWvmNmhHb2^S2RYB6=CiFdku0v0To#>rZ)in;8&6I`uC_Td_AaNU9OvL zY_8HfD%?BmhYCJo&&q+0dE|Afjgm5)WhbKhj4v`vhD4Q)0l))*J5{TT7@!F%T*q+> zWMvK*73v5*cnS$^#eSCP+w`@cAhU#MlEey$dk)B zWRRW-2j(J0`v?Y}GHn9QrXr_d*0!cHy)cSgDJ@HDCTEx=HX&R%P zZ_8(BCyZylYYiqUNAD^VrpL5$$w3Gp$@aa>Hj5 zq+kGCU~0~#)d|P(MKeZK;y4kkIv_A54Wx<9Lpd(-J2e)PxGdQ$UO9>jN9x4{{Y`O zqzv2-T2Pz1;~tdFxIdpxK9n)0N?#Z~YB0-_j+y3=;~ftMn}O^90N1E2w4)<&_GO3Vc0W~?OgBW{Vdo}`XHItG&JOj6M}k)5Q^0Datc&#faWXK+&* zk(KX~DUzQ!hdeTmnEH|YjWBW!TREV%Lp!{#(n!N`Ad&_Kew9&>4B#F=O1@+6I`P4% z#CYlJ`p^i@WCO3$-kM`4k}CL4bKLi!$J4+609uuY%u(7g$Kyx`IL0dHmxI9kDS>wY z0Q{*~YDIDV+IG+zuS5A%r5C9^IpUNKahgN9UGth~89em;K9z6F=j-W6S82ffDGum^ z7{+<07014MRJh2=>-y5Nu0ZU1{b`np?5DLvcsc9%RjvoQH69Oh^zBG!u2(1K?0=m` z(d1+vnX92rKdmv49+~$1DqmvLC>6(H(wbK|^sNSulhUG8$=!~*cAA~$pEFWoIF6cx;l0?Vj%8ekTKV% zHS|2P?0oyJO?{>Jm;iU60bBn7@QZkuDPyHw;BZfrdXC=b+N_TR__?3T{>Qvm{^Q0` zyMGH{_ovA&#C>9x{Oj*WF@eza6zmSY>$r#Ew~eLKn^QVlM*>OY;z9Vg_Gb;JzK9_(YIf5Z z8c@RK33*7s&v*_}S$#MWkF7UZi6kao0G- zOCQ6p97{2X==VU5T={w0Jx?R2dcH|^F?H#^dDq@?#ZWOB3^Vta`Ha-@GuyhADnb4h zQ?VVvzVe!G97>@1&oBaW$H1JjAxpHFNMB07Y4@nOp-9M zv#f#sK-oK3lg1ku;{@@F5@VG}+U@9hjJ{sxF{n^j;0D|je|J9B83$>69jnPBkUpoi zdraR9JY#gLE&iU8G*Jj5c$7eov;e!DV=gnFnR3|VnukyLZ{uAmb3MMFEV3-I7+k8! z6TD6w2ZweUPC78h<3}SW+repb$nI?}tflfVVUpfms{18Ujj_g6uyAm|9lV48K$t>7Zl~6I_G%Wjefye;-gM-qt;_w&5 zjXj*%Xw!K|Bg&h~mLt<3AthLzIUQ-JJ8VnDM)tb<&nOF=9C4gxrde7)^;lLP#0Sm! z*RJXR01mumetyfYXji5<)t(Uyu|g4@xd1W14ch~gjxkB8{3qAT81$VM>K0xBxw?qw z9e0cXr_ck*2ek?^2U;CZCNsQ<5>J>Y!ux-XO>G1-u?*=J&DA> z5TcSOj+V|Djsmn`sZLlpW*d0*>MKkB6<3X}E`!Ns0@~b>y&hO2bY8gua;SX>_T#la zRzs;BmWL$vnpD0Wl-Yfr?(HP`rQEUH#{vwJP_`InjDQX~t}Xo8NMu43j3)td2Y>#( zdzIJ0-D+5#>rc|}t@ROfjcpCY_VUD#@q+RKAI%3HP${gl@PFbw?Hn@M!ji~YNEZ=? zW631)c*rAx$>NonS4!4Adj&B32G37VdTCBk^?Q@26$J0{WN1~LX)k577@ z5|N?v3EJOzagax2_0LaA_bo@@-;1t~+GEh-w`YyzcrC6{HH#zG_9iF%=61oZruu6#A6D=XDH8w>%V9t?v9&k z^xBr5w$a051*|fXQSP8ujO;$lODQ9-JuAPT;8%~LSe@R-6DfcA`Pu+dK+aSHlfcL0 zRO9$3@iO7a(NQ>S?8~2mk~m?s%E$zV_Y(j*}?gH=kE2$ z0;?{Wa?OVc5W^7Cw$(d&f!{uZ73r}25crZ%Tt{IFuI-A#>M%*qrgA{}BpO!?}^t`itJ z^v@O1!SI6e($pvRCYyV53V!{sU&tx6f*Asa3>XFkeeQ>fm#)TO&m82oaC|E9 zM3S;y={ig9!?%|*#t;HBsu6xteK5lva%#=*!VPxv2U#@zJX~DK{=4l;tp&OaC{Uwn zoPoHIPC8>W(y^OPTIzWuzwn7$o2V^qr1Ip4<#{d(kod?Es~`ty>yiϧGxWt8^v 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�e77z;alZ($5Jx2g1}Zu&xFVRlp3cea?O zTmTBVb@$9wm*~0U=~ZOi@=IM%S@@ggDf-YZ^Rt0t{NWZIG{aYXD=zumk)L|MwQ0Zk zaC$pKrgtA?_ND%yy7)^7TKofSFk(va)?4rZ?1wC2MrPrk;MRRX_STTx4E3QPC>#;* zf*KF*(U&KN%wO|4KP%(bDKOhQ7gKiJc+eNS(ASYE=PdE2FXilyH>)d0bcIJfA_|MYn$ z94euSXSxRQjSK$+czVn&S&kG-RYP>VaXhMTE+y;isR^+QQR9-vhDJ)wi%ktOj(?t; z{cKFQj0|{w3Z4|e+^ss_*py!NfPHI<#IlP1TYleLzgp5rKsq)`Q;#!Qdb&b0zIB+a z8;gOpEE*OZQOypKt#vofRP*>b9edel(MbLa?PRUO$b$f(Pl?tN*H?lE261hVNp%>O zT++2~X$!Vp&#MwV3FYM97v$&8cjvT9ncd-+CG<1~b1Q=+E>btc=C%5Lp31pbA@V$b z>j1~->l~3w-5Tg-srP9y+x$KR+`w3SVNq2A*9hNl?D6w6x9$^$R*sIDMkjG)2?Yy3 zfna94*Z(O=n~G3~No{;M7_;Z&dep@!{mK|iA%Qk>A0Q}Ee9b9>q}($K6ck_kCHx7F`brgGzYcxcEqmgwp>QMXB~31yUG#5F_OUchwm!C zJBFHt&{AnKP}K&Ep7YWG8Gdt!TaEKzfLVrpGho@7EO_4Puf>Ou{Dr# z8!YHn(VP2ShBDJW@YDD}ZU7GuWGleuSE~>&aby-|$ShK;t510VO+|*emJRZl3{YJy z+Am9^D;B-XH@92mo{xzxpTv}m968Pkz~Z7w12#dA-WrPuix20jl6Nxy-sOKh^FpUb z(WbY)8)L9Xv@^?UnOzAG#`25=_#*zze`kjbwp9Pw3iBln?mTg*gAS_0+aXgw>|_hBJ|1C3kUOr2N;=&{_V88yFQZVBytu%(!&|^J|Q=H+=cb`;n^qN88~cN2ggmy zxP~C^r8?UfBWM}nym(sjf$m|2;KCR;t2Nd)v2YA_-=1^Gm<|G?%6zVZR2NT&pObEQ zx4q2sJBC(#IV~R`i$K+1Bhs_DaADg(x}~PoPoJ&_$-M@P_Ym7eHos(weYLjvyjEd5 z?`4bU0S>U|G-=`Q-SXt2c=5}0O(9F%+)w1YdN8x2Lw{$-)>j6Pw|U9&Rx5$R^P%g% zVy=k#yJI0clREm_L(>|r9)bG6rHwMT=X&Dhc4!bbU5&K=bIVlQ5xa6sm515#t(GU z?*+TcfKY7-D7AxkJM11Q7^8f^P@OxB+9UNrlQwx*2hmrV#ZV}}$V%E3J2l(2&=mkd zO75ooU2lqEHh5a6S4NB<_qO!3S=+S7{6WF1i}$UNyQNOtVKVO#sH9(!ryWM=Pp1vm zKsC0|E0n@37x|4C*DWRf0jeHmdYam5;Pth2H+Q3yi_XbticJxCSFPgif=q8QDA_2g zXNrTMtC>clXAhW-!|5%MvP`h@ODj>pPrdROp#A_QmQ1I<(NZMs9v0@)`s ztXyL(uGR#cOVKLim3rZnny*ZIwjd8t_PQ^fZ*a=!s$_UDX6*c?RmgD^Gl)Us<2Zl* zWh@gGK#Z_E5GvPD&wrNz8n?6j5!i|YqY18LWR+Dz51GWu?Cp;m|D@E5OH<632{DFgWgC_u?C)a>woIeBC!~r4wEq8)@M{ z7{L=*WV!Fd-f5V6Pui}N)#(2ITM)P}> z-4bO}(QsZCYg3s@$054;?#+?XH;yd%{)cH<_oYPCLMXI<02>R7N}lPmNxr~xzP2-{ znPKTexj%L9R~TZKHySai4o=@KHmut-u=B#}r@QqdlL0I&X8SW~Eiy&A4M455*HRJu?uzK80e|yDU-P6Ep8DrNv zTi0v@=;C?ta#Z6UqFh8eN2Cn^4UF;4r2N!$Zj5c!OKXPFBj$In>pMTIOQ3JcligH1>#_jcv6*G-3 zu|Hk{ne1f_2(h|R+Px*<$sgR|)*Z1iv)ZQ*I1!EZID9`9@9-u`7-(CqtW&8|G z1gV&a#Wlm4r#4}XGn$FQ!HqLXADezM=lM2S$7)q%^&X1JTjp2X57%p=V4;C2a?MIE z?ou_PIX7_avuTyb9<53)mH<9v7~w!omDLf(TclZvu6wcA0YYJxB<^N&&{J8pwg=EG z0Kb*ODXTo9SGHZ?WHWL5^Mm6L$2JzsmOCS>J78v~T|>CX6f_*vEct+BDEt;IwY~~( z4q6G__FnktGG3h?3fG$3`jol$3IhV;#C=?`{`NO=MVd3lrP*oab!U(@TozQK z%*yJP7@-+Fb?*c5?iq|Q@CYzK1wFhHNSy}}{W6~ZId7fZYqHyCX&TnES$=-zy;A5_ zqQ>Rrc!|o&=bA#nFL+69G9BEA?I?pR@h_n+lqUM^aDC2$deQ96ECjgw{}JPh83J8i znk0Xt4v&=)PLV-@kM?~mufMXR-)Ah>$3f4kEO`ICdK2thP49b6bC8d|BrlnK#>m0) zS&(i{2SWeQdgU-*T##Hd!!T9by0RtZ1*b4~qMFGQmIqWnaZ_0lD-zQ8L!^i8o2A74 zNNo-WL#H*SNOODeqS?-49cGzqse#_^NdtJW=yF%TEmi zo!Wo}I~+AcJE{Q?^6G~F85H){HW+C%`$`3-T^oA*lpJgDmj|D<=FEL6?S@TlUCuV+ z4NR}+1*bpLr^`L2T*TYIE3w<(n6CWrOM;I2cCOFu~qry0{s8 z;nG@1|DZ8+CKl=#KXs1@<4)wq4bThBpH9s^tx}e{AH1f~GipH4^&a4w6hAWv>MKee z=`hG&+WJ#{b{1k~892PQQ94F32jaMo)D3L2jyuF|W%`KWr)MmUA^m~d>!;&N6y7e6 zXyw}G0}K60L&Uq)#>RY?)wbFJLFT`7DX*(EX8se?%v@V$Sh=q6-fYn=b#D#t(ky89 zQa5Z9f$sCf6;@ZLl5F3e`nDBhh#1~>C^__ojYg9)oD+@K=Y|bFi*5x4@!8Rh5%PKE z0f76(F8_3IO4R**sCibf&HV?eMj5Ykys9iN<*5{H=3^spYY9i65#rj6j z1^)e1Zfvg8a>?!Hbm~(D0+|;+I+v1jNAvPly2{d53Lf-Elc>X;JFAJv__~#3%tQ)Y&zaj8LO`Lt^+uh-CK^FJP48~qag;lablNrq^7Lxa3&kBSw_(>iTQ ze}(_(-|&V>cE;W+A!M<;1ha+n@0qWZw$#dbbGjxy2|hH5gj_RYu!doeM?yer+m0D= z^*VrU%0IwmU?F8cy@%6^ow}( zjT##KFig$($_Ji+l&xf$vTkP1PBs}AljQk{yQgoSwE=;=+`~QbO7nECBEZxI!v}G^PIFc9;Fqk`2MbHjpiX8k)s5JbHA)4Kj9LAyi+d=}XZ$O+|5X0uv#i9mt%9MxSnDRDC+6 z2D$ib93^UM2@25ak?D|m*0;FqbVxzLk1xptCjs65T;`0RLayQ4u|NgxFnDFXYVE`3 zwTsWf02;3QC-NoE869h)qV8SFV78Ow56KvYhftFA<1tH=tawzod0vv9gLOj3J8}>% zaPsxl15(}g_zH1@Rlw|kz2A#v>71SBZev{7Y>GOHx2rK4Gy_{R=Sw|rKywy5DVTP* zc}YV>EV(5nkAfJEO^Dp#n;!mZQW5I-t5VS zj4M=q*>3Htv0{ky$g}W$him7u>a&jvW+m<~YY;QUZ*BjFSadH^22sZrc3=Bc9F3elc&Qeu`q~8)V5n{J{Eyqvy;2GJoG!6+nS!<{cs|2p!TNlF?Hyh4GzA}S zHeOT-Ll<6SyjH(fJj>30-uTS@(YKPjH!jLfXk{bQYtUTaoWqg_MOh^2jqz1p`Nk^C zb$!J#VK7#IXl*mHGq&A(j0b#lqpxO}=8bhq&%}pqAAJGxV*MNZ`wzgn^IxCHjV+fj z7FK(QRc`umUReccvt0|GYOrdz@ORu zC%SxyGL&-7LP!T3(StE^$D*txRt?c zTglo@2p{HdzpnM^yasdC6C<4pnCT68p^fc@pHXaO3>NCos(}6|CilwhPIv@p2s>c@ zbnJy!B9RG-dC*w}!aqQA$(0euTm^Ch=wJ>8v%=VVf5zM)+%zgE=xUye8Hi}e19AT0_CdMY}-(dsr~#&RQ1~cYYY>a;`KYIMN}?_t5F(dxaZ(>9-G%AOn$m39z~e&DA#&rkJb>U>FwZc>m$CeN~+TbJ?p{x^eFU*-G$TYq5NIj^*|m4 zx_`O@dEDsi+J>H4T{G+YtZmKh)T*K<)0LS0@M&AssE6{{ov*;1lHa&_skG*@AI)q6aK@nEh75v z>GKbj+D#@D+`xyQyW*9`fwU&^+%}^ ze*uFx&#slM4T)(mr&4$K=`VGU_=wD+0lpX%i9XTh%_FZYE~YY%6TRt%dtsI10sK?I ztvH*Sh?Yo+O>@TD&xfhyFT1mHkC$XMz_QJvf5shC+FMxW)c~_@QEh|*sbiF&ODM7ajmh8*2w-2Pv_rJR7}m1i`1oXBOaNTs8czc$=LP`Tnpl(+kBw#9mi*L1|c8I|b0x!QIrIuEs0#+wxS-t*1HWu7P5TDySx zC}BYG_Uc8O=HD}T&Yj;}TXi&78}iyzNnjZp^O}d74j!vHlbw7#8C7TDTJOpci10SN zV%-iEf`+mX+yyK69R))WEMnkvvYB^~Sy4B(XcpJKyoH-TZ_YRVk#S7|#oG}Bj&E+j z=Ehx1ltT75ea5QLxh zU{93Vdn-Ckhj3(;(q1-6f{MxmW}<}gwi;)p>E#)QSIqcW6D5#W z%M}KHkpl!BzlRGj)P0cvMMFSwbC*>P9=!fZ9&m6I49PSdLS_2s9>Iwf^DQ2ekW_20B;;rM8 zMB?RvP|90s(a~dL$D+o02A@Au2rjArHj|e=^=(St>{NUYpV&wQC3eBA)Cxdb4 zGwfu`r(Od{8FA?46(1E8GTweOEPQF;7KAWd+(GD1$K0hwJ7_*R&lg~JJ!^_IQM1U& z+~7~J`&;NAv%T(WQSb^Zq;VE5ZieGUtq|~?uy5C2;pO*k70!ST_Sg)|w1$Q~4PsZX$;DCeiW_1R$rF`x<>a))mmFL)% z%TbjAzSsFWTw@A}`9Wc#Q4gl#eRh||Wt%*KRPxS`he;})2F}*}8Mszkw--IIhOxq0 zOQVzVkK;C2@WzUYl7h!pZ1(8Gv`pI~%fMz1k{n}Ls{RFe@T(0A>Q$qW9NB^2WI);b zuHJP`*SRU`>Lx9A@#g)3Y|=c)^OPvq!2v3U@>uR!i99cclx}yTG)-L zdk1N=+;YI*-i#tHsi$&CT?Y$>>3J+%+8fcA1YI-6?D9Y?Z_TBl7uQ=zbhO+10;=1R zRbR%7YOznYBZh2~J0rJj8O_W&UUR^tJ5UbY>n{+O&19@C;jJ@!e2Ee~iJ24j8~d5A z_i9<*C(R2SMBS4G-hgScK%%A#Pt#jUogUbl84pPhrDR__29$2nUlZQXD);Us&Ni0@ z%(zg)6$rCXH#1iWt9K8Iq0(bdK3;4nLh+Js=H@IuRRS=(Ev(b7k&h&$!XOCX8n0x) zG)zT!ZW6wMb;{cPCbG#H7!Z|Z*bI5p9uc=ixvq1X&cKHq1&^R`RxuUT{>f$_`74CA z;W7Ybn$qYBy{91j_XG5l9p%l?%+;<05NUE(#jD@kE?vT4XmQHp&RftUb?9r+R;Y&E zI#|Ad504dCEsPoXQ;jtqu6t6JW9{4mX81R{Vr}3u1nEXG67>?Hl_zX4c$4iNfC>o$ z>HnWrY|ZXRlh+BDpASh7oHFcvJ8%{ps#Ra=W}IylcDKq`dCO8Xu4nGiO|&GM%9uU> zzE|T}Fk-)8uJ}WT$S&&&E!$TRDTx6DzSmMo`pJ|p1$>f5VD$JDh}>;kfplJRm>&JJ zhA`(RGP*#;L`ajyT^KFs%&fGpRt0q%Pc zDdNCM2v2(``)DG z*20!UypUNR-k<0VUmvf4{gx=dek-zr=|G4{jh)3Yw{04yCCw3WbB^_SfV=&el2c7H zQ$XHTU0%CNaTQu3QMZO7L}9cFh*&tbdY%K`vwDr-BNJluZTjFJ{cV(ZO8rm)v_Nzu zXEa;K=-qiaPdi?8kDVQNv0AFU47B$2dvCtWhl7yIfCj=@4>16Ej5@NhJ>Vf1vfDWf zN{?X?X=osZ)$$|tIsfHbMN64HX>VT8({jWCo_>5KW~1`&mL&$h8*f;q(ifL9RZ#xc zYW89mO$-peEN+mstZu8u-J2k0rj;pc!h$3|vY(mikyaj2y91omgZrZlyXhLnqkO&_ zQ0v3IT%a2MY%v2uA0A@UZO%cxJbmIarI-#v+Lz3#@IeXt2K!I5FUYs1>jtwB6WJp{ zPZgj+d^^qZc6OTWo?g7NF?khIh8$&Yh_*T;dR-$f5y+-%@q!I1;sB{Tfn@QRY~Yx2 zZ1%S`ii7}kmEu!m(Fw7BLz}kGM@Hr$>c5e;KZy_ac?oKi0MjRR2vKRZno_OxpTHMA zZW?@x0h%YdYX|oSnCe>3`~}YF2WcpAVU#ZymoP~Bo4@OuWk-E4s!h?f7vkjn#zh2! zIvWsgeb=iVX1!}sYnzg${!Pj4QHLE-w39DBC-Hy7CJ@6pvK^ZvlDC6A*Jm(~}HAFLTZdv(&TfFAp^2ZMOJz@maGjFHx#e;$+&PX#Wryp;t zJGIR_`YS?;U&x*h9yz=|yI$$BrO}OGO$F((uMn)3pNAA)^yZBXCLph6#W={rYy$p! zcC&!}dF$nnQCKuV=U&GiE^6K@$eb%AL-u2yq<11nj|k^odFgfnp&dXOkr5Fp3C%Og z{6z*&!m|(fwrleGc6)G|QLk?~P|sCOSosPm#9Ia6d@}k{f;A8@hJeKHGSs}IR69@z zJFT?PAorMC)d_8bgTJfs{uggGT0`y;DclBcjdp@BqSI!4N+Pw}0d+ze1^T}ks#=wkr z5wb7-VO9fT z^6eFo*5)taqD9wp)ge7sNBk3#8Bcy@*x^btT`DzwsX@#shJszT;%n>@iK3z*)B8~^ zl9FI7KP+HZnx7##2lYPLh*HhqIUWqVW8dV?J6~uepANq#o`CPa{9*sse!+WhGw8+0 zBFk}aD5W5LW83~AqHK`a57?>BFy7!i)BEw1dsaE`oE%2Ak;xjS{c2&qb^XWwyDg73{i-PE z^t>tm2G$v}V zl|1Ox4yi}X8ngvrIdqj%jaLfOpP{q6zxON~AyD(G9>-@UA!)aEOD!4<2cK2gq<*uQ zKG^0lL2;`(x!50ZxBbV-_W>GHT{&!cc z$YU%e;|#?n>7E-cy-mJ5S7YxX@dP0}e!Bt6(52k6<4$m*nD?Psytn82Q`X;PYh4asT>B@Ymn^zZq3#wdxFVg1Yw4vutegjizpz=P7 z!gI4cs6^&t?FP~w&rLSJzbfwm@(sIVR7*Fzb@VFM$eEuO%o}muzE<6m`1P*$}!N;jp*u>v2dym3D|68)X^6GYTc%6d#QBLqXg~ ze>IGGXnIk51<7aCg@kp5xu*4La50mrrW20?dj8He6{E=AVV0E=5$ z0xI89%Tb#t)vA)c?G;e5dmTKs{`U+}YA=9TQGJ4A6`c0^gwbg6$;<(d37U7~!KR(J zos^iPp=;vTS0wLPHGh9h$LvKVXyD}xu2AQ@0(a*>wZ>YQP1x z@A9oL3yra+>mU%&2Y0#7X7c5cHF=dNi|>y3i|y%8KFiUhoTSGxgs?c=P4RMtb?oTQ zf7HL9(;CMP1N@N%NkB>rlqUqGcXV6$!LTsl(x8^hLFwK$G-XhEpJw1jrT((X(llJd zh_xZJnKP(89@ItW2|$O~KO#IJd8Y3}lRF7P)84>I=$;a{J|n`F#L7y`Ez-|X$cR#c zbo1W1M6dz?z4iG4oK4EED|m>f-?BXd@XVyQ zj4?PLRb3J2gVF&Q1y9#m;!e1qvXNGxn&p85$50e2hj z-BZ;EseP&|GlCRdke7?&Rm*b<%{P!@G2A>X_B9OCy zb>!gdE@wTPehuE&XWLpYoccseH{E`f!J9~|`+~ujn*U7i*zOgpX`heFK_w16NR$I8u}omL#?Iutx5dPzYu z_QLNfcgE7JB0czH*)2!2P<_W+SSWoCgtNNq)7$#Sx=TGA-0kz@r+c4%5t>aaESGt@ zY%Q|Zd5F$CsZ2{FUNa#~8-B+w6jYdh7cM)0y2-e=GL~!RZJH5Q1V459T!;PZYaA z9f6W~vv|>!P{c%1YKgc0#_1{}QJ@Db?d;w`XX$LvriBx9_Lao<;q{8Io!ZD$iJdmG zwVpcXic@U&j4jcl?)1m0WxK>#h(h6vZS4m?i3THsV)mHq(Q)nXFRf1*yiMZJ*PYZ` zDdrF4(t5SxEoM<8+w3cz{a}ir)_Qq0zT|CAO)YJembt+>-KiJ;5SlYp%}v)09G9On zdOY|s#o0ryo3MTD%o{hhG!01lF{x6n_!U%^z=h^)uo}Ryv!`4wSF|Lu$h!z;xIF~) zq3-{tHqI{We$*5B=t5x)K%=~vmVbb2$}T~_ z16mVJ14ncF(rJnQ5fb~am2#rq;|0X0#5fbN18!0Zg3fvH0{}GdoY}Vb(l+jVA>AD$ zWW0ICqn~Q|Q-KVB$evrWx?Het?|COzKaL6IRntN%)BPg};t?}1wjM>?8L@}XQZ5Pk zeMoGFFmY>2($6#EauLYgw%OlBr~f}25gl#t@Pe|w?Y7K-(9g)V=Hx{4zkl`El}y@JtXRo*l%2` z_44Vbrod_bQu75$-U*r{Z$R}Jh6!)mjfNlK|CHm(LA=5Vp6+W0f7PYQmw$;JNToW_ z$fV&0&fH*ZQLLy`^W3n^-XeuRt#yEyMx+)zpCjs}Cy=43bSbte|Z)4L9adD;AGG_)Z<3Iz&46_*}k95s@C9 zwbssfiRU~68OA-Sw>jru^EUXeskkn2Ux2NRb$ttO;nb>g+qzrx0$X88oG&zoT;TGb zIa*=e!O>Y$&gZ#5l^!K!K#Us4tH^3LZ>s0seF=H3!{OZ6nMc@(0oqXAQsP z9iztG%$+evCGYI1j54r#xmZSI49)H{Qq)-AJC1DACwfHbes)&IeK;Rr^{@SXXjLjh zl`F&%laR9toT$y~yc;~vcbb0fvM(ik<7ckMXFZw7#HnPayPmezf<@0U&+b6FuzO(P zt=H4BkIj2{i($-@5`6r!xbxfpT6UuYWe(Cm}(mkxevDIqx zmmOHlqVU|-P}yB#R2p@`a;*d;YAQS%x?Y)&M@_fSV_{WiXE#!HykAYBw>||}U$x*L zJ=co{@04)kB`^zk$MX=QS{7(vFTyd|bgn+zp#1cGjmYPbZ+I+r-nAZ?qsp|{r6!os z!eVrmT==-3;oViz`|Df;1Q6e~4mweSPJ&@^J@28NfAD=_NTWEp^2%jByU!=|9+*hf zxkd##ChNt@1?UFvhm}jxm>Q6Jk?Bu;$1m}mQ~+B|%Wzitmq(m1JV(z{FwS>xaee#H z(wExjVt3@V#Jk|PPCMlO1o}%@S{jO~i{nK5YBS%QLjSL#bMa?-|Ks>(V@NJVO=iQ$ zrIOpxhB5l(mit{KOu3vATan5Anr7x2wcPJ=D}{q1W$sht5~4Qd66K!j`F+nHuYvkTy?$wi-R}v#a0*rnrm_6b8$7no!C4_}Q zJsh!-w#inqLS+L9upv;v%zM(}&R9lZyDt5tdHR5%LF&P@8t%CEqfP^u`{$E9_Uaih zy5a)gs*!0%r{d$_>{y}OhpY53U(J5vXMvNcR4rSx+Xr{9xBuqT`yAPr%JpdK4z2vg z56m*Pb9Wf_}Bn+|sjG^zt#hHUdI?#txC z^hmK{C^6$haq@Re9&2R@v}ZyBFj&}IBQm*tqvOJq5VAWXo(C@hX_jQX^Q(%UG#bn; zDqz(!H!1|I4g0OJ80dYsuzkRj+`wZ0r~Sq?o02C=hQ@lKs2hu;^q1GvML+~NXC9il zgZ)YN3eVJgQdeQGM2bqWw6HXFk5%`-b09#R=*Ai9A1dZdB&$Vsi`EHRj4r@yVdAV> zf5l71JpWVhAg!+~W+9MTDevjqKNNmf&Z_ni(gJ6ov_JrY*?1gM9P(nCkG(b{-v+6- zE^Sm0o2Z|7{~LeQP#F3^{B#f`Y)oo}&8i(6E%_SNs4@j-v%`jG&K;!qkyeT2oeKGJ z&~@+<>~`=+=yJ2$4Y`TD5W!|p{P}!N`C_i$>Dyw{XN3%kXhshMB9s~kl(YcnNQuNQ zUP(2WLD&`9L@~iHb9Djwhhd6o!&7Ddz)O5~sBK1OsLNAl!a7`h>wbP}CHNq!%F(Gn z?Z0~_)ClqTdFv*o19KEPjGUg()IQC6kq`uPH|c3dSTC7B9XGz4>5(=Wpqc^BEb8SJ zf1lU?FNkgz)Oc%D+H3N}=Q%g^Hc|#5iy`qcA$1Cw>1#6`WAqB%(G9o4Ri3@F@db2? zf%eh$4P%swQiX~7(To`roth2ILTqiL zs`)ngWVfz~`$9>+L#4NUy*T4ggmGm&oOzt)U&sakb*e$=589Y6%^KJ8Rpuc&F) zd1#+FquxWbu;9fo0v?DJ$i4rtbkh(_9V(CAT5b*68-AueVi0@0s4$XuIa-UenSW*> zNn!hEF?=#T@+U@qi0b=T?gPeW_Il2_SD=)d)yfdoYaduJJ;sGG*h7VA_(Wgbu}D7fzo0LimpjYLhH+J!@_^bBUo6I&_iT6Ho)t95aZ+Eg zdj|wLZv8;06R8%54?ag1VM@nvb0wjnasM%SBlf znomQ#liNbSIQ`IUrXtSHa}(^RuI{Dx3}QG*&l^U%e!RyF!wAH|{*Z-;yziG4FMSd* zQJMN^_ex=^To$Dw4>}Q`=J#OQYkXKSIn!VzlPYEypz9i~wZ)z<*jLk$wgYKZ+{ic# z859~V&RHQqpmPDI#5f+fZ8m3w{VD%kbr7i1|CoMKqld zc(&`CXzcd@Bha>dW1FK%zI1^DcgE4Cw7j^akekv>I{KVH&q6U@gNo1FTTpLYqbcJ0I48`&T$HL%1Z+&T`Y^dZflB8T^Kt`QV*gs`dp2Na~x zEp-!r>vrfiz@5xxU1-vcMdX$NPr{W?CaPzA4(eNcY`aD=J$r!f1YsN!;@&m;yu*c? zG*w@Em21_iUL+>&PP0c#1)xx^blk`AQ(HGEbYuimL$o#wuOX3frTJKz7X2hZ!wn}o zC`!CSP?OYC{{-)7gy6yGpMn-(bkrYYg6MZ11_3_TE|-8t=@0GODBh?WKf2E32Nl$} z83xr$@-63T-AbIWJ6MWk{X+7UR%+agex+rS3Z(jWsTE0D)?TaMzOR^o$G3NBk-ZNT zxy*ms3%o3_4*+2ThuHVTS5hpt_?iA!jRZV;b>(&~A^BaQ-k%$Czvza8)twW-eLhq&#|jHxVv8->_JqVKYIe^^C=2ee{q@NS0}CTu``Q1W_BGc$-B+0 z#(hG(y7bM{>&(`Y$NewuKPeGqF>r>+k!%zbb7B z!3nbTw0IzyP~yZdir|qw{!W)y96pOwgOSZ^VkjtEOnTezH0|hCq}HaMrC-{mhd<0} zM!VmC4`IQu?42q%Jnvgu6^IT;KKEd2Z@YvlrSGmqEsJ8_AXzMk%I5GFssH27sv(~U zZ|I6lfMt2|;AIiy+2AT)5u4s);DrYu+cWT~JJL^dyaFtnaUaj6q#FqR)$9sx0l3JD z`CMzu-n9Y=Dp@4OLaDbsCLar+s++~al$(~4K{eRzqMUo&=3D1t!OV|q&^q)vpZVco#jsWGVqLLOY0YoSLrb6)l zKn$VP_tCwuzTDXTp|bwu%n^4kKDThUL%+_7ua&%3oLsdTQ$hz~PG@AdXwIY?MaAe{ z2GEr-UV;jJ*X+TZ>Jnx^;=N?r!N3@0OH$46t3eXh!esFmP(wN$3?fiJdqB&(H!_sOvM}jPIt9!R%(*+U&xPQE!VqF z$(0<-bamfP9n|AbQ(L0S;)R1Q72sb zd4II$N7Ho5FVqL2ny|%B9x9NQUp7rR)tRzdNk5iMnwk?gmR}_T(iKuN{?Wz%H}7J~ zwTJJw{pW6_MsAqlHO?p zL;`-YFn%p%Lsg&>2Dg`J+pVs)3Tt^U+q%nN=^CbR05qjo@z~pqL9+X-*S+N{oteqg z%?22$JllgMF@6d8IY8*B^xYl}gEdKZ{4!tv0r~qrAvMzXtl;@aZyuJ^83w44_H3TF zv=EwcO4g#6=lw~`zf9)h5rTArq)*eXGx9UD0hIyFh3@_fx-O+O!LJrdi>Nl4J7sx3 zEk9+WyYz*=twhWH#TdME%F)HP2BaEpvAP)y3BvBTrf-%fKjYKsL@VPZ$)QopHZNqk zAd2uV6OO14a>wJCmjErW9sbeK>9lq0In@PY@$CwormuSE%atXh*Jws%IMrp7In}`_ zgUHQC>M407g@ey^?;!TAtY&{6qjPc_R2*Rn_}w?h zJ0apdqRO(K>P7e>S(r`6o zZp34z1&fue?}BY;Fp~RDS$BwU&R0L|NU+E$dB5KI=Usg2!zV)(b8l8yX*^S2>B}FD z;|+?rJ0S0XW8jzr9~zd4JoIg)2)m%uK&-XG?>(NinV(ESBs!2L<(GMDbA8PCzo5%s z(=QJ4!nX%bqhw@wmx5|BtodJ-VVp?AK#TKE?A*|xLq&Fa51`=r6r_FcT%|FC<8CS5 zJ$od2q|auFDa<5KFkeHXFM$CCZVjT?NuItrI~<+cO2h5h9?gDJ2~S8jIB^MyWv`7s zrhd33W9Y2E3IqPOg2V6W0gwH)JQ^dEUdJEr*xWA7yv+(g&awb~nGJW6)k-F0>SX#K zo02*R|7lp>kMouzUs9go0&psN&$Ta5)mN4;(-dTyAH6?_^q$d4DN)7+l_LU#OzYzr z-G(NB5sK);=o%Q1Md;J)+LrjffW59QVhUoj^xTwg*=F{okt0FH?u_yK+LjtMj*4LG z9a6*gX0b?9hd1=zew$yr4S1ZCy8M(k{STF>+f?{tPR6QpUP^0EP>5p*0!Q=0>Nx=HKmj4>sHX<99%+H5_3s@0eZ<8D4JF`+C~9f+M;E_vo%>bNmIi@~48N4S z%%;dt@5yhmof%O*;9zCeBxLuqv<;8_E2j0pH7O2c>>!EPV}qb~4Y+v%YmvoKT}q&k z>A6(;efZvdtr#J7WdzWhF)wT^fV#A;vgyv?z~?3S?K1HUcW|z{O{;mXB{CEIMkg{r zjl92SJ7jJm@+{FYEieY4tpaEWv2Mv%GaA1Xfq|oYpt1Cm0^mwa$;ZB(9O&4uqP|mD zUVdt+s$GFbc%9*Ht#qcXFdGBSg?kR%-&g{izrv8)j=Q%#OO`Z7^?ggM;sU!fps0Bz z!zBH9(2)*Hbmpw#_cybGoq2#GDh|4vIBI~J@3J)8VEh@nhMxiwYiOV@y~_?dSqwdu zgNjl`A(%wO8RfXX3yF}csc}H9-!?20-S0w7c|vgyu5xpY5f_K-g$^62c&Z46Yb7b` zI@l8dw-*3u12&~%V;(l#J-{+R=~HrZZ)OKa<1>ZIOG%}|h1^D5pPU|X_icSEfzbn| z6S1z^$Jq!f0Os?*6zRd*rf`f2*!}8FboFTzTIpxgg%2??z=YRVN?|uqesb(zy z`~FCeWh3etG3e9OEUsUK{T{D{BKsys-pGy_K}IOO@syX20!(Q4hIN`JwM}kZj$#5M z)I3#XD8&CT0gc9C0QC+_O5hc;l>iiQ4qV#afw(YL3lU906P>j`K$r36+1-E~?GVhW zZhY(&kn+y$+_EwSwd=vF~v)O*$&g?XV{Np5cMolZuRZDMz?(k7OO+7WS1$7uFZ9S0R$X+?MY zQf>pkOSI#S*Q&>9d8T?^FE#<3u@3x*s3r{K{=Xn>Y36+!>#Ib)8^C>03na<0jTf?Tj}M+>6^@D{lvV?NCC3Ql-+>nv$tMT zxQObr6Ii~yKD`8uRrwQj&gfZM-}t%^YkbIF&@Q)4b@^LqXS8~&U_^oxYSHqBilFt_ znkayK^NNWQg5{A7(aI&H#^vrkJGP!VeT$P{g7#gEG_q3vujy~g-_eBEXUFTLE`Lrr zKg+p00K|1IRn$wvDVj#Mz&cx@S$}=1e3h4_JH0rSc`S4LRrE7ryEjPyvRRrquOl4l z9?uv}5I zE;Xg>yVcQF2Gvr0KNeM9Ms&S1^w>i=m;eoiANsC{07{8=IP;H<;iJ|>v)DB7lnEj{ zy2Pg$rECnuIVLH~Nfg#S`mviTsu{v~x2z9-mY0!>M}=-xd=t;Oc{w~}dC_`TU?s;2 zaSzjTpg84P?dw5}de>@q2rBRYpCVPxig(F^^k=K$>!mrG3^4O}UbG^TfHdC?r-w+_N!W(j3wej!mK@waa6V8lhEFG)O64m;+pXO6<@4l?f z!?q8oXZh$2jaAbm1u<>sA_1@cmNy&#oM0duMorvsA5K#IrGxUy2mKc1a;WXjh9G%J z;O1uK3SzENxG0jx(0EIBr|?Ih-oIaVdCpnC^2?HIzJx&K|CR2ZU1%H>IYw=2cw@l1#4|~h%@s6IlW)E4##l!O{8TbuqZyRpWy0>ynP-73&H`A zOO5k0#AXkiv$tn!%E$kzR({?}Q19@eZKiGC#v4#4V12Ps5?D?Z?uu2`XYvazCmA)G zJQ09!qob(DO$)LQidoqCj7wH5V3ad-^xyebY3YA=CgF0S?g(mL^3_++yAL?+WWcuKvP>i`lK(m?{)=DXe! zdw0`rH4_Xczj*vd+&R8Zr0Kp_jH$?td6 zzbLkKwd+LEWPVSnm-M=!p%Dzbh}TF6F$(Tm9?Ik3Q;-MS9G={q|H&o1(@2Uv@j=*$ z6!Y;MwX@spPz$_S9?2aEiWw7AkaPUyML=%)Pp@ymQcMYTqX}5(ESbFjG)TSq0hCqF zM2?iadCT-a8gb8@vV?3DpSlhW=v%LK+l*3enM3QK`~tq-$TK@M0n8$v$lhBSn-LZ3 z8;O;|`WOCf#cd1HU9;PAX37kBj^72HzJI0DwOtsC*w-`YnPE(YNpJ~ zCU-5$q2grFT1u^ktDnNHFPnYT|D24LZFucsXw5&vaFqt|!%@u9D$j99Tn8|@1#B%& z{m;#6rX`vz_+076#WX(l7BIMN?qPE9L7t=zZGWvYYB;;fIb#8NwGp-x&H2fAaQELw)`89Znn;ROk<=L z2e^<-k&r-jFH(2+QNvrjHGQAc^cMz_zxqjq?~}UE$>Cy(Ru;TJ=#%y);*&F@j}sJ+-S)JiujP@= znlR^D@_^DnE1Yp5gV3C)faf#bV(&(KSoPt2)HY1KAOfz__RMZ|E zDDuhrL#e*f69OR0!*7QwdS}RK5Bzt(8Z}mHcuNvtq|p?0#3k^%5=~wnO%6=Yt-(Xc z%`$(xwAq0z7>c@V(I?t@v3~O?gBQ%~oPnSVwJk22Z}0`g)Trl`=%hJu%DEy> zQw4P!y0ZT2mZwMX_LSyuoj}DwWcP;cr>D-lUj%%APMucSw6YXuR{9MWRC}?Wx=j zEL!anKyeKJ=M|BkCZW}T4b|_u+!0SnZm&X4lY=(P?r0OI_651QrmpZ$z2Y**TBw0L zB-JpCt-axBnOuFS;M=BrD$F%>J*1HJI-Xv?`wUWtY$&;I(nlKB7*4=|BXNI#4bPPj ziR~88=Y}eS(U4N|=Xwbup6UA3!+ap7NjMa#Zc-Pw8;{>P%HSzXU}7NSK_$*c@&!DR zG15V^WFXGWng*I>jb=pwMl-63z{@zAfn5p>VwM;N2*TXrvqc;uwem)v(_Ej)et(r> z8gy7z=C;Mp`VDv_8?;Ln4b%6nJ*I%n?)5rWdYCyso-%pc08qvq_MXIF7AJwPSP#KSmp*@CV2iZWd1 zm>8;x#RI0FZ=TK_<~uWc4O(Mg2Rb*SDorylTyX-{5O%C(`!@zc0mulWzTK_LzZ)?O zEYAVXWl^Kj>KM)`R zP9{%95nP(vk`YQTycqptlpi!HKr6x&dpY~1oD@d~*_FIPVWnKQdbJ{seygYDK_fLC z&iI{2d@QAechP?i>lx7*>&o zp?~WQR=!x8K&L$b-u2{mdV1p;W0YzgYOrdwXnsQEOGxEe_9=ciWn(xg)D@gtlv1NG zclz~}_Y>TpWs`YAq~4kG^c-F#&HzWp<-d=91O*`0B+9gS=dH^RV@m@||E z24t%Oy8i?{4{yimW)L6QUAPMh*6X*?=(W%~RLTz#$K#B25H_!jTNV05=s}_i2@Uej z!pR?vIc-RyF7gnast z{-0rJJq{1en2db;`l_IdR5Z-S2wMR&pL{8#^T~tsvL{3EU>gu?dSv1|z2`T9H6jKp z@sF2nP_LkPpsi+ap=ZTyPFY1ZKzsUmO_l0lvN%oT_OL3L|827u#vZBEZ z@l6f!CN>8hlftoz68B0}VIcJS(MAcgdke6PF@BXz2~ zi)?HBL~cBz@B~-@&z77xP`L9V_N)tzsG4&0+Cd;0xiCoTGR7Y0l|cHBuh;X#Ed7Ge z+0Xj4gX^x({9I$Q^rL6urI1+Ye3g24v3j?~&lM@pB46jsC*kl=vh^)xpKawkjY3p> z7k&UgotHnjAet-F?r-;RXrJ?JZpv}$ucu-KF`1|`kR~&?H`~T wK5*N7Br0vxKl6z5wD8Fz8ID9E!(TAG^!awIy%fcZUhA*-{&@~RaJ-rLKlF$p8vp0FeFteSiZNzybH4{;wyt9D5Lu0r~*e?(Qx&fWcq@^6S?x z?AT~D8apKR2y7T@0W0VnE>9f+e2q-7xeH6+egAv3UQNUfkTO9O?QOGq zPR9rNM9=tmlWGuj;+42Bxn(~Xgb+r)&Ug#ANJn}-Rgq+&A)sb{_{h>Ttnv9n4tXf6 zI+=uhiW<3^LLzCTd#+M!aySH5oj_q+UQ8J$T_|`z&zphqjfkmFaKfvCCqfND?}crh zr8pw=i?VZUd>`w|WwFQb#ORf1mGVH@YE3u|nf&72L|$m#C1J9YF>gmf(Cnac@%?3sKKTlyc3mm6*NVb7>e1CLlF{;cR%kMgY5nO?_iY>6Q*`NMogmGZ%Ty~X&eO*!@ycG$!*nqK`Ii$i3j&Z!}0qe88_Ag zWwcd?8kg5c34PSHYOwY9DgRXrESrs+sthA$(RY&RFiep z_3ZM8%*w@bn5S!d)#*dsBS2^>kf50NAzQBPCr8P2kP@knMVdX$N|-Q)XfJUlp2)w5 z>K@~G`q%FUAA4=0WG#1(Kt%qf@*<+*y>2i4z%Y%xyzKARCt?h8 z$27g;b~fiLx~f!Y$^8sQ?%s)gefNdHq6i4WGk_|(J2<9P&plyjCCvXhPrE!wD~3lV zpW>Nxc!q}RzI~!Ed8$X%8Ji$cin_#;E_^QXMUMO@!)TJiY#j*(5>MqIOZr#IJWY&ur=3M{45#$#|n>@&-eJY-(D)cOz`!|BPZh`IB^1TdY z#d@5A(33k3;;biQpTpmps%dy7Q-|R$>w_%NQ57|U8p(5zjSUUCJDHq|71aTLEX|D6 zv_0*L4s)1t(`T=4X5oE%+xd;@tDkQ!E>Gt$ZK2mYJxvT#McJX#%V(-fn)C#RPTo!n zPO(2GIFnU+np#ZOtm+ED;!sG<%1IC0yQZzJtvIE1@nhRip0^OSk64?$*idlDKw8c4 zrxR$f)7kd?x6E{_fQ1dS;j#k16kLcKJYUJOqhY^pUv9^iobKC#?`&lIX_@Wa+qd}9 zS_2zxSsLWg^9KsczN`Ut4_?MDLYP0JGMi}cpjVr39wHUpdXbF9&)ThZnfs7dFJ=ZK z5f~P(GJm{fzHdIhRJYuJ^UHH}2hdM)mvnDTj_UyUK?#R?;6<@O@^r2g}xw_o=q?mdfRY&p8&x z@unZ+x()@DO&_wnuD*gn&jcdgZy4_^ywYL`U@S@NnOtKd+E7Aju{I?`)#GiQ?nE*% z^>a{!Afb?q5hKneuR{RPxAql`q#d#m$xw?#8@ zbTbP(d?mlpw zL>QIS5Z#f!*_o0WhhowcOa@1-(UQj6QijFnj=i2;W|AVL?ZhAgismk}vdMWg`p=qS zZ>9Sfw0}R!Y?q>@T_R*u{2QF-*s-_V9j$w+M0xJJNo=4$c+)H8pwUAwErh8HX<(#lKrCZobVtz%C^AVg@{hTJ%|M5K|(Zvs` z2TNpfjh85Y`aDDCVijc^)6uaaRZhR|(Kjf<*`IH8i+e+qUmCD5JpV;wu%;#j>fo)N zq$;qKv)yvx_B{JWz*j}f5&kHsp4s#(&xC$_lI8a^=Y31WfsT3XnZ6yaq6ZB%sc*MN zL)0j~X1ijiUgyBfWza>34q5JTD|1E9fU(h<>3o@IKFCt4OQQuzIdfd9nF60T*AW(q zPOaItgQbcIsqJ^f}gFQ%WB*Wyc#7E9^%^b?~p;zP5yY6gQ^qM+d;YT{~P@0gVI`*( z)HI64y>5Su?ogNRq#uOP91igqu(dzUJv>dAWIhOeLs|0m;-tM+BU=h;ybhZrSj0G9e>Xu9|3Jws38H zkyn(f5f%#Vi(uktUQuu-0!q@eCmtY$Lp)|+C;RdqYTFEPHr+-j$e*yVW0_lh^dZ_{9Tq3mxF2n z(R@WOo7u2N)4M?4_2ShgD`V>9O9Mq1?=jVkNTHuZjydF#AdCtLXka>%dM9jfhc!Vc z>W|VYI(XWjcmd`7wz$5UIV_S1?l83C6cINm+WxWDi&VlV`O&NEo7I`Xmuw%u6m`%| zDhH(F)*HmFv*yt&As5UyrGubYA4(T94VJnS2d%IM;o#*8rKrp3JKkMiPp|~Js z<)ng|_S5P+Fm8R07`7yPc7o=~X4{OvNH%ps1N$bMse$w`PmH!G)9D;UewP15OKN4_gF zjJXvTbi3YM_%9#zCRYYEOCDRKZI_)|6$o}lQL)ZG=6Y*pY#TFT4hagU zJ1-p78!d!<%Ie5ryr*#Run*6h2)7CpN%!93sj~}}#)K+ru-_8(f*ID4uPGHcx;Ug# zx*F7AJy~?uW>z~#+d;pS6xLCw>1z8+XUBnM`Q-7(*DK;k+lB}gG^A*BdN399VZu+Z zO}yA}D}2ybvVjcdO9fRY@{J2o$c(FCuoDT0f$|dSZyS=Gr!_dOpBNM2aOTqbC+UqdT?vV;N`P`+U`*PabBD_-ZKU|u%h-BQIUvj_TxUBZe>jQ zL?wD@j%mjU{uNE2aWCN~>)sxCR4zF+ zj#=LK`0F&Ny>azmhRx(45&qQ%;l!R36GWzA#3My^Bbg4DO6V-(cPT$$_iPbZ&V7T* z40iV%4~uFS$=X1~sfli+eXi+Pt=bEp7&qOa{;34#X|AKu;5Irq64CCKGO8iCk;n_E zv=v{1eE70(6-UE=!YC!N%@{F(dE=!oLxWHVdY45yOzhu*ep(ql_(dI2@GW_1eM9AP zgq2T6%QU}LmwfN88nbDjN64u!v&As+wn~qPHhh=oWP~q+Bz-&{$ z+-c<@iU`ar;(uk3XOSwlW2=87%f0SJL{h=$!X*%*TO@X#Ll!Y5>BaUmT=`}M!41x% z<|!7d*R=5p?RAt@JGE%7XSJ!0nh7Ww`SJL0T6rq^1&9&e@1M0jo|aLs_|&&_3v$ZU zI*mdeFS$*PtfciIgHDo4m%By~oSULjJE4@cvAU2Cwn8Ym!Im3svurYnf$_;F_(V}s&T+`pH(G)azn{5j%<`d|8`PEu+1@?7 z82&k}Bu((xurQPB^;e^GKjF}85ay51?=4WGfOEhNYJllUgUivOGkRe8XE9!YCHU^` zl=(cD{U~^heCO?%2APi%`IPVPMqRlnd@q%*s85Lv`)a*dAAf3EEkV>XH2nOzy37SE*Z95Xsj!h1*~{oGdx#s#TmOV2t`ZfU4Q%XLc@$zm}|Y9xCJgi5bqC{Z1XI^X}SF0uFGEzHq zz*O$xN!yeu#Mv0E2xjQpgg8DEorm8fPy4ozWiy%=^X=j^$+4L*cHycPm$FKC$#YRN zW_$JK7#WVC8Ku{YGmMRbZVe#EAc9V|(mejUd@^L+2A@F?MzV|Vwf&&!*agCY%TX=x zmSPKwzXqQ)aX0l3yVus_LAz$%LUxqXbLKh-*Q{#W;bdao`j6GH0Xt%j_((eW z^hO<@`O#Zs*B$C>i&sk028~*Ui&eLzu1@a7CTyHXa8HoO@>AhEbyHB9aFASAMMKmI ze7$(R@=~1V|Kj*JeuLV%Ji#AGBLGuIi?-bUESQ+gqe0WvaY;$3JSdN}86Bm-Y{GP6 z>;g((`g%#8c4 z^_>;)#Ry5yYszmkkf;#&9jvg|EVl)MCR_fdDzAusZUujA2%dtjIR7mLQ?`27hcB6W zpAa~to(-q&uIKKWq&OMMd=iQ~aLo8N$y*+1GuaF$avwj2cb+CHV*H>IV04c~UU_zM)B6 zN@9&!yuPBfw5j@Y*y{;>YcoruCys22g8Xt@nV002t}0{{R350Hx300030P)t-s0000C zA14hUC=4Gc4Id~BA1DnUCk-Gd4In5DASezXDGeVd4Id~#KtK&3DF6Te4IwEEAtw+Y zDh(hgD=RAvASe$eEe#+i4Iw8GAt?FVpCsH^$;`SO%+uq;7#mAnesTwRZfs2pz_V%^Ay>@|x5F;yZrCcBY001L& zQchC<{Mk~>=A7W5##p2D1YiMUd@;xdjw0|*A7yz0MGW2Y^WM)-MA!fT0tQJ$K~#8N zt=NZ>;xG^d(3TA*n7Blf*%oZRm~+lK{QtKcReM(j>#-4d-Ul=Y?9xmlRpbwgB`-fS zv%FU-4*dxGnUsSmubKws33fCZhZV{y;dlgh)tbjNUabl@^+ti)6dH9nIB3yD>j2xd zJBDsdr;SwI9Np!*NYU?c7rj0b4Gec<21wB4?wW~FT44k3M>uBRa6hJxE4n@ItJlSb zc8>eYwXv?lEIL?oV3>tjdpGMXX49(UzXr2v;Gb%NSrw|dRAY9v%czmZ?7R_HFs6nv zRuEEf^TETV?D3O(6ogorR2X;bxlMNW2IDFd0A+ECvenhw}>(lCFpKZ(+t_y{E z;;VJ_jqAq3ob&z1(NDYG$*uuz+-nv0 zZN(lyv7b=vO%(ea#hyvK|I+W}^!q~n9#igD<7?MpTEFVl`_9eWrT6^{(%4}>`eko* P00000NkvXXu0mjf(4LPQ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_2.png b/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_2.png deleted file mode 100644 index f7b93916b14b964b9af5d85ceaf63d0bf5503182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1008 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 JPDHLkV1jo!kYWG; diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_6.png b/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_6.png deleted file mode 100644 index 61fa40fe16299cdefbb6efb2bd56cf50bd7cdfef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1419 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 Hu0mjfC*?j0 diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/logo-colored.png b/jacq-input/src/main/webapp/resources/omega-layout/images/logo-colored.png deleted file mode 100644 index a20204749e47dc838da55c5655f19028e7a1da24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5414 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 Qh5!Hn07*qoM6N<$g76i4dH?_b diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/logo.png b/jacq-input/src/main/webapp/resources/omega-layout/images/logo.png deleted file mode 100644 index b17fffead5d0facfbfe15414b8685217dfe1db38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3287 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 V*WV8r4)g#3002ovPDHLkV1hl{@tObt diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/preloader.gif b/jacq-input/src/main/webapp/resources/omega-layout/images/preloader.gif deleted file mode 100644 index 510a13228c0605c97bf3f8c112fd53d8d6d76023..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10756 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 diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/profile.png b/jacq-input/src/main/webapp/resources/omega-layout/images/profile.png deleted file mode 100644 index 471bf6f90244c4a015ece4b08287dd7354bc23d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3780 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 N))w~WwWfYa{{oh7jcot` diff --git a/jacq-input/src/main/webapp/resources/omega-layout/css/animate.css b/jacq-input/src/main/webapp/resources/saga-layout/css/animate.css similarity index 100% rename from jacq-input/src/main/webapp/resources/omega-layout/css/animate.css rename to jacq-input/src/main/webapp/resources/saga-layout/css/animate.css diff --git a/jacq-input/src/main/webapp/resources/omega-layout/css/layout.css b/jacq-input/src/main/webapp/resources/saga-layout/css/layout.css similarity index 85% rename from jacq-input/src/main/webapp/resources/omega-layout/css/layout.css rename to jacq-input/src/main/webapp/resources/saga-layout/css/layout.css index d82ea595..4b036499 100644 --- a/jacq-input/src/main/webapp/resources/omega-layout/css/layout.css +++ b/jacq-input/src/main/webapp/resources/saga-layout/css/layout.css @@ -13,12 +13,14 @@ /* NavyButton */ /* Exception */ /* UI ICONS */ -/* positioning */ -.ui-icon-blank { +body { + /* positioning */ + /* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +} +body .ui-icon-blank { background-position: 16px 16px; } - -.ui-icon-carat-1-n { +body .ui-icon-carat-1-n { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -29,15 +31,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-carat-1-n:before { +body .ui-icon-carat-1-n:before { content: ""; } - -.ui-icon-carat-1-ne { +body .ui-icon-carat-1-ne { background-position: -16px 0; } - -.ui-icon-carat-1-e { +body .ui-icon-carat-1-e { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -48,15 +48,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-carat-1-e:before { +body .ui-icon-carat-1-e:before { content: ""; } - -.ui-icon-carat-1-se { +body .ui-icon-carat-1-se { background-position: -48px 0; } - -.ui-icon-carat-1-s { +body .ui-icon-carat-1-s { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -67,15 +65,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-carat-1-s:before { +body .ui-icon-carat-1-s:before { content: ""; } - -.ui-icon-carat-1-sw { +body .ui-icon-carat-1-sw { background-position: -80px 0; } - -.ui-icon-carat-1-w { +body .ui-icon-carat-1-w { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -86,15 +82,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-carat-1-w:before { +body .ui-icon-carat-1-w:before { content: ""; } - -.ui-icon-carat-1-nw { +body .ui-icon-carat-1-nw { background-position: -112px 0; } - -.ui-icon-carat-2-n-s { +body .ui-icon-carat-2-n-s { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -105,15 +99,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-carat-2-n-s:before { +body .ui-icon-carat-2-n-s:before { content: ""; } - -.ui-icon-carat-2-e-w { +body .ui-icon-carat-2-e-w { background-position: -144px 0; } - -.ui-icon-triangle-1-n { +body .ui-icon-triangle-1-n { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -124,15 +116,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-triangle-1-n:before { +body .ui-icon-triangle-1-n:before { content: ""; } - -.ui-icon-triangle-1-ne { +body .ui-icon-triangle-1-ne { background-position: -16px -16px; } - -.ui-icon-triangle-1-e { +body .ui-icon-triangle-1-e { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -143,15 +133,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-triangle-1-e:before { +body .ui-icon-triangle-1-e:before { content: ""; } - -.ui-icon-triangle-1-se { +body .ui-icon-triangle-1-se { background-position: -48px -16px; } - -.ui-icon-triangle-1-s { +body .ui-icon-triangle-1-s { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -162,15 +150,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-triangle-1-s:before { +body .ui-icon-triangle-1-s:before { content: ""; } - -.ui-icon-triangle-1-sw { +body .ui-icon-triangle-1-sw { background-position: -80px -16px; } - -.ui-icon-triangle-1-w { +body .ui-icon-triangle-1-w { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -181,15 +167,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-triangle-1-w:before { +body .ui-icon-triangle-1-w:before { content: ""; } - -.ui-icon-triangle-1-nw { +body .ui-icon-triangle-1-nw { background-position: -112px -16px; } - -.ui-icon-triangle-2-n-s { +body .ui-icon-triangle-2-n-s { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -200,15 +184,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-triangle-2-n-s:before { +body .ui-icon-triangle-2-n-s:before { content: ""; } - -.ui-icon-triangle-2-e-w { +body .ui-icon-triangle-2-e-w { background-position: -144px -16px; } - -.ui-icon-arrow-1-n { +body .ui-icon-arrow-1-n { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -219,15 +201,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrow-1-n:before { +body .ui-icon-arrow-1-n:before { content: ""; } - -.ui-icon-arrow-1-ne { +body .ui-icon-arrow-1-ne { background-position: -16px -32px; } - -.ui-icon-arrow-1-e { +body .ui-icon-arrow-1-e { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -238,15 +218,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrow-1-e:before { +body .ui-icon-arrow-1-e:before { content: ""; } - -.ui-icon-arrow-1-se { +body .ui-icon-arrow-1-se { background-position: -48px -32px; } - -.ui-icon-arrow-1-s { +body .ui-icon-arrow-1-s { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -257,15 +235,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrow-1-s:before { +body .ui-icon-arrow-1-s:before { content: ""; } - -.ui-icon-arrow-1-sw { +body .ui-icon-arrow-1-sw { background-position: -80px -32px; } - -.ui-icon-arrow-1-w { +body .ui-icon-arrow-1-w { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -276,15 +252,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrow-1-w:before { +body .ui-icon-arrow-1-w:before { content: ""; } - -.ui-icon-arrow-1-nw { +body .ui-icon-arrow-1-nw { background-position: -112px -32px; } - -.ui-icon-arrow-2-n-s { +body .ui-icon-arrow-2-n-s { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -295,15 +269,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrow-2-n-s:before { +body .ui-icon-arrow-2-n-s:before { content: ""; } - -.ui-icon-arrow-2-ne-sw { +body .ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } - -.ui-icon-arrow-2-e-w { +body .ui-icon-arrow-2-e-w { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -314,31 +286,25 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrow-2-e-w:before { +body .ui-icon-arrow-2-e-w:before { content: ""; } - -.ui-icon-arrow-2-se-nw { +body .ui-icon-arrow-2-se-nw { background-position: -176px -32px; } - -.ui-icon-arrowstop-1-n { +body .ui-icon-arrowstop-1-n { background-position: -192px -32px; } - -.ui-icon-arrowstop-1-e { +body .ui-icon-arrowstop-1-e { background-position: -208px -32px; } - -.ui-icon-arrowstop-1-s { +body .ui-icon-arrowstop-1-s { background-position: -224px -32px; } - -.ui-icon-arrowstop-1-w { +body .ui-icon-arrowstop-1-w { background-position: -240px -32px; } - -.ui-icon-arrowthick-1-n { +body .ui-icon-arrowthick-1-n { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -349,15 +315,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrowthick-1-n:before { +body .ui-icon-arrowthick-1-n:before { content: ""; } - -.ui-icon-arrowthick-1-ne { +body .ui-icon-arrowthick-1-ne { background-position: -16px -48px; } - -.ui-icon-arrowthick-1-e { +body .ui-icon-arrowthick-1-e { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -368,15 +332,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrowthick-1-e:before { +body .ui-icon-arrowthick-1-e:before { content: ""; } - -.ui-icon-arrowthick-1-se { +body .ui-icon-arrowthick-1-se { background-position: -48px -48px; } - -.ui-icon-arrowthick-1-s { +body .ui-icon-arrowthick-1-s { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -387,15 +349,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrowthick-1-s:before { +body .ui-icon-arrowthick-1-s:before { content: ""; } - -.ui-icon-arrowthick-1-sw { +body .ui-icon-arrowthick-1-sw { background-position: -80px -48px; } - -.ui-icon-arrowthick-1-w { +body .ui-icon-arrowthick-1-w { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -406,95 +366,73 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrowthick-1-w:before { +body .ui-icon-arrowthick-1-w:before { content: ""; } - -.ui-icon-arrowthick-1-nw { +body .ui-icon-arrowthick-1-nw { background-position: -112px -48px; } - -.ui-icon-arrowthick-2-n-s { +body .ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } - -.ui-icon-arrowthick-2-ne-sw { +body .ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } - -.ui-icon-arrowthick-2-e-w { +body .ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } - -.ui-icon-arrowthick-2-se-nw { +body .ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } - -.ui-icon-arrowthickstop-1-n { +body .ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } - -.ui-icon-arrowthickstop-1-e { +body .ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } - -.ui-icon-arrowthickstop-1-s { +body .ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } - -.ui-icon-arrowthickstop-1-w { +body .ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } - -.ui-icon-arrowreturnthick-1-w { +body .ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } - -.ui-icon-arrowreturnthick-1-n { +body .ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } - -.ui-icon-arrowreturnthick-1-e { +body .ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } - -.ui-icon-arrowreturnthick-1-s { +body .ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } - -.ui-icon-arrowreturn-1-w { +body .ui-icon-arrowreturn-1-w { background-position: -64px -64px; } - -.ui-icon-arrowreturn-1-n { +body .ui-icon-arrowreturn-1-n { background-position: -80px -64px; } - -.ui-icon-arrowreturn-1-e { +body .ui-icon-arrowreturn-1-e { background-position: -96px -64px; } - -.ui-icon-arrowreturn-1-s { +body .ui-icon-arrowreturn-1-s { background-position: -112px -64px; } - -.ui-icon-arrowrefresh-1-w { +body .ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } - -.ui-icon-arrowrefresh-1-n { +body .ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } - -.ui-icon-arrowrefresh-1-e { +body .ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } - -.ui-icon-arrowrefresh-1-s { +body .ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } - -.ui-icon-arrow-4 { +body .ui-icon-arrow-4 { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -505,11 +443,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrow-4:before { +body .ui-icon-arrow-4:before { content: ""; } - -.ui-icon-arrow-4-diag { +body .ui-icon-arrow-4-diag { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -520,11 +457,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-arrow-4-diag:before { +body .ui-icon-arrow-4-diag:before { content: ""; } - -.ui-icon-extlink { +body .ui-icon-extlink { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -535,11 +471,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-extlink:before { +body .ui-icon-extlink:before { content: ""; } - -.ui-icon-newwin { +body .ui-icon-newwin { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -550,11 +485,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-newwin:before { +body .ui-icon-newwin:before { content: ""; } - -.ui-icon-refresh { +body .ui-icon-refresh { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -565,11 +499,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-refresh:before { +body .ui-icon-refresh:before { content: ""; } - -.ui-icon-shuffle { +body .ui-icon-shuffle { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -580,11 +513,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-shuffle:before { +body .ui-icon-shuffle:before { content: ""; } - -.ui-icon-transfer-e-w { +body .ui-icon-transfer-e-w { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -595,15 +527,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-transfer-e-w:before { +body .ui-icon-transfer-e-w:before { content: ""; } - -.ui-icon-transferthick-e-w { +body .ui-icon-transferthick-e-w { background-position: -112px -80px; } - -.ui-icon-folder-collapsed { +body .ui-icon-folder-collapsed { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -614,11 +544,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-folder-collapsed:before { +body .ui-icon-folder-collapsed:before { content: ""; } - -.ui-icon-folder-open { +body .ui-icon-folder-open { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -629,11 +558,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-folder-open:before { +body .ui-icon-folder-open:before { content: ""; } - -.ui-icon-document { +body .ui-icon-document { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -644,15 +572,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-document:before { +body .ui-icon-document:before { content: ""; } - -.ui-icon-document-b { +body .ui-icon-document-b { background-position: -48px -96px; } - -.ui-icon-note { +body .ui-icon-note { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -663,15 +589,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-note:before { +body .ui-icon-note:before { content: ""; } - -.ui-icon-mail-closed { +body .ui-icon-mail-closed { background-position: -80px -96px; } - -.ui-icon-mail-open { +body .ui-icon-mail-open { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -682,11 +606,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-mail-open:before { +body .ui-icon-mail-open:before { content: ""; } - -.ui-icon-suitcase { +body .ui-icon-suitcase { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -697,11 +620,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-suitcase:before { +body .ui-icon-suitcase:before { content: ""; } - -.ui-icon-comment { +body .ui-icon-comment { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -712,11 +634,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-comment:before { +body .ui-icon-comment:before { content: ""; } - -.ui-icon-person { +body .ui-icon-person { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -727,11 +648,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-person:before { +body .ui-icon-person:before { content: ""; } - -.ui-icon-print { +body .ui-icon-print { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -742,11 +662,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-print:before { +body .ui-icon-print:before { content: ""; } - -.ui-icon-trash { +body .ui-icon-trash { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -757,11 +676,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-trash:before { +body .ui-icon-trash:before { content: ""; } - -.ui-icon-locked { +body .ui-icon-locked { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -772,11 +690,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-locked:before { +body .ui-icon-locked:before { content: ""; } - -.ui-icon-unlocked { +body .ui-icon-unlocked { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -787,11 +704,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-unlocked:before { +body .ui-icon-unlocked:before { content: ""; } - -.ui-icon-bookmark { +body .ui-icon-bookmark { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -802,11 +718,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-bookmark:before { +body .ui-icon-bookmark:before { content: ""; } - -.ui-icon-tag { +body .ui-icon-tag { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -817,11 +732,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-tag:before { +body .ui-icon-tag:before { content: ""; } - -.ui-icon-home { +body .ui-icon-home { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -832,11 +746,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-home:before { +body .ui-icon-home:before { content: ""; } - -.ui-icon-flag { +body .ui-icon-flag { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -847,11 +760,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-flag:before { +body .ui-icon-flag:before { content: ""; } - -.ui-icon-calendar { +body .ui-icon-calendar { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -862,11 +774,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-calendar:before { +body .ui-icon-calendar:before { content: ""; } - -.ui-icon-cart { +body .ui-icon-cart { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -877,11 +788,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-cart:before { +body .ui-icon-cart:before { content: ""; } - -.ui-icon-pencil { +body .ui-icon-pencil { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -892,11 +802,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-pencil:before { +body .ui-icon-pencil:before { content: ""; } - -.ui-icon-clock { +body .ui-icon-clock { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -907,11 +816,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-clock:before { +body .ui-icon-clock:before { content: ""; } - -.ui-icon-disk { +body .ui-icon-disk { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -922,11 +830,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-disk:before { +body .ui-icon-disk:before { content: ""; } - -.ui-icon-calculator { +body .ui-icon-calculator { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -937,11 +844,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-calculator:before { +body .ui-icon-calculator:before { content: ""; } - -.ui-icon-zoomin { +body .ui-icon-zoomin { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -952,11 +858,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-zoomin:before { +body .ui-icon-zoomin:before { content: ""; } - -.ui-icon-zoomout { +body .ui-icon-zoomout { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -967,11 +872,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-zoomout:before { +body .ui-icon-zoomout:before { content: ""; } - -.ui-icon-search { +body .ui-icon-search { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -982,11 +886,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-search:before { +body .ui-icon-search:before { content: ""; } - -.ui-icon-wrench { +body .ui-icon-wrench { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -997,11 +900,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-wrench:before { +body .ui-icon-wrench:before { content: ""; } - -.ui-icon-gear { +body .ui-icon-gear { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1012,11 +914,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-gear:before { +body .ui-icon-gear:before { content: ""; } - -.ui-icon-heart { +body .ui-icon-heart { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1027,11 +928,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-heart:before { +body .ui-icon-heart:before { content: ""; } - -.ui-icon-star { +body .ui-icon-star { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1042,11 +942,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-star:before { +body .ui-icon-star:before { content: ""; } - -.ui-icon-link { +body .ui-icon-link { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1057,11 +956,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-link:before { +body .ui-icon-link:before { content: ""; } - -.ui-icon-cancel { +body .ui-icon-cancel { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1072,11 +970,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-cancel:before { +body .ui-icon-cancel:before { content: ""; } - -.ui-icon-plus { +body .ui-icon-plus { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1087,11 +984,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-plus:before { +body .ui-icon-plus:before { content: ""; } - -.ui-icon-plusthick { +body .ui-icon-plusthick { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1102,11 +998,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-plusthick:before { +body .ui-icon-plusthick:before { content: ""; } - -.ui-icon-minus { +body .ui-icon-minus { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1117,11 +1012,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-minus:before { +body .ui-icon-minus:before { content: ""; } - -.ui-icon-minusthick { +body .ui-icon-minusthick { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1132,11 +1026,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-minusthick:before { +body .ui-icon-minusthick:before { content: ""; } - -.ui-icon-close { +body .ui-icon-close { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1147,11 +1040,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-close:before { +body .ui-icon-close:before { content: ""; } - -.ui-icon-closethick { +body .ui-icon-closethick { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1162,11 +1054,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-closethick:before { +body .ui-icon-closethick:before { content: ""; } - -.ui-icon-key { +body .ui-icon-key { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1177,11 +1068,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-key:before { +body .ui-icon-key:before { content: ""; } - -.ui-icon-lightbulb { +body .ui-icon-lightbulb { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1192,11 +1082,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-lightbulb:before { +body .ui-icon-lightbulb:before { content: ""; } - -.ui-icon-scissors { +body .ui-icon-scissors { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1207,11 +1096,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-scissors:before { +body .ui-icon-scissors:before { content: ""; } - -.ui-icon-clipboard { +body .ui-icon-clipboard { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1222,11 +1110,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-clipboard:before { +body .ui-icon-clipboard:before { content: ""; } - -.ui-icon-copy { +body .ui-icon-copy { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1237,11 +1124,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-copy:before { +body .ui-icon-copy:before { content: ""; } - -.ui-icon-contact { +body .ui-icon-contact { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1252,11 +1138,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-contact:before { +body .ui-icon-contact:before { content: ""; } - -.ui-icon-image { +body .ui-icon-image { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1267,11 +1152,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-image:before { +body .ui-icon-image:before { content: ""; } - -.ui-icon-video { +body .ui-icon-video { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1282,11 +1166,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-video:before { +body .ui-icon-video:before { content: ""; } - -.ui-icon-music { +body .ui-icon-music { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1297,15 +1180,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-music:before { +body .ui-icon-music:before { content: ""; } - -.ui-icon-script { +body .ui-icon-script { background-position: -240px -128px; } - -.ui-icon-alert { +body .ui-icon-alert { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1316,11 +1197,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-alert:before { +body .ui-icon-alert:before { content: ""; } - -.ui-icon-info { +body .ui-icon-info { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1331,11 +1211,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-info:before { +body .ui-icon-info:before { content: ""; } - -.ui-icon-notice { +body .ui-icon-notice { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1346,11 +1225,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-notice:before { +body .ui-icon-notice:before { content: ""; } - -.ui-icon-help { +body .ui-icon-help { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1361,11 +1239,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-help:before { +body .ui-icon-help:before { content: ""; } - -.ui-icon-check { +body .ui-icon-check { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1376,11 +1253,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-check:before { +body .ui-icon-check:before { content: ""; } - -.ui-icon-bullet { +body .ui-icon-bullet { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1391,11 +1267,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-bullet:before { +body .ui-icon-bullet:before { content: ""; } - -.ui-icon-radio-on { +body .ui-icon-radio-on { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1406,11 +1281,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-radio-on:before { +body .ui-icon-radio-on:before { content: ""; } - -.ui-icon-radio-off { +body .ui-icon-radio-off { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1421,15 +1295,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-radio-off:before { +body .ui-icon-radio-off:before { content: ""; } - -.ui-icon-pin-w { +body .ui-icon-pin-w { background-position: -128px -144px; } - -.ui-icon-pin-s { +body .ui-icon-pin-s { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1440,11 +1312,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-pin-s:before { +body .ui-icon-pin-s:before { content: ""; } - -.ui-icon-play { +body .ui-icon-play { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1455,11 +1326,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-play:before { +body .ui-icon-play:before { content: ""; } - -.ui-icon-pause { +body .ui-icon-pause { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1470,11 +1340,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-pause:before { +body .ui-icon-pause:before { content: ""; } - -.ui-icon-seek-next { +body .ui-icon-seek-next { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1485,11 +1354,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-seek-next:before { +body .ui-icon-seek-next:before { content: ""; } - -.ui-icon-seek-prev { +body .ui-icon-seek-prev { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1500,11 +1368,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-seek-prev:before { +body .ui-icon-seek-prev:before { content: ""; } - -.ui-icon-seek-end { +body .ui-icon-seek-end { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1515,16 +1382,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-seek-end:before { +body .ui-icon-seek-end:before { content: ""; } - -.ui-icon-seek-start { +body .ui-icon-seek-start { background-position: -80px -160px; } - -/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ -.ui-icon-seek-first { +body .ui-icon-seek-first { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1535,11 +1399,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-seek-first:before { +body .ui-icon-seek-first:before { content: ""; } - -.ui-icon-stop { +body .ui-icon-stop { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1550,11 +1413,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-stop:before { +body .ui-icon-stop:before { content: ""; } - -.ui-icon-eject { +body .ui-icon-eject { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1565,11 +1427,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-eject:before { +body .ui-icon-eject:before { content: ""; } - -.ui-icon-volume-off { +body .ui-icon-volume-off { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1580,11 +1441,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-volume-off:before { +body .ui-icon-volume-off:before { content: ""; } - -.ui-icon-volume-on { +body .ui-icon-volume-on { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1595,11 +1455,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-volume-on:before { +body .ui-icon-volume-on:before { content: ""; } - -.ui-icon-power { +body .ui-icon-power { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1610,15 +1469,13 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-power:before { +body .ui-icon-power:before { content: ""; } - -.ui-icon-signal-diag { +body .ui-icon-signal-diag { background-position: -16px -176px; } - -.ui-icon-signal { +body .ui-icon-signal { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1629,11 +1486,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-signal:before { +body .ui-icon-signal:before { content: ""; } - -.ui-icon-battery-0 { +body .ui-icon-battery-0 { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1644,11 +1500,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-battery-0:before { +body .ui-icon-battery-0:before { content: ""; } - -.ui-icon-battery-1 { +body .ui-icon-battery-1 { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1659,11 +1514,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-battery-1:before { +body .ui-icon-battery-1:before { content: ""; } - -.ui-icon-battery-2 { +body .ui-icon-battery-2 { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1674,11 +1528,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-battery-2:before { +body .ui-icon-battery-2:before { content: ""; } - -.ui-icon-battery-3 { +body .ui-icon-battery-3 { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1689,11 +1542,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-battery-3:before { +body .ui-icon-battery-3:before { content: ""; } - -.ui-icon-circle-plus { +body .ui-icon-circle-plus { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1704,11 +1556,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-circle-plus:before { +body .ui-icon-circle-plus:before { content: ""; } - -.ui-icon-circle-minus { +body .ui-icon-circle-minus { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1719,11 +1570,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-circle-minus:before { +body .ui-icon-circle-minus:before { content: ""; } - -.ui-icon-circle-close { +body .ui-icon-circle-close { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1734,11 +1584,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-circle-close:before { +body .ui-icon-circle-close:before { content: ""; } - -.ui-icon-circle-triangle-e { +body .ui-icon-circle-triangle-e { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1749,11 +1598,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-circle-triangle-e:before { +body .ui-icon-circle-triangle-e:before { content: ""; } - -.ui-icon-circle-triangle-s { +body .ui-icon-circle-triangle-s { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1764,11 +1612,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-circle-triangle-s:before { +body .ui-icon-circle-triangle-s:before { content: ""; } - -.ui-icon-circle-triangle-w { +body .ui-icon-circle-triangle-w { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1779,11 +1626,10 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-circle-triangle-w:before { +body .ui-icon-circle-triangle-w:before { content: ""; } - -.ui-icon-circle-triangle-n { +body .ui-icon-circle-triangle-n { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -1794,83 +1640,64 @@ text-indent: 0px !important; text-align: center; } -.ui-icon-circle-triangle-n:before { +body .ui-icon-circle-triangle-n:before { content: ""; } - -.ui-icon-circle-arrow-e { +body .ui-icon-circle-arrow-e { background-position: -112px -192px; } - -.ui-icon-circle-arrow-s { +body .ui-icon-circle-arrow-s { background-position: -128px -192px; } - -.ui-icon-circle-arrow-w { +body .ui-icon-circle-arrow-w { background-position: -144px -192px; } - -.ui-icon-circle-arrow-n { +body .ui-icon-circle-arrow-n { background-position: -160px -192px; } - -.ui-icon-circle-zoomin { +body .ui-icon-circle-zoomin { background-position: -176px -192px; } - -.ui-icon-circle-zoomout { +body .ui-icon-circle-zoomout { background-position: -192px -192px; } - -.ui-icon-circle-check { +body .ui-icon-circle-check { background-position: -208px -192px; } - -.ui-icon-circlesmall-plus { +body .ui-icon-circlesmall-plus { background-position: 0 -208px; } - -.ui-icon-circlesmall-minus { +body .ui-icon-circlesmall-minus { background-position: -16px -208px; } - -.ui-icon-circlesmall-close { +body .ui-icon-circlesmall-close { background-position: -32px -208px; } - -.ui-icon-squaresmall-plus { +body .ui-icon-squaresmall-plus { background-position: -48px -208px; } - -.ui-icon-squaresmall-minus { +body .ui-icon-squaresmall-minus { background-position: -64px -208px; } - -.ui-icon-squaresmall-close { +body .ui-icon-squaresmall-close { background-position: -80px -208px; } - -.ui-icon-grip-dotted-vertical { +body .ui-icon-grip-dotted-vertical { background-position: 0 -224px; } - -.ui-icon-grip-dotted-horizontal { +body .ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } - -.ui-icon-grip-solid-vertical { +body .ui-icon-grip-solid-vertical { background-position: -32px -224px; } - -.ui-icon-grip-solid-horizontal { +body .ui-icon-grip-solid-horizontal { background-position: -48px -224px; } - -.ui-icon-gripsmall-diagonal-se { +body .ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } - -.ui-icon-grip-diagonal-se { +body .ui-icon-grip-diagonal-se { background-position: -80px -224px; } @@ -1887,10 +1714,10 @@ html { background-color: #edf0f5; } -.wrapper { +body .wrapper { padding: 0; } -.wrapper .topbar { +body .wrapper .topbar { -moz-transition: left 0.3s; -o-transition: left 0.3s; -webkit-transition: left 0.3s; @@ -1905,20 +1732,20 @@ html { color: #ffffff; z-index: 101; } -.wrapper .topbar .topbar-title { +body .wrapper .topbar .topbar-title { display: inline-block; font-size: 20px; margin: 5px 0 0 15px; vertical-align: top; } -.wrapper .topbar #topbar-icons { +body .wrapper .topbar #topbar-icons { float: right; display: block; -moz-animation-duration: .5s; -webkit-animation-duration: .5s; animation-duration: .5s; } -.wrapper .topbar #topbar-icons a { +body .wrapper .topbar #topbar-icons a { position: relative; color: #ffffff; margin-left: 20px; @@ -1929,17 +1756,17 @@ html { -webkit-transition: color 0.3s; transition: color 0.3s; } -.wrapper .topbar #topbar-icons a:hover { +body .wrapper .topbar #topbar-icons a:hover { color: #ffffff; } -.wrapper .topbar #topbar-icons a span.topbar-icon { +body .wrapper .topbar #topbar-icons a span.topbar-icon { font-size: 28px; } -.wrapper .topbar #topbar-icons a span.topbar-item-text { +body .wrapper .topbar #topbar-icons a span.topbar-item-text { font-size: 20px; display: none; } -.wrapper .topbar #topbar-icons a span.topbar-badge { +body .wrapper .topbar #topbar-icons a span.topbar-badge { position: absolute; font-size: 10px; right: -5px; @@ -1951,13 +1778,13 @@ html { -webkit-border-radius: 50%; border-radius: 50%; } -.wrapper .topbar #topbar-icons .topbar-search { +body .wrapper .topbar #topbar-icons .topbar-search { padding: 0; position: relative; display: inline-block; top: -4px; } -.wrapper .topbar #topbar-icons .topbar-search input { +body .wrapper .topbar #topbar-icons .topbar-search input { display: inline-block; border: 0 none; font-size: 14px; @@ -1972,7 +1799,7 @@ html { -webkit-border-radius: 2px; border-radius: 2px; } -.wrapper .topbar #topbar-icons .topbar-search input::-webkit-input-placeholder { +body .wrapper .topbar #topbar-icons .topbar-search input::-webkit-input-placeholder { color: #ffffff; opacity: .7; -moz-transition: opacity 0.3s; @@ -1980,7 +1807,7 @@ html { -webkit-transition: opacity 0.3s; transition: opacity 0.3s; } -.wrapper .topbar #topbar-icons .topbar-search input:-moz-placeholder { +body .wrapper .topbar #topbar-icons .topbar-search input:-moz-placeholder { color: #ffffff; opacity: .7; -moz-transition: opacity 0.3s; @@ -1988,7 +1815,7 @@ html { -webkit-transition: opacity 0.3s; transition: opacity 0.3s; } -.wrapper .topbar #topbar-icons .topbar-search input::-moz-placeholder { +body .wrapper .topbar #topbar-icons .topbar-search input::-moz-placeholder { color: #ffffff; opacity: .7; -moz-transition: opacity 0.3s; @@ -1996,7 +1823,7 @@ html { -webkit-transition: opacity 0.3s; transition: opacity 0.3s; } -.wrapper .topbar #topbar-icons .topbar-search input:-ms-input-placeholder { +body .wrapper .topbar #topbar-icons .topbar-search input:-ms-input-placeholder { color: #ffffff; opacity: .7; -moz-transition: opacity 0.3s; @@ -2004,31 +1831,31 @@ html { -webkit-transition: opacity 0.3s; transition: opacity 0.3s; } -.wrapper .topbar #topbar-icons .topbar-search .topbar-search-icon { +body .wrapper .topbar #topbar-icons .topbar-search .topbar-search-icon { font-size: 18px; position: absolute; top: -1px; right: 0px; } -.wrapper .topbar #topbar-icons .topbar-search:hover input { +body .wrapper .topbar #topbar-icons .topbar-search:hover input { border-bottom-color: #ffffff; } -.wrapper .topbar #topbar-icons .topbar-search:hover input::-webkit-input-placeholder { +body .wrapper .topbar #topbar-icons .topbar-search:hover input::-webkit-input-placeholder { opacity: 1; } -.wrapper .topbar #topbar-icons .topbar-search:hover input:-moz-placeholder { +body .wrapper .topbar #topbar-icons .topbar-search:hover input:-moz-placeholder { opacity: 1; } -.wrapper .topbar #topbar-icons .topbar-search:hover input::-moz-placeholder { +body .wrapper .topbar #topbar-icons .topbar-search:hover input::-moz-placeholder { opacity: 1; } -.wrapper .topbar #topbar-icons .topbar-search:hover input:-ms-input-placeholder { +body .wrapper .topbar #topbar-icons .topbar-search:hover input:-ms-input-placeholder { opacity: 1; } -.wrapper .topbar #topbar-icons .topbar-search:hover .topbar-search-icon { +body .wrapper .topbar #topbar-icons .topbar-search:hover .topbar-search-icon { color: #ffffff; } -.wrapper .topbar #omega-menu-button { +body .wrapper .topbar #saga-menu-button { display: inline-block; font-size: 28px; float: left; @@ -2039,10 +1866,10 @@ html { -webkit-transition: color 0.3s; transition: color 0.3s; } -.wrapper .topbar #omega-menu-button:hover { +body .wrapper .topbar #saga-menu-button:hover { color: #ffffff; } -.wrapper .topbar #options-menu-button { +body .wrapper .topbar #options-menu-button { display: none; font-size: 28px; float: right; @@ -2053,10 +1880,10 @@ html { -webkit-transition: color 0.3s; transition: color 0.3s; } -.wrapper .topbar #options-menu-button:hover { +body .wrapper .topbar #options-menu-button:hover { color: #ffffff; } -.wrapper .sidebar { +body .wrapper .sidebar { position: fixed; width: 250px; height: 100%; @@ -2074,24 +1901,24 @@ html { background-image: linear-gradient(top, #9da048, #9da048); filter: progid:DXImageTransform.Microsoft.gradient(start-colourStr='#9da048', end-colourStr='#9da048'); } -.wrapper .sidebar .logo { +body .wrapper .sidebar .logo { text-align: center; height: 50px; box-sizing: border-box; padding-top: .7em; } -.wrapper .sidebar .profile { +body .wrapper .sidebar .profile { display: block; text-decoration: none; text-align: center; padding: 20px 0; } -.wrapper .sidebar .profile img { +body .wrapper .sidebar .profile img { display: block; width: 56px; margin: 0 auto; } -.wrapper .sidebar .profile > a { +body .wrapper .sidebar .profile > a { display: inline-block; margin-bottom: 10px; color: #ffffff; @@ -2101,48 +1928,54 @@ html { -webkit-transition: color 0.3s; transition: color 0.3s; } -.wrapper .sidebar .profile > a .username { +body .wrapper .sidebar .profile > a .username { display: inline-block; margin-top: 8px; } -.wrapper .sidebar .profile > a .username:before { +body .wrapper .sidebar .profile > a .username:before { content: ""; display: block; } -.wrapper .sidebar .profile > a i { +body .wrapper .sidebar .profile > a i { display: inline-block; font-size: 16px; } -.wrapper .sidebar .profile > a:hover { +body .wrapper .sidebar .profile > a:hover { color: #ffffff; } -.wrapper .sidebar .profile > ul { +body .wrapper .sidebar .profile > ul { margin-bottom: -20px; display: none; background-color: #787c36; text-align: left; } -.wrapper .sidebar .profile > ul li a { +body .wrapper .sidebar .profile > ul li a { border: 0 none; } -.wrapper .sidebar .profile > ul li:last-child > a { +body .wrapper .sidebar .profile > ul li:last-child > a { border: 0 none; } -.wrapper .sidebar .sidebar-scroll-content { +body .wrapper .sidebar .sidebar-scroll-content { display: block; height: 100%; position: relative; } -.wrapper .sidebar .sidebar-scroll-content .menu-container { +body .wrapper .sidebar .sidebar-scroll-content .menu-container { padding-bottom: 80px; } -.wrapper .sidebar ul { +body .wrapper .sidebar .ui-menu { + background: inherit; list-style-type: none; margin: 0; padding: 0; box-sizing: border-box; + border-top: 1px solid #8f9341; + border-bottom: 1px solid #8f9341; } -.wrapper .sidebar ul li > a { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menu-child { + background-color: inherit; +} +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem .ui-menuitem-link { position: relative; color: #ffffff; text-decoration: none; @@ -2156,10 +1989,11 @@ html { -webkit-transition: padding-left 0.3s; transition: padding-left 0.3s; } -.wrapper .sidebar ul li > a span { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem .ui-menuitem-link span { + color: #ffffff; margin-left: .3em; } -.wrapper .sidebar ul li > a .menu-badge { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem .ui-menuitem-link .menu-badge { position: absolute; right: 15px; top: 14px; @@ -2170,23 +2004,24 @@ html { -webkit-border-radius: 50%; border-radius: 50%; } -.wrapper .sidebar ul li > a .fa:last-child { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem .ui-menuitem-link .fa:last-child { float: right; font-size: 16px; } -.wrapper .sidebar ul li > a:hover { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem .ui-menuitem-link:hover { padding-left: 20px; color: #ffffff; + background-color: inherit; } -.wrapper .sidebar ul li > a:hover .menu-badge { - color:   #ffffff; +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem .ui-menuitem-link:hover .menu-badge { + color:   #ffffff; } -.wrapper .sidebar ul li.active-menuitem > a { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem.active-menuitem > a { border-bottom: 0 none; background-color: #787c36; color: #ffffff; } -.wrapper .sidebar ul li.active-menuitem > a .fa:last-child { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem.active-menuitem > a .fa:last-child { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -2198,28 +2033,31 @@ html { text-align: center; font-size: 16px; } -.wrapper .sidebar ul li.active-menuitem > a .fa:last-child:before { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem.active-menuitem > a .fa:last-child:before { content: ""; } -.wrapper .sidebar ul li.active-menuitem > ul { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem.active-menuitem > ul { background-color: #787c36; } -.wrapper .sidebar ul li > ul { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem > ul { display: none; - padding-left: 20px; } -.wrapper .sidebar ul li > ul li a { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem > ul li a { padding: 10px 15px; font-size: 13px; border-top: 0 none; } -.wrapper .sidebar ul li > ul li:last-child > a { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem > ul li:last-child > a { border-bottom: 0 none; } -.wrapper .sidebar ul li:last-child > a { +body .wrapper .sidebar .ui-menu .ui-menu-list .ui-menuitem:last-child > a { border-bottom: 1px solid #8f9341; } -.wrapper .main { +body .wrapper .sidebar .ui-menu.ui-slidemenu .ui-slidemenu-backward { + background: inherit; + color: #ffffff; +} +body .wrapper .main { -moz-transition: margin-left 0.3s; -o-transition: margin-left 0.3s; -webkit-transition: margin-left 0.3s; @@ -2227,16 +2065,16 @@ html { margin-left: 250px; padding: 50px 16px 16px 16px; } -.wrapper .footer { +body .wrapper .footer { margin-left: 250px; height: 40px; background-color: #ffffff; padding: .7em 1.5em 0em 1.5em; } -.wrapper .footer img { +body .wrapper .footer img { vertical-align: middle; } -.wrapper .footer .footer-text { +body .wrapper .footer .footer-text { vertical-align: middle; } @@ -2780,7 +2618,7 @@ h2 { .landing-wrapper #introduction { padding-top: 80px; height: 623px; - background-image: url("#{resource['omega-layout:images/landing/section1_bg.jpg']}"); + background-image: url("#{resource['saga-layout:images/landing/section1_bg.jpg']}"); background-position: top left; background-repeat: no-repeat; background-size: cover; @@ -3137,12 +2975,47 @@ h2 { } } /* Theme */ -.ui-widget, +body .ui-widget, .ui-widget .ui-widget { font-size: 14px; text-decoration: none; } +.ui-timer { + background-color: #ffffff; + color: #000000; +} + +body .ui-inputfield { + padding: 4px; +} + +body .ui-button { + margin-right: 1.4px; +} +body .ui-button.ui-button-text-only .ui-button-text { + padding: .3em 1em; +} +body .ui-button.ui-button-icon-only .ui-button-text { + padding: .3em; +} + +body .ui-chkbox .ui-chkbox-box { + width: 16px; + height: 16px; +} +body .ui-chkbox .ui-chkbox-box.ui-state-active, body .ui-chkbox .ui-chkbox-box.ui-state-active.ui-state-hover { + border: 1px solid #696d31; + background: #787c36; + color: #fff; +} + +body .ui-selectbooleanbutton .ui-button.ui-state-active, body .ui-selectbooleanbutton .ui-button.ui-state-active:not(.ui-state-disabled):hover, body .ui-selectonebutton .ui-button.ui-state-active, body .ui-selectonebutton .ui-button.ui-state-active:not(.ui-state-disabled):hover, body .ui-selectmanybutton .ui-button.ui-state-active, body .ui-selectmanybutton .ui-button.ui-state-active:not(.ui-state-disabled):hover { + border: 1px solid #696d31; + background: #787c36; + color: #fff; +} + .ui-spinner .ui-spinner-up .ui-icon { margin-top: -4px; } @@ -3950,7 +3823,14 @@ h2 { margin-top: 10px; } -.ui-datatable .ui-row-toggler.ui-icon-circle-triangle-e { +body .ui-datatable .ui-widget-header { + color: #222; + font-weight: bold; +} +body .ui-datatable .ui-datatable-tablewrapper { + width: 100%; +} +body .ui-datatable .ui-row-toggler.ui-icon-circle-triangle-e { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -3961,10 +3841,10 @@ h2 { text-indent: 0px !important; text-align: center; } -.ui-datatable .ui-row-toggler.ui-icon-circle-triangle-e:before { +body .ui-datatable .ui-row-toggler.ui-icon-circle-triangle-e:before { content: ""; } -.ui-datatable .ui-row-toggler.ui-icon-circle-triangle-s { +body .ui-datatable .ui-row-toggler.ui-icon-circle-triangle-s { background-image: none !important; display: inline-block; font: normal normal normal 14px/1 FontAwesome; @@ -3975,23 +3855,66 @@ h2 { text-indent: 0px !important; text-align: center; } -.ui-datatable .ui-row-toggler.ui-icon-circle-triangle-s:before { +body .ui-datatable .ui-row-toggler.ui-icon-circle-triangle-s:before { content: ""; } -.ui-datatable .ui-radiobutton .ui-icon-bullet, .ui-datatable .ui-radiobutton .ui-icon-blank { +body .ui-datatable .ui-radiobutton .ui-icon-bullet, body .ui-datatable .ui-radiobutton .ui-icon-blank { color: #186ba0; } -.ui-datatable .ui-chkbox .ui-chkbox-box { +body .ui-datatable .ui-chkbox .ui-chkbox-box { color: #186ba0; } -.ui-datatable .ui-datatable-data tr.ui-state-hover { +body .ui-datatable .ui-paginator { + padding: 2px; +} +body .ui-datatable .ui-paginator .ui-paginator-current { + margin: 0; +} +body .ui-datatable .ui-paginator .ui-paginator-prev { + transform: none; +} +body .ui-datatable .ui-paginator .ui-paginator-pages { + vertical-align: inherit; +} +body .ui-datatable .ui-paginator .ui-paginator-pages .ui-paginator-page.ui-state-active { + background: #787c36; + color: #fff; + border-color: #696d31; +} +body .ui-datatable .ui-paginator .ui-paginator-pages .ui-paginator-page, body .ui-datatable .ui-paginator .ui-paginator-first, body .ui-datatable .ui-paginator .ui-paginator-prev, body .ui-datatable .ui-paginator .ui-paginator-next, body .ui-datatable .ui-paginator .ui-paginator-last { + line-height: inherit; + height: inherit; + vertical-align: middle; +} +body .ui-datatable thead th { + padding: 4px 10px; + background: #ffffff; +} +body .ui-datatable .ui-datatable-data .ui-datatable-odd { + background-color: #fafafb; +} +body .ui-datatable .ui-datatable-data > tr > td { + padding: 4px 10px; +} +body .ui-datatable .ui-datatable-data tr.ui-state-hover { border-bottom: #d5d5d5; } +body .ui-datatable .ui-datatable-footer { + background: #ffffff; + text-align: center; + padding: 4px 10px; +} -.ui-tabs .ui-tabs-nav li .ui-icon { +body .ui-tabs.ui-tabs-top > .ui-tabs-nav li.ui-tabs-header.ui-state-active { + border-color: #787c36; +} +body .ui-tabs .ui-tabs-nav li.ui-tabs-header.ui-state-active a { + color: #787c36; +} +body .ui-tabs .ui-tabs-nav li .ui-icon { margin-top: 0.6em; } -.ui-tabs .ui-tabs-nav li > a:focus { +body .ui-tabs .ui-tabs-nav li > a:focus { outline: 0 none; } diff --git a/jacq-input/src/main/webapp/resources/saga-layout/css/layout.css.map b/jacq-input/src/main/webapp/resources/saga-layout/css/layout.css.map new file mode 100644 index 00000000..7dbe668a --- /dev/null +++ b/jacq-input/src/main/webapp/resources/saga-layout/css/layout.css.map @@ -0,0 +1,7 @@ +{ +"version": 3, +"mappings": "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", +"sources": ["../../../../sass/_variables.scss","../../../../sass/_icons.scss","../../../../sass/_main.scss","../../../../sass/_login.scss","../../../../sass/_exception.scss","../../../../sass/_utils.scss","../../../../sass/_dashboard.scss","../../../../sass/_landing.scss","../../../../sass/_theme.scss"], +"names": [], +"file": "layout.css" +} \ No newline at end of file diff --git a/jacq-input/src/main/webapp/resources/omega-layout/css/nanoscroller.css b/jacq-input/src/main/webapp/resources/saga-layout/css/nanoscroller.css similarity index 100% rename from jacq-input/src/main/webapp/resources/omega-layout/css/nanoscroller.css rename to jacq-input/src/main/webapp/resources/saga-layout/css/nanoscroller.css diff --git a/jacq-input/src/main/webapp/resources/saga-layout/js/jacq.js b/jacq-input/src/main/webapp/resources/saga-layout/js/jacq.js new file mode 100644 index 00000000..aea1451c --- /dev/null +++ b/jacq-input/src/main/webapp/resources/saga-layout/js/jacq.js @@ -0,0 +1,6 @@ + +function showAlert(event) { + const wrapper = $(document.body).children('.wrapper'); + wrapper.toggleClass('sidebar-inactive-l'); + event.preventDefault(); +} \ No newline at end of file diff --git a/jacq-input/src/main/webapp/resources/omega-layout/js/layout.js b/jacq-input/src/main/webapp/resources/saga-layout/js/layout.js similarity index 53% rename from jacq-input/src/main/webapp/resources/omega-layout/js/layout.js rename to jacq-input/src/main/webapp/resources/saga-layout/js/layout.js index 56616539..aa6dba1b 100644 --- a/jacq-input/src/main/webapp/resources/omega-layout/js/layout.js +++ b/jacq-input/src/main/webapp/resources/saga-layout/js/layout.js @@ -1,33 +1,37 @@ -/** - * PrimeFaces Omega Layout +/** + * PrimeFaces Saga Layout */ -PrimeFaces.widget.Omega = PrimeFaces.widget.BaseWidget.extend({ - +PrimeFaces.widget.Saga = PrimeFaces.widget.BaseWidget.extend({ + init: function(cfg) { + console.log('-----------------------------> init'); this._super(cfg); this.wrapper = $(document.body).children('.wrapper'); - this.sidebar = this.wrapper.children('.sidebar'); + this.sidebar = this.wrapper.find('.sidebar'); this.menu = this.sidebar.find('div.menu'); this.menulinks = this.menu.find('a'); - this.menuButton = $('#omega-menu-button'); + this.menuButton = $('#saga-menu-button'); this.optionsMenuButton = $('#options-menu-button'); this.profileButton = $('#profile-button'); this.topbarIcons = $('#topbar-icons'); this.expandedMenuitems = this.expandedMenuitems||[]; - $('.nano').nanoScroller({flash: true}); - this.bindEvents(); + this.configButton = $('#layout-config-button'); + this.configurator = this.wrapper.children('.layout-config'); + this.configClicked = false; + + this.bindEvents(); this.restoreMenuState(); }, - + bindEvents: function() { var $this = this; - - this.menulinks.off('click').on('click', function(e) { + + this.menulinks.off('click.menulink').on('click.menulink', function(e) { var link = $(this), item = link.parent(), submenu = item.children('ul'); - + if(item.hasClass('active-menuitem')) { if(submenu.length) { $this.removeMenuitem(item.attr('id')); @@ -41,39 +45,36 @@ PrimeFaces.widget.Omega = PrimeFaces.widget.BaseWidget.extend({ $this.activate(item); $this.addMenuitem(item.attr('id')); } - - setTimeout(function() { - $(".nano").nanoScroller(); - }, 750); - + if(submenu.length) { e.preventDefault(); } }); - - this.menuButton.off('click').on('click', function(e) { + + this.menuButton.off('click.menubutton').on('click.menubutton', function(e) { + console.log('ich wurde angeklickt ---------------------->'); $(this).toggleClass('active'); - - if($this.isDesktop()) { + + if($this.isDesktop() && !$(document.body).hasClass('menu-layout-overlay')) { $this.wrapper.toggleClass('sidebar-inactive-l'); - + if($this.wrapper.hasClass('sidebar-inactive-l')) { $this.wrapper.removeClass('sidebar-active-m'); } } else { $this.wrapper.toggleClass('sidebar-active-m'); - + if($this.wrapper.hasClass('sidebar-active-m')) { $this.wrapper.removeClass('sidebar-inactive-l'); } } - + $this.topbarIcons.removeClass('topbar-icons-visible'); e.preventDefault(); }); - - this.profileButton.off('click').on('click', function(e) { + + this.profileButton.off('click.profilebutton').on('click.profilebutton', function(e) { var profileMenu = $(this).next('ul'); if(profileMenu.is(':visible')) { profileMenu.slideUp(); @@ -83,11 +84,11 @@ PrimeFaces.widget.Omega = PrimeFaces.widget.BaseWidget.extend({ profileMenu.slideDown(); $this.saveProfileMenuState(); } - + e.preventDefault(); }); - - this.optionsMenuButton.off('click').on('click', function(e) { + + this.optionsMenuButton.off('click.options-menubutton').on('click.options-menubutton', function(e) { if(!$this.animatingOptionsMenu) { $this.animatingOptionsMenu = true; if($this.topbarIcons.hasClass('topbar-icons-visible')) { @@ -106,33 +107,50 @@ PrimeFaces.widget.Omega = PrimeFaces.widget.BaseWidget.extend({ $this.wrapper.removeClass('sidebar-active-m sidebar-inactive-l'); e.preventDefault(); }); + + this.configButton.off('click.configbutton').on('click.configbutton', function(e) { + $this.configurator.toggleClass('layout-config-active'); + $this.configClicked = true; + }); + + this.configurator.off('click.config').on('click.config', function() { + $this.configClicked = true; + }); + + $(document.body).off('click.layoutBody').on('click.layoutBody', function() { + if (!$this.configClicked && $this.configurator.hasClass('layout-config-active')) { + $this.configurator.removeClass('layout-config-active'); + } + + $this.configClicked = false; + }); }, - + activate: function(item) { var submenu = item.children('ul'); item.addClass('active-menuitem'); - + if(submenu.length) { submenu.slideDown(); } }, - + deactivate: function(item) { var submenu = item.children('ul'); item.removeClass('active-menuitem'); - + if(submenu.length) { submenu.hide(); } }, - + deactivateItems: function(items, animate) { var $this = this; - + for(var i = 0; i < items.length; i++) { var item = items.eq(i), submenu = item.children('ul'); - + if(submenu.length) { if(item.hasClass('active-menuitem')) { var activeSubItems = item.find('.active-menuitem'); @@ -143,7 +161,7 @@ PrimeFaces.widget.Omega = PrimeFaces.widget.BaseWidget.extend({ $this.deactivate($(this)); }); }); - + $this.removeMenuitem(item.attr('id')); activeSubItems.each(function() { $this.removeMenuitem($(this).attr('id')); @@ -163,39 +181,39 @@ PrimeFaces.widget.Omega = PrimeFaces.widget.BaseWidget.extend({ } } }, - + removeMenuitem: function (id) { this.expandedMenuitems = $.grep(this.expandedMenuitems, function (value) { return value !== id; }); this.saveMenuState(); }, - + addMenuitem: function (id) { if ($.inArray(id, this.expandedMenuitems) === -1) { this.expandedMenuitems.push(id); } this.saveMenuState(); }, - + saveMenuState: function() { - $.cookie('omega_expandeditems', this.expandedMenuitems.join(','), {path: '/'}); + $.cookie('saga_expandeditems', this.expandedMenuitems.join(','), {path: '/'}); }, - + clearMenuState: function() { - $.removeCookie('omega_expandeditems', {path: '/'}); + $.removeCookie('saga_expandeditems', {path: '/'}); }, - + saveProfileMenuState: function() { - $.cookie('omega_profile_expanded', "1", {path: '/'}); + $.cookie('saga_profile_expanded', "1", {path: '/'}); }, - + clearProfileMenuState: function() { - $.removeCookie('omega_profile_expanded', {path: '/'}); + $.removeCookie('saga_profile_expanded', {path: '/'}); }, - + restoreMenuState: function() { - var menucookie = $.cookie('omega_expandeditems'); + var menucookie = $.cookie('saga_expandeditems'); if (menucookie) { this.expandedMenuitems = menucookie.split(','); for (var i = 0; i < this.expandedMenuitems.length; i++) { @@ -203,7 +221,7 @@ PrimeFaces.widget.Omega = PrimeFaces.widget.BaseWidget.extend({ if (id) { var menuitem = $("#" + this.expandedMenuitems[i].replace(/:/g, "\\:")); menuitem.addClass('active-menuitem'); - + var submenu = menuitem.children('ul'); if(submenu.length) { submenu.show(); @@ -211,17 +229,17 @@ PrimeFaces.widget.Omega = PrimeFaces.widget.BaseWidget.extend({ } } } - - var profileMenuCookie = $.cookie('omega_profile_expanded'); + + var profileMenuCookie = $.cookie('saga_profile_expanded'); if(profileMenuCookie) { this.profileButton.next('ul').show(); } }, - + isDesktop: function() { return window.innerWidth > 1024; }, - + clearActiveItems: function() { var activeItems = this.jq.find('li.active-menuitem'), subContainers = activeItems.children('ul'); @@ -231,9 +249,84 @@ PrimeFaces.widget.Omega = PrimeFaces.widget.BaseWidget.extend({ subContainers.hide(); } } - + }); +PrimeFaces.SagaConfigurator = { + + changeMenuMode: function(menuMode) { + var body = $(document.body); + if (menuMode === 'menu-layout-static') + body.addClass('menu-layout-static').removeClass('menu-layout-overlay'); + else + body.addClass('menu-layout-overlay').removeClass('menu-layout-static'); + }, + + updateInputStyle: function(value) { + if (value === 'filled') + $(document.body).addClass('ui-input-filled'); + else + $(document.body).removeClass('ui-input-filled'); + }, + + changeMenuColor: function(color) { + var wrapper = $(document.body).children('.wrapper'); + + if (color === 'light') + wrapper.addClass('layout-light'); + else + wrapper.removeClass('layout-light'); + }, + + changeLayout: function(layoutTheme) { + var linkElement = $('link[href*="layout-"]'); + var href = linkElement.attr('href'); + var startIndexOf = href.indexOf('layout-') + 7; + var endIndexOf = href.indexOf('.css'); + var currentColor = href.substring(startIndexOf, endIndexOf); + + this.replaceLink(linkElement, href.replace(currentColor, layoutTheme)); + }, + + changeScheme: function(theme) { + var library = 'primefaces-saga'; + var linkElement = $('link[href*="theme.css"]'); + var href = linkElement.attr('href'); + var index = href.indexOf(library) + 1; + var currentTheme = href.substring(index + library.length); + + this.replaceLink(linkElement, href.replace(currentTheme, theme)); + }, + + replaceLink: function(linkElement, href) { + PrimeFaces.ajax.RESOURCE = 'javax.faces.Resource'; + + var isIE = this.isIE(); + + if (isIE) { + linkElement.attr('href', href); + } + else { + var cloneLinkElement = linkElement.clone(false); + + cloneLinkElement.attr('href', href); + linkElement.after(cloneLinkElement); + + cloneLinkElement.off('load').on('load', function() { + linkElement.remove(); + }); + } + }, + + isIE: function() { + return /(MSIE|Trident\/|Edge\/)/i.test(navigator.userAgent); + }, + + beforeResourceChange: function() { + PrimeFaces.ajax.RESOURCE = null; //prevent resource append + }, +}; + /*! * jQuery Cookie Plugin v1.4.1 * https://github.com/carhartl/jquery-cookie @@ -352,14 +445,129 @@ PrimeFaces.widget.Omega = PrimeFaces.widget.BaseWidget.extend({ /* Issue #924 is fixed for 5.3+ and 6.0. (compatibility with 5.3) */ if(window['PrimeFaces'] && window['PrimeFaces'].widget.Dialog) { PrimeFaces.widget.Dialog = PrimeFaces.widget.Dialog.extend({ - + enableModality: function() { this._super(); $(document.body).children(this.jqId + '_modal').addClass('ui-dialog-mask'); }, - + syncWindowResize: function() {} }); } - +if (PrimeFaces.widget.SelectOneMenu) { + PrimeFaces.widget.SelectOneMenu = PrimeFaces.widget.SelectOneMenu.extend({ + init: function (cfg) { + this._super(cfg); + + var $this = this; + if (this.jq.parent().hasClass('ui-float-label')) { + this.m_panel = $(this.jqId + '_panel'); + this.m_focusInput = $(this.jqId + '_focus'); + + this.m_panel.addClass('ui-input-overlay-panel'); + this.jq.addClass('ui-inputwrapper'); + + if (this.input.val() != '') { + this.jq.addClass('ui-inputwrapper-filled'); + } + + this.input.off('change').on('change', function () { + $this.inputValueControl($(this)); + }); + + this.m_focusInput.on('focus.ui-selectonemenu', function () { + $this.jq.addClass('ui-inputwrapper-focus'); + }) + .on('blur.ui-selectonemenu', function () { + $this.jq.removeClass('ui-inputwrapper-focus'); + }); + + if (this.cfg.editable) { + this.label.on('input', function (e) { + $this.inputValueControl($(this)); + }).on('focus', function () { + $this.jq.addClass('ui-inputwrapper-focus'); + }).on('blur', function () { + $this.jq.removeClass('ui-inputwrapper-focus'); + $this.inputValueControl($(this)); + }); + } + } + }, + + inputValueControl: function (input) { + if (input.val() != '') + this.jq.addClass('ui-inputwrapper-filled'); + else + this.jq.removeClass('ui-inputwrapper-filled'); + } + }); +} + +if (PrimeFaces.widget.Chips) { + PrimeFaces.widget.Chips = PrimeFaces.widget.Chips.extend({ + init: function (cfg) { + this._super(cfg); + + var $this = this; + if (this.jq.parent().hasClass('ui-float-label')) { + this.jq.addClass('ui-inputwrapper'); + + if ($this.jq.find('.ui-chips-token').length !== 0) { + this.jq.addClass('ui-inputwrapper-filled'); + } + + this.input.on('focus.ui-chips', function () { + $this.jq.addClass('ui-inputwrapper-focus'); + }).on('input.ui-chips', function () { + $this.inputValueControl(); + }).on('blur.ui-chips', function () { + $this.jq.removeClass('ui-inputwrapper-focus'); + $this.inputValueControl(); + }); + + } + }, + + inputValueControl: function () { + if (this.jq.find('.ui-chips-token').length !== 0 || this.input.val() != '') + this.jq.addClass('ui-inputwrapper-filled'); + else + this.jq.removeClass('ui-inputwrapper-filled'); + } + }); +} + +if (PrimeFaces.widget.DatePicker) { + PrimeFaces.widget.DatePicker = PrimeFaces.widget.DatePicker.extend({ + init: function (cfg) { + this._super(cfg); + + var $this = this; + if (this.jq.parent().hasClass('ui-float-label') && !this.cfg.inline) { + if (this.input.val() != '') { + this.jq.addClass('ui-inputwrapper-filled'); + } + + this.jqEl.off('focus.ui-datepicker blur.ui-datepicker change.ui-datepicker') + .on('focus.ui-datepicker', function () { + $this.jq.addClass('ui-inputwrapper-focus'); + }) + .on('blur.ui-datepicker', function () { + $this.jq.removeClass('ui-inputwrapper-focus'); + }) + .on('change.ui-datepicker', function () { + $this.inputValueControl($(this)); + }); + } + }, + + inputValueControl: function (input) { + if (input.val() != '') + this.jq.addClass('ui-inputwrapper-filled'); + else + this.jq.removeClass('ui-inputwrapper-filled'); + } + }); +} \ No newline at end of file diff --git a/jacq-input/src/main/webapp/resources/omega-layout/js/nanoscroller.js b/jacq-input/src/main/webapp/resources/saga-layout/js/nanoscroller.js similarity index 100% rename from jacq-input/src/main/webapp/resources/omega-layout/js/nanoscroller.js rename to jacq-input/src/main/webapp/resources/saga-layout/js/nanoscroller.js diff --git a/jacq-input/src/main/webapp/resources/saga-layout/js/prism.js b/jacq-input/src/main/webapp/resources/saga-layout/js/prism.js new file mode 100644 index 00000000..4cbeb12d --- /dev/null +++ b/jacq-input/src/main/webapp/resources/saga-layout/js/prism.js @@ -0,0 +1,10 @@ +/* PrismJS 1.22.0 +https://prismjs.com/download.html#themes=prism-coy&languages=markup+css+clike+javascript+bash+java&plugins=line-numbers */ +var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(u){var c=/\blang(?:uage)?-([\w-]+)\b/i,n=0,_={manual:u.Prism&&u.Prism.manual,disableWorkerMessageHandler:u.Prism&&u.Prism.disableWorkerMessageHandler,util:{encode:function e(n){return n instanceof M?new M(n.type,e(n.content),n.alias):Array.isArray(n)?n.map(e):n.replace(/&/g,"&").replace(/=l.reach);y+=m.value.length,m=m.next){var k=m.value;if(t.length>n.length)return;if(!(k instanceof M)){var b,x=1;if(h){if(!(b=W(p,y,n,f)))break;var w=b.index,A=b.index+b[0].length,P=y;for(P+=m.value.length;P<=w;)m=m.next,P+=m.value.length;if(P-=m.value.length,y=P,m.value instanceof M)continue;for(var S=m;S!==t.tail&&(Pl.reach&&(l.reach=N);var j=m.prev;O&&(j=z(t,j,O),y+=O.length),I(t,j,x);var C=new M(o,g?_.tokenize(E,g):E,d,E);m=z(t,j,C),L&&z(t,m,L),1"+a.content+""},!u.document)return u.addEventListener&&(_.disableWorkerMessageHandler||u.addEventListener("message",function(e){var n=JSON.parse(e.data),t=n.language,r=n.code,a=n.immediateClose;u.postMessage(_.highlight(r,_.languages[t],t)),a&&u.close()},!1)),_;var e=_.util.currentScript();function t(){_.manual||_.highlightAll()}if(e&&(_.filename=e.src,e.hasAttribute("data-manual")&&(_.manual=!0)),!_.manual){var r=document.readyState;"loading"===r||"interactive"===r&&e&&e.defer?document.addEventListener("DOMContentLoaded",t):window.requestAnimationFrame?window.requestAnimationFrame(t):window.setTimeout(t,16)}return _}(_self);"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism); +Prism.languages.markup={comment://,prolog:/<\?[\s\S]+?\?>/,doctype:{pattern:/"'[\]]|"[^"]*"|'[^']*')+(?:\[(?:[^<"'\]]|"[^"]*"|'[^']*'|<(?!!--)|)*\]\s*)?>/i,greedy:!0,inside:{"internal-subset":{pattern:/(\[)[\s\S]+(?=\]>$)/,lookbehind:!0,greedy:!0,inside:null},string:{pattern:/"[^"]*"|'[^']*'/,greedy:!0},punctuation:/^$|[[\]]/,"doctype-tag":/^DOCTYPE/,name:/[^\s<>'"]+/}},cdata://i,tag:{pattern:/<\/?(?!\d)[^\s>\/=$<%]+(?:\s(?:\s*[^\s>\/=]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))|(?=[\s/>])))+)?\s*\/?>/,greedy:!0,inside:{tag:{pattern:/^<\/?[^\s>\/]+/,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+)/,inside:{punctuation:[{pattern:/^=/,alias:"attr-equals"},/"|'/]}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:[{pattern:/&[\da-z]{1,8};/i,alias:"named-entity"},/&#x?[\da-f]{1,8};/i]},Prism.languages.markup.tag.inside["attr-value"].inside.entity=Prism.languages.markup.entity,Prism.languages.markup.doctype.inside["internal-subset"].inside=Prism.languages.markup,Prism.hooks.add("wrap",function(a){"entity"===a.type&&(a.attributes.title=a.content.replace(/&/,"&"))}),Object.defineProperty(Prism.languages.markup.tag,"addInlined",{value:function(a,e){var s={};s["language-"+e]={pattern:/(^$)/i,lookbehind:!0,inside:Prism.languages[e]},s.cdata=/^$/i;var n={"included-cdata":{pattern://i,inside:s}};n["language-"+e]={pattern:/[\s\S]+/,inside:Prism.languages[e]};var t={};t[a]={pattern:RegExp("(<__[^>]*>)(?:))*\\]\\]>|(?!)".replace(/__/g,function(){return a}),"i"),lookbehind:!0,greedy:!0,inside:n},Prism.languages.insertBefore("markup","cdata",t)}}),Prism.languages.html=Prism.languages.markup,Prism.languages.mathml=Prism.languages.markup,Prism.languages.svg=Prism.languages.markup,Prism.languages.xml=Prism.languages.extend("markup",{}),Prism.languages.ssml=Prism.languages.xml,Prism.languages.atom=Prism.languages.xml,Prism.languages.rss=Prism.languages.xml; +!function(s){var e=/("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/;s.languages.css={comment:/\/\*[\s\S]*?\*\//,atrule:{pattern:/@[\w-](?:[^;{\s]|\s+(?![\s{]))*(?:;|(?=\s*\{))/,inside:{rule:/^@[\w-]+/,"selector-function-argument":{pattern:/(\bselector\s*\(\s*(?![\s)]))(?:[^()\s]|\s+(?![\s)])|\((?:[^()]|\([^()]*\))*\))+(?=\s*\))/,lookbehind:!0,alias:"selector"},keyword:{pattern:/(^|[^\w-])(?:and|not|only|or)(?![\w-])/,lookbehind:!0}}},url:{pattern:RegExp("\\burl\\((?:"+e.source+"|(?:[^\\\\\r\n()\"']|\\\\[^])*)\\)","i"),greedy:!0,inside:{function:/^url/i,punctuation:/^\(|\)$/,string:{pattern:RegExp("^"+e.source+"$"),alias:"url"}}},selector:RegExp("[^{}\\s](?:[^{};\"'\\s]|\\s+(?![\\s{])|"+e.source+")*(?=\\s*\\{)"),string:{pattern:e,greedy:!0},property:/(?!\s)[-_a-z\xA0-\uFFFF](?:(?!\s)[-\w\xA0-\uFFFF])*(?=\s*:)/i,important:/!important\b/i,function:/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:,]/},s.languages.css.atrule.inside.rest=s.languages.css;var t=s.languages.markup;t&&(t.tag.addInlined("style","css"),s.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/(^|["'\s])style\s*=\s*(?:"[^"]*"|'[^']*')/i,lookbehind:!0,inside:{"attr-value":{pattern:/=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+)/,inside:{style:{pattern:/(["'])[\s\S]+(?=["']$)/,lookbehind:!0,alias:"language-css",inside:s.languages.css},punctuation:[{pattern:/^=/,alias:"attr-equals"},/"|'/]}},"attr-name":/^style/i}}},t.tag))}(Prism); +Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0,greedy:!0}],string:{pattern:/(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,greedy:!0},"class-name":{pattern:/(\b(?:class|interface|extends|implements|trait|instanceof|new)\s+|\bcatch\s+\()[\w.\\]+/i,lookbehind:!0,inside:{punctuation:/[.\\]/}},keyword:/\b(?:if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,boolean:/\b(?:true|false)\b/,function:/\w+(?=\()/,number:/\b0x[\da-f]+\b|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?/i,operator:/[<>]=?|[!=]=?=?|--?|\+\+?|&&?|\|\|?|[?*/~^%]/,punctuation:/[{}[\];(),.:]/}; +Prism.languages.javascript=Prism.languages.extend("clike",{"class-name":[Prism.languages.clike["class-name"],{pattern:/(^|[^$\w\xA0-\uFFFF])(?!\s)[_$A-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\.(?:prototype|constructor))/,lookbehind:!0}],keyword:[{pattern:/((?:^|})\s*)(?:catch|finally)\b/,lookbehind:!0},{pattern:/(^|[^.]|\.\.\.\s*)\b(?:as|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|for|from|function|(?:get|set)(?=\s*[\[$\w\xA0-\uFFFF])|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,lookbehind:!0}],function:/#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/,number:/\b(?:(?:0[xX](?:[\dA-Fa-f](?:_[\dA-Fa-f])?)+|0[bB](?:[01](?:_[01])?)+|0[oO](?:[0-7](?:_[0-7])?)+)n?|(?:\d(?:_\d)?)+n|NaN|Infinity)\b|(?:\b(?:\d(?:_\d)?)+\.?(?:\d(?:_\d)?)*|\B\.(?:\d(?:_\d)?)+)(?:[Ee][+-]?(?:\d(?:_\d)?)+)?/,operator:/--|\+\+|\*\*=?|=>|&&=?|\|\|=?|[!=]==|<<=?|>>>?=?|[-+*/%&|^!=<>]=?|\.{3}|\?\?=?|\?\.?|[~:]/}),Prism.languages.javascript["class-name"][0].pattern=/(\b(?:class|interface|extends|implements|instanceof|new)\s+)[\w.\\]+/,Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/,lookbehind:!0,greedy:!0,inside:{"regex-source":{pattern:/^(\/)[\s\S]+(?=\/[a-z]*$)/,lookbehind:!0,alias:"language-regex",inside:Prism.languages.regex},"regex-flags":/[a-z]+$/,"regex-delimiter":/^\/|\/$/}},"function-variable":{pattern:/#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*[=:]\s*(?:async\s*)?(?:\bfunction\b|(?:\((?:[^()]|\([^()]*\))*\)|(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)\s*=>))/,alias:"function"},parameter:[{pattern:/(function(?:\s+(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)?\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\))/,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*=>)/i,inside:Prism.languages.javascript},{pattern:/(\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*=>)/,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/((?:\b|\s|^)(?!(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)(?![$\w\xA0-\uFFFF]))(?:(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*\s*)\(\s*|\]\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*\{)/,lookbehind:!0,inside:Prism.languages.javascript}],constant:/\b[A-Z](?:[A-Z_]|\dx?)*\b/}),Prism.languages.insertBefore("javascript","string",{"template-string":{pattern:/`(?:\\[\s\S]|\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}|(?!\${)[^\\`])*`/,greedy:!0,inside:{"template-punctuation":{pattern:/^`|`$/,alias:"string"},interpolation:{pattern:/((?:^|[^\\])(?:\\{2})*)\${(?:[^{}]|{(?:[^{}]|{[^}]*})*})+}/,lookbehind:!0,inside:{"interpolation-punctuation":{pattern:/^\${|}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.markup.tag.addInlined("script","javascript"),Prism.languages.js=Prism.languages.javascript; +!function(e){var t="\\b(?:BASH|BASHOPTS|BASH_ALIASES|BASH_ARGC|BASH_ARGV|BASH_CMDS|BASH_COMPLETION_COMPAT_DIR|BASH_LINENO|BASH_REMATCH|BASH_SOURCE|BASH_VERSINFO|BASH_VERSION|COLORTERM|COLUMNS|COMP_WORDBREAKS|DBUS_SESSION_BUS_ADDRESS|DEFAULTS_PATH|DESKTOP_SESSION|DIRSTACK|DISPLAY|EUID|GDMSESSION|GDM_LANG|GNOME_KEYRING_CONTROL|GNOME_KEYRING_PID|GPG_AGENT_INFO|GROUPS|HISTCONTROL|HISTFILE|HISTFILESIZE|HISTSIZE|HOME|HOSTNAME|HOSTTYPE|IFS|INSTANCE|JOB|LANG|LANGUAGE|LC_ADDRESS|LC_ALL|LC_IDENTIFICATION|LC_MEASUREMENT|LC_MONETARY|LC_NAME|LC_NUMERIC|LC_PAPER|LC_TELEPHONE|LC_TIME|LESSCLOSE|LESSOPEN|LINES|LOGNAME|LS_COLORS|MACHTYPE|MAILCHECK|MANDATORY_PATH|NO_AT_BRIDGE|OLDPWD|OPTERR|OPTIND|ORBIT_SOCKETDIR|OSTYPE|PAPERSIZE|PATH|PIPESTATUS|PPID|PS1|PS2|PS3|PS4|PWD|RANDOM|REPLY|SECONDS|SELINUX_INIT|SESSION|SESSIONTYPE|SESSION_MANAGER|SHELL|SHELLOPTS|SHLVL|SSH_AUTH_SOCK|TERM|UID|UPSTART_EVENTS|UPSTART_INSTANCE|UPSTART_JOB|UPSTART_SESSION|USER|WINDOWID|XAUTHORITY|XDG_CONFIG_DIRS|XDG_CURRENT_DESKTOP|XDG_DATA_DIRS|XDG_GREETER_DATA_DIR|XDG_MENU_PREFIX|XDG_RUNTIME_DIR|XDG_SEAT|XDG_SEAT_PATH|XDG_SESSION_DESKTOP|XDG_SESSION_ID|XDG_SESSION_PATH|XDG_SESSION_TYPE|XDG_VTNR|XMODIFIERS)\\b",n={pattern:/(^(["']?)\w+\2)[ \t]+\S.*/,lookbehind:!0,alias:"punctuation",inside:null},a={bash:n,environment:{pattern:RegExp("\\$"+t),alias:"constant"},variable:[{pattern:/\$?\(\([\s\S]+?\)\)/,greedy:!0,inside:{variable:[{pattern:/(^\$\(\([\s\S]+)\)\)/,lookbehind:!0},/^\$\(\(/],number:/\b0x[\dA-Fa-f]+\b|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:[Ee]-?\d+)?/,operator:/--?|-=|\+\+?|\+=|!=?|~|\*\*?|\*=|\/=?|%=?|<<=?|>>=?|<=?|>=?|==?|&&?|&=|\^=?|\|\|?|\|=|\?|:/,punctuation:/\(\(?|\)\)?|,|;/}},{pattern:/\$\((?:\([^)]+\)|[^()])+\)|`[^`]+`/,greedy:!0,inside:{variable:/^\$\(|^`|\)$|`$/}},{pattern:/\$\{[^}]+\}/,greedy:!0,inside:{operator:/:[-=?+]?|[!\/]|##?|%%?|\^\^?|,,?/,punctuation:/[\[\]]/,environment:{pattern:RegExp("(\\{)"+t),lookbehind:!0,alias:"constant"}}},/\$(?:\w+|[#?*!@$])/],entity:/\\(?:[abceEfnrtv\\"]|O?[0-7]{1,3}|x[0-9a-fA-F]{1,2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})/};e.languages.bash={shebang:{pattern:/^#!\s*\/.*/,alias:"important"},comment:{pattern:/(^|[^"{\\$])#.*/,lookbehind:!0},"function-name":[{pattern:/(\bfunction\s+)\w+(?=(?:\s*\(?:\s*\))?\s*\{)/,lookbehind:!0,alias:"function"},{pattern:/\b\w+(?=\s*\(\s*\)\s*\{)/,alias:"function"}],"for-or-select":{pattern:/(\b(?:for|select)\s+)\w+(?=\s+in\s)/,alias:"variable",lookbehind:!0},"assign-left":{pattern:/(^|[\s;|&]|[<>]\()\w+(?=\+?=)/,inside:{environment:{pattern:RegExp("(^|[\\s;|&]|[<>]\\()"+t),lookbehind:!0,alias:"constant"}},alias:"variable",lookbehind:!0},string:[{pattern:/((?:^|[^<])<<-?\s*)(\w+?)\s[\s\S]*?(?:\r?\n|\r)\2/,lookbehind:!0,greedy:!0,inside:a},{pattern:/((?:^|[^<])<<-?\s*)(["'])(\w+)\2\s[\s\S]*?(?:\r?\n|\r)\3/,lookbehind:!0,greedy:!0,inside:{bash:n}},{pattern:/(^|[^\\](?:\\\\)*)(["'])(?:\\[\s\S]|\$\([^)]+\)|\$(?!\()|`[^`]+`|(?!\2)[^\\`$])*\2/,lookbehind:!0,greedy:!0,inside:a}],environment:{pattern:RegExp("\\$?"+t),alias:"constant"},variable:a.variable,function:{pattern:/(^|[\s;|&]|[<>]\()(?:add|apropos|apt|aptitude|apt-cache|apt-get|aspell|automysqlbackup|awk|basename|bash|bc|bconsole|bg|bzip2|cal|cat|cfdisk|chgrp|chkconfig|chmod|chown|chroot|cksum|clear|cmp|column|comm|composer|cp|cron|crontab|csplit|curl|cut|date|dc|dd|ddrescue|debootstrap|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|du|egrep|eject|env|ethtool|expand|expect|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|git|gparted|grep|groupadd|groupdel|groupmod|groups|grub-mkconfig|gzip|halt|head|hg|history|host|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|ip|jobs|join|kill|killall|less|link|ln|locate|logname|logrotate|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|lynx|make|man|mc|mdadm|mkconfig|mkdir|mke2fs|mkfifo|mkfs|mkisofs|mknod|mkswap|mmv|more|most|mount|mtools|mtr|mutt|mv|nano|nc|netstat|nice|nl|nohup|notify-send|npm|nslookup|op|open|parted|passwd|paste|pathchk|ping|pkill|pnpm|popd|pr|printcap|printenv|ps|pushd|pv|quota|quotacheck|quotactl|ram|rar|rcp|reboot|remsync|rename|renice|rev|rm|rmdir|rpm|rsync|scp|screen|sdiff|sed|sendmail|seq|service|sftp|sh|shellcheck|shuf|shutdown|sleep|slocate|sort|split|ssh|stat|strace|su|sudo|sum|suspend|swapon|sync|tac|tail|tar|tee|time|timeout|top|touch|tr|traceroute|tsort|tty|umount|uname|unexpand|uniq|units|unrar|unshar|unzip|update-grub|uptime|useradd|userdel|usermod|users|uudecode|uuencode|v|vdir|vi|vim|virsh|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yarn|yes|zenity|zip|zsh|zypper)(?=$|[)\s;|&])/,lookbehind:!0},keyword:{pattern:/(^|[\s;|&]|[<>]\()(?:if|then|else|elif|fi|for|while|in|case|esac|function|select|do|done|until)(?=$|[)\s;|&])/,lookbehind:!0},builtin:{pattern:/(^|[\s;|&]|[<>]\()(?:\.|:|break|cd|continue|eval|exec|exit|export|getopts|hash|pwd|readonly|return|shift|test|times|trap|umask|unset|alias|bind|builtin|caller|command|declare|echo|enable|help|let|local|logout|mapfile|printf|read|readarray|source|type|typeset|ulimit|unalias|set|shopt)(?=$|[)\s;|&])/,lookbehind:!0,alias:"class-name"},boolean:{pattern:/(^|[\s;|&]|[<>]\()(?:true|false)(?=$|[)\s;|&])/,lookbehind:!0},"file-descriptor":{pattern:/\B&\d\b/,alias:"important"},operator:{pattern:/\d?<>|>\||\+=|==?|!=?|=~|<<[<-]?|[&\d]?>>|\d?[<>]&?|&[>&]?|\|[&|]?|<=?|>=?/,inside:{"file-descriptor":{pattern:/^\d/,alias:"important"}}},punctuation:/\$?\(\(?|\)\)?|\.\.|[{}[\];\\]/,number:{pattern:/(^|\s)(?:[1-9]\d*|0)(?:[.,]\d+)?\b/,lookbehind:!0}},n.inside=e.languages.bash;for(var s=["comment","function-name","for-or-select","assign-left","string","environment","function","keyword","builtin","boolean","file-descriptor","operator","punctuation","number"],i=a.variable[1].inside,o=0;o>>?=?|->|--|\+\+|&&|\|\||::|[?:~]|[-+*/%&|^!=<>]=?)/m,lookbehind:!0}}),e.languages.insertBefore("java","string",{"triple-quoted-string":{pattern:/"""[ \t]*[\r\n](?:(?:"|"")?(?:\\.|[^"\\]))*"""/,greedy:!0,alias:"string"}}),e.languages.insertBefore("java","class-name",{annotation:{pattern:/(^|[^.])@\w+(?:\s*\.\s*\w+)*/,lookbehind:!0,alias:"punctuation"},generics:{pattern:/<(?:[\w\s,.&?]|<(?:[\w\s,.&?]|<(?:[\w\s,.&?]|<[\w\s,.&?]*>)*>)*>)*>/,inside:{"class-name":a,keyword:t,punctuation:/[<>(),.:]/,operator:/[?&|]/}},namespace:{pattern:RegExp("(\\b(?:exports|import(?:\\s+static)?|module|open|opens|package|provides|requires|to|transitive|uses|with)\\s+)(?!)[a-z]\\w*(?:\\.[a-z]\\w*)*\\.?".replace(//g,function(){return t.source})),lookbehind:!0,inside:{punctuation:/\./}}})}(Prism); +!function(){if("undefined"!=typeof self&&self.Prism&&self.document){var o="line-numbers",a=/\n(?!$)/g,e=Prism.plugins.lineNumbers={getLine:function(e,n){if("PRE"===e.tagName&&e.classList.contains(o)){var t=e.querySelector(".line-numbers-rows");if(t){var i=parseInt(e.getAttribute("data-start"),10)||1,r=i+(t.children.length-1);n");(i=document.createElement("span")).setAttribute("aria-hidden","true"),i.className="line-numbers-rows",i.innerHTML=l,t.hasAttribute("data-start")&&(t.style.counterReset="linenumber "+(parseInt(t.getAttribute("data-start"),10)-1)),e.element.appendChild(i),u([t]),Prism.hooks.run("line-numbers",e)}}}),Prism.hooks.add("line-numbers",function(e){e.plugins=e.plugins||{},e.plugins.lineNumbers=!0})}function u(e){if(0!=(e=e.filter(function(e){var n=t(e)["white-space"];return"pre-wrap"===n||"pre-line"===n})).length){var n=e.map(function(e){var n=e.querySelector("code"),t=e.querySelector(".line-numbers-rows");if(n&&t){var i=e.querySelector(".line-numbers-sizer"),r=n.textContent.split(a);i||((i=document.createElement("span")).className="line-numbers-sizer",n.appendChild(i)),i.innerHTML="0",i.style.display="block";var s=i.getBoundingClientRect().height;return i.innerHTML="",{element:e,lines:r,lineHeights:[],oneLinerHeight:s,sizer:i}}}).filter(Boolean);n.forEach(function(e){var i=e.sizer,n=e.lines,r=e.lineHeights,s=e.oneLinerHeight;r[n.length-1]=void 0,n.forEach(function(e,n){if(e&&1 ${project.build.directory}/endorsed UTF-8 - 1.8 - 1.8 + 17 + 17 @@ -34,13 +34,13 @@ org.jboss.resteasy resteasy-client - 3.0.10.Final + 6.2.4.Final provided - javax - javaee-api - 7.0 + jakarta.platform + jakarta.jakartaee-api + 9.1.0 provided diff --git a/jacq-names/src/main/java/org/jacq/service/names/manager/CommonNameManager.java b/jacq-names/src/main/java/org/jacq/service/names/manager/CommonNameManager.java index d3c8b3d6..bc83fcdd 100644 --- a/jacq-names/src/main/java/org/jacq/service/names/manager/CommonNameManager.java +++ b/jacq-names/src/main/java/org/jacq/service/names/manager/CommonNameManager.java @@ -15,28 +15,24 @@ */ package org.jacq.service.names.manager; +import jakarta.inject.Named; import org.jacq.common.manager.NameParserManager; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.ManagedBean; -import javax.annotation.Resource; -import javax.enterprise.concurrent.ManagedExecutorService; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.transaction.Transactional; +import jakarta.annotation.Resource; +import jakarta.enterprise.concurrent.ManagedExecutorService; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.transaction.Transactional; import org.jacq.common.model.jpa.openup.TblCommonNamesCache; import org.jacq.common.model.jpa.openup.TblScientificNameCache; import org.jacq.common.model.names.CommonName; @@ -52,7 +48,7 @@ * * @author wkoller */ -@ManagedBean +@Named @RequestScoped @Transactional public class CommonNameManager { diff --git a/jacq-names/src/main/java/org/jacq/service/names/manager/ScientificNameManager.java b/jacq-names/src/main/java/org/jacq/service/names/manager/ScientificNameManager.java index 7d1755d8..629eb66e 100644 --- a/jacq-names/src/main/java/org/jacq/service/names/manager/ScientificNameManager.java +++ b/jacq-names/src/main/java/org/jacq/service/names/manager/ScientificNameManager.java @@ -15,20 +15,15 @@ */ package org.jacq.service.names.manager; +import jakarta.inject.Named; import java.util.ArrayList; import java.util.List; -import javax.annotation.ManagedBean; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.transaction.Transactional; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.transaction.Transactional; import org.apache.commons.lang3.StringUtils; -import org.jacq.common.model.jpa.TblCultivar; -import org.jacq.common.model.jpa.TblHabitusType; -import org.jacq.common.model.jpa.TblNomEpithet; -import org.jacq.common.model.jpa.TblNomName; -import org.jacq.common.model.jpa.TblNomSubstantive; -import org.jacq.common.model.jpa.TblScientificNameInformation; +import org.jacq.common.model.jpa.*; import org.jacq.common.model.rest.CultivarResult; import org.jacq.common.model.rest.HabitusTypeResult; import org.jacq.common.model.rest.ScientificNameInformationResult; @@ -40,7 +35,7 @@ * * @author wkoller */ -@ManagedBean +@Named public class ScientificNameManager { @PersistenceContext(unitName = "jacq-names") @@ -119,10 +114,13 @@ else if (firstEpithetList != null && firstEpithetList.size() > 0) { */ @Transactional public ScientificNameResult load(Long scientificNameId) { - TblNomName nomName = em.find(TblNomName.class, scientificNameId); +// TblNomName nomName = em.find(TblNomName.class, scientificNameId); + TypedQuery genusQuery = em.createNamedQuery("TblNomName.findNameIdAndScientificName", ScientificName.class); + genusQuery.setParameter("scientificNameId", scientificNameId); - if (nomName != null) { - return new ScientificNameResult(nomName); + ScientificName scientificName = genusQuery.getSingleResult(); + if (scientificName != null) { + return new ScientificNameResult(scientificName.getScientificName(), scientificName.getNameId()); } return null; diff --git a/jacq-names/src/main/java/org/jacq/service/names/sources/dnpgoth/DnpGoThSource.java b/jacq-names/src/main/java/org/jacq/service/names/sources/dnpgoth/DnpGoThSource.java index fd54bd8c..82603cf6 100644 --- a/jacq-names/src/main/java/org/jacq/service/names/sources/dnpgoth/DnpGoThSource.java +++ b/jacq-names/src/main/java/org/jacq/service/names/sources/dnpgoth/DnpGoThSource.java @@ -15,14 +15,14 @@ */ package org.jacq.service.names.sources.dnpgoth; +import jakarta.inject.Named; import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.core.Response; import org.jacq.common.model.names.CommonName; import org.jacq.common.model.names.NameParserResponse; import org.jacq.service.names.sources.CommonNamesSource; @@ -33,7 +33,7 @@ * * @author wkoller */ -@ManagedBean +@Named public class DnpGoThSource implements CommonNamesSource { private static final Logger LOGGER = Logger.getLogger(DnpGoThSource.class.getName()); diff --git a/jacq-names/src/main/java/org/jacq/service/names/sources/dnpgoth/DnpGoThWebSearch.java b/jacq-names/src/main/java/org/jacq/service/names/sources/dnpgoth/DnpGoThWebSearch.java index 6a16c746..0ace947a 100644 --- a/jacq-names/src/main/java/org/jacq/service/names/sources/dnpgoth/DnpGoThWebSearch.java +++ b/jacq-names/src/main/java/org/jacq/service/names/sources/dnpgoth/DnpGoThWebSearch.java @@ -15,14 +15,14 @@ */ package org.jacq.service.names.sources.dnpgoth; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * Interface definition for http://www.dnp.go.th web search diff --git a/jacq-names/src/main/java/org/jacq/service/names/sources/util/SourcesUtil.java b/jacq-names/src/main/java/org/jacq/service/names/sources/util/SourcesUtil.java index 226e26e3..1fe7dd26 100644 --- a/jacq-names/src/main/java/org/jacq/service/names/sources/util/SourcesUtil.java +++ b/jacq-names/src/main/java/org/jacq/service/names/sources/util/SourcesUtil.java @@ -15,12 +15,11 @@ */ package org.jacq.service.names.sources.util; -import org.jacq.common.rest.filter.RequestDebugFilter; -import org.jboss.resteasy.client.jaxrs.ResteasyClient; -import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; -import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; import org.jacq.service.names.sources.dnpgoth.DnpGoThWebSearch; import org.jacq.service.names.sources.ylist.YListWebSearch; +import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; /** * Helper class for providing quick access to source-services @@ -56,9 +55,8 @@ public static YListWebSearch getYListWebSearch() { * @return */ protected static T getProxy(Class serviceInterfaceClass, String serviceURI) { - ResteasyClient resteasyClient = new ResteasyClientBuilder().connectionPoolSize(20).build(); - //resteasyClient.register(new RequestDebugFilter()); - ResteasyWebTarget resteasyWebTarget = resteasyClient.target(serviceURI); + Client resteasyClient = ClientBuilder.newBuilder().build(); + ResteasyWebTarget resteasyWebTarget = (ResteasyWebTarget) resteasyClient.target(serviceURI); return (T) resteasyWebTarget.proxy(serviceInterfaceClass); } } diff --git a/jacq-names/src/main/java/org/jacq/service/names/sources/ylist/YListSource.java b/jacq-names/src/main/java/org/jacq/service/names/sources/ylist/YListSource.java index 623f3715..dfbc90ae 100644 --- a/jacq-names/src/main/java/org/jacq/service/names/sources/ylist/YListSource.java +++ b/jacq-names/src/main/java/org/jacq/service/names/sources/ylist/YListSource.java @@ -15,15 +15,14 @@ */ package org.jacq.service.names.sources.ylist; -import org.jacq.service.names.sources.dnpgoth.*; +import jakarta.inject.Named; import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.core.Response; import org.jacq.common.model.names.CommonName; import org.jacq.common.model.names.NameParserResponse; import org.jacq.service.names.sources.CommonNamesSource; @@ -34,7 +33,7 @@ * * @author wkoller */ -@ManagedBean +@Named public class YListSource implements CommonNamesSource { private static final Logger LOGGER = Logger.getLogger(YListSource.class.getName()); diff --git a/jacq-names/src/main/java/org/jacq/service/names/sources/ylist/YListWebSearch.java b/jacq-names/src/main/java/org/jacq/service/names/sources/ylist/YListWebSearch.java index 496ed2f3..d7305497 100644 --- a/jacq-names/src/main/java/org/jacq/service/names/sources/ylist/YListWebSearch.java +++ b/jacq-names/src/main/java/org/jacq/service/names/sources/ylist/YListWebSearch.java @@ -15,10 +15,10 @@ */ package org.jacq.service.names.sources.ylist; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; /** * Interface definition for http://ylist.info/ylist_simple_search.php web search diff --git a/jacq-names/src/main/java/org/jacq/service/rest/names/JacqService.java b/jacq-names/src/main/java/org/jacq/service/rest/names/JacqService.java index 6f119039..340a550d 100644 --- a/jacq-names/src/main/java/org/jacq/service/rest/names/JacqService.java +++ b/jacq-names/src/main/java/org/jacq/service/rest/names/JacqService.java @@ -1,7 +1,7 @@ package org.jacq.service.rest.names; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/rest") public class JacqService extends Application { diff --git a/jacq-names/src/main/java/org/jacq/service/rest/names/impl/CommonNameServiceImpl.java b/jacq-names/src/main/java/org/jacq/service/rest/names/impl/CommonNameServiceImpl.java index 8449812b..ad4d2ed1 100644 --- a/jacq-names/src/main/java/org/jacq/service/rest/names/impl/CommonNameServiceImpl.java +++ b/jacq-names/src/main/java/org/jacq/service/rest/names/impl/CommonNameServiceImpl.java @@ -17,9 +17,9 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.jacq.common.model.names.CommonName; import org.jacq.common.model.names.OpenRefineInfo; diff --git a/jacq-names/src/main/java/org/jacq/service/rest/names/impl/ScientificNameServiceImpl.java b/jacq-names/src/main/java/org/jacq/service/rest/names/impl/ScientificNameServiceImpl.java index d301b5e1..2d6c0f30 100644 --- a/jacq-names/src/main/java/org/jacq/service/rest/names/impl/ScientificNameServiceImpl.java +++ b/jacq-names/src/main/java/org/jacq/service/rest/names/impl/ScientificNameServiceImpl.java @@ -16,7 +16,7 @@ package org.jacq.service.rest.names.impl; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.model.rest.CultivarResult; import org.jacq.common.model.rest.HabitusTypeResult; import org.jacq.common.model.rest.ScientificNameInformationResult; diff --git a/jacq-names/src/main/resources/META-INF/persistence.xml b/jacq-names/src/main/resources/META-INF/persistence.xml index 1dcc8fc9..53442905 100644 --- a/jacq-names/src/main/resources/META-INF/persistence.xml +++ b/jacq-names/src/main/resources/META-INF/persistence.xml @@ -1,5 +1,8 @@ - + java:/openupDS @@ -8,13 +11,13 @@ false - - - - - - - + + + + + + + @@ -26,13 +29,13 @@ false - - - - - - - + + + + + + + diff --git a/jacq-names/src/main/webapp/WEB-INF/beans.xml b/jacq-names/src/main/webapp/WEB-INF/beans.xml index ccf1976a..6c9b0739 100644 --- a/jacq-names/src/main/webapp/WEB-INF/beans.xml +++ b/jacq-names/src/main/webapp/WEB-INF/beans.xml @@ -1,5 +1,5 @@ - - - + \ No newline at end of file diff --git a/jacq-output/pom.xml b/jacq-output/pom.xml index 50fa15e8..6b340de2 100644 --- a/jacq-output/pom.xml +++ b/jacq-output/pom.xml @@ -23,7 +23,8 @@ org.primefaces primefaces - 6.1 + 12.0.0 + jakarta ${project.groupId} @@ -31,9 +32,9 @@ ${project.version} - javax - javaee-api - 7.0 + jakarta.platform + jakarta.jakartaee-api + 9.1.0 provided @@ -44,47 +45,14 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 - 1.8 - 1.8 - - ${endorsed.dir} - + 17 + 17 org.apache.maven.plugins maven-war-plugin - 2.3 - - false - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.6 - - - validate - - copy - - - ${endorsed.dir} - true - - - javax - javaee-endorsed-api - 7.0 - jar - - - - - diff --git a/jacq-output/src/main/java/org/jacq/output/SessionManager.java b/jacq-output/src/main/java/org/jacq/output/SessionManager.java index 411bf177..d007811a 100644 --- a/jacq-output/src/main/java/org/jacq/output/SessionManager.java +++ b/jacq-output/src/main/java/org/jacq/output/SessionManager.java @@ -16,8 +16,8 @@ package org.jacq.output; import java.io.Serializable; -import javax.annotation.ManagedBean; -import javax.enterprise.context.SessionScoped; +import jakarta.annotation.ManagedBean; +import jakarta.enterprise.context.SessionScoped; /** * Session bean for handling all session scoped content diff --git a/jacq-output/src/main/java/org/jacq/output/controller/FloraController.java b/jacq-output/src/main/java/org/jacq/output/controller/FloraController.java index e0cc09a1..f8f65df5 100644 --- a/jacq-output/src/main/java/org/jacq/output/controller/FloraController.java +++ b/jacq-output/src/main/java/org/jacq/output/controller/FloraController.java @@ -15,10 +15,11 @@ */ package org.jacq.output.controller; +import jakarta.inject.Named; +import java.io.Serializable; import java.util.logging.Logger; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; +import jakarta.annotation.PostConstruct; +import jakarta.faces.view.ViewScoped; import org.jacq.common.util.ServicesUtil; import org.jacq.output.view.LazyClassificationTreeNode; import org.primefaces.model.TreeNode; @@ -27,9 +28,9 @@ * * @author wkoller */ -@ManagedBean +@Named @ViewScoped -public class FloraController { +public class FloraController implements Serializable { private static Logger LOGGER = Logger.getLogger(FloraController.class.getName()); diff --git a/jacq-output/src/main/java/org/jacq/output/controller/SearchController.java b/jacq-output/src/main/java/org/jacq/output/controller/SearchController.java index f90937d2..49a36637 100644 --- a/jacq-output/src/main/java/org/jacq/output/controller/SearchController.java +++ b/jacq-output/src/main/java/org/jacq/output/controller/SearchController.java @@ -15,12 +15,12 @@ */ package org.jacq.output.controller; +import jakarta.inject.Named; import java.io.Serializable; import java.util.List; -import javax.annotation.PostConstruct; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.model.rest.ScientificNameResult; import org.jacq.common.rest.names.ScientificNameService; @@ -34,7 +34,7 @@ * * @author wkoller */ -@ManagedBean +@Named @SessionScoped public class SearchController implements Serializable { diff --git a/jacq-output/src/main/java/org/jacq/output/view/LazyBotanicalObjectDataModel.java b/jacq-output/src/main/java/org/jacq/output/view/LazyBotanicalObjectDataModel.java index 31bcc2a0..dcc63c73 100644 --- a/jacq-output/src/main/java/org/jacq/output/view/LazyBotanicalObjectDataModel.java +++ b/jacq-output/src/main/java/org/jacq/output/view/LazyBotanicalObjectDataModel.java @@ -18,12 +18,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; import org.jacq.common.model.jpa.custom.BotanicalObjectDerivative; import org.jacq.common.model.rest.OrderDirection; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.model.rest.ScientificNameResult; import org.jacq.common.rest.output.SearchService; +import org.primefaces.model.FilterMeta; import org.primefaces.model.LazyDataModel; +import org.primefaces.model.SortMeta; import org.primefaces.model.SortOrder; /** @@ -76,20 +80,39 @@ public BotanicalObjectDerivative getRowData(String rowKey) { } @Override - public Object getRowKey(BotanicalObjectDerivative botanicalObjectDerivative) { - return botanicalObjectDerivative.getDerivativeId(); + public String getRowKey(BotanicalObjectDerivative botanicalObjectDerivative) { + return botanicalObjectDerivative.getDerivativeId().toString(); } @Override - public List load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { + public int count(Map filters) { + return this.getRowCount(); + } + + @Override + public List load(int first, int pageSize, + Map sortFields, + Map filters) { + + Optional> sortField = sortFields.entrySet().stream().findFirst(); + Optional sortMeta = sortField.map(Entry::getValue); + // get count first //int rowCount = this.derivativeService.count(getScientificName(), getOrganization(), hasImage); - int rowCount = this.searchService.count((scientificName != null) ? scientificName.getScientificNameId() : null, (organization != null) ? organization.getOrganisationId() : null, hasImage); + int rowCount = this.searchService.count( + (scientificName != null) ? scientificName.getScientificNameId() : null, + (organization != null) ? organization.getOrganisationId() : null, hasImage); this.setRowCount(rowCount); List results = new ArrayList<>(); if (rowCount > 0) { - results = this.searchService.find((scientificName != null) ? scientificName.getScientificNameId() : null, (organization != null) ? organization.getOrganisationId() : null, hasImage, sortField, (sortOrder.equals(SortOrder.DESCENDING)) ? OrderDirection.DESC : OrderDirection.ASC, first, pageSize); + results = this.searchService.find( + (scientificName != null) ? scientificName.getScientificNameId() : null, + (organization != null) ? organization.getOrganisationId() : null, hasImage, + sortMeta.map(SortMeta::getField).orElse(null), + sortMeta.map(SortMeta::getOrder).orElse(SortOrder.ASCENDING) + .equals(SortOrder.DESCENDING) ? OrderDirection.DESC : OrderDirection.ASC, first, + pageSize); } return results; diff --git a/jacq-output/src/main/webapp/WEB-INF/faces-config.xml b/jacq-output/src/main/webapp/WEB-INF/faces-config.xml index 89b29466..1f79f44e 100644 --- a/jacq-output/src/main/webapp/WEB-INF/faces-config.xml +++ b/jacq-output/src/main/webapp/WEB-INF/faces-config.xml @@ -1,8 +1,10 @@ - + /pages/* diff --git a/jacq-output/src/main/webapp/WEB-INF/web.xml b/jacq-output/src/main/webapp/WEB-INF/web.xml index 77cd5818..4afc3826 100644 --- a/jacq-output/src/main/webapp/WEB-INF/web.xml +++ b/jacq-output/src/main/webapp/WEB-INF/web.xml @@ -1,12 +1,12 @@ - javax.faces.PROJECT_STAGE + jakarta.faces.PROJECT_STAGE Development Faces Servlet - javax.faces.webapp.FacesServlet + jakarta.faces.webapp.FacesServlet 1 diff --git a/jacq-service-output/pom.xml b/jacq-service-output/pom.xml index 9f073371..4d615802 100644 --- a/jacq-service-output/pom.xml +++ b/jacq-service-output/pom.xml @@ -15,9 +15,9 @@ - javax - javaee-api - 7.0 + jakarta.platform + jakarta.jakartaee-api + 9.1.0 provided @@ -33,10 +33,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 - 1.8 - 1.8 + 17 + 17 diff --git a/jacq-service-output/src/main/java/org/jacq/service/output/manager/ApplicationManager.java b/jacq-service-output/src/main/java/org/jacq/service/output/manager/ApplicationManager.java index c07ccb85..2eb9039e 100644 --- a/jacq-service-output/src/main/java/org/jacq/service/output/manager/ApplicationManager.java +++ b/jacq-service-output/src/main/java/org/jacq/service/output/manager/ApplicationManager.java @@ -15,8 +15,8 @@ */ package org.jacq.service.output.manager; -import javax.annotation.ManagedBean; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.ManagedBean; +import jakarta.enterprise.context.ApplicationScoped; import org.jacq.common.manager.BaseApplicationManager; /** diff --git a/jacq-service-output/src/main/java/org/jacq/service/output/manager/OrganisationManager.java b/jacq-service-output/src/main/java/org/jacq/service/output/manager/OrganisationManager.java index 19789007..a97a0279 100644 --- a/jacq-service-output/src/main/java/org/jacq/service/output/manager/OrganisationManager.java +++ b/jacq-service-output/src/main/java/org/jacq/service/output/manager/OrganisationManager.java @@ -15,9 +15,9 @@ */ package org.jacq.service.output.manager; -import javax.annotation.ManagedBean; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.annotation.ManagedBean; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jacq.common.manager.BaseOrganisationManager; /** diff --git a/jacq-service-output/src/main/java/org/jacq/service/output/manager/SearchManager.java b/jacq-service-output/src/main/java/org/jacq/service/output/manager/SearchManager.java index da85b488..85b8bef3 100644 --- a/jacq-service-output/src/main/java/org/jacq/service/output/manager/SearchManager.java +++ b/jacq-service-output/src/main/java/org/jacq/service/output/manager/SearchManager.java @@ -15,11 +15,11 @@ */ package org.jacq.service.output.manager; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.annotation.ManagedBean; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jacq.common.manager.BaseDerivativeManager; /** diff --git a/jacq-service-output/src/main/java/org/jacq/service/output/rest/JacqServiceOutput.java b/jacq-service-output/src/main/java/org/jacq/service/output/rest/JacqServiceOutput.java index ba27ddea..da5675f2 100644 --- a/jacq-service-output/src/main/java/org/jacq/service/output/rest/JacqServiceOutput.java +++ b/jacq-service-output/src/main/java/org/jacq/service/output/rest/JacqServiceOutput.java @@ -15,8 +15,8 @@ */ package org.jacq.service.output.rest; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/rest") public class JacqServiceOutput extends Application { diff --git a/jacq-service-output/src/main/java/org/jacq/service/output/rest/impl/SearchServiceImpl.java b/jacq-service-output/src/main/java/org/jacq/service/output/rest/impl/SearchServiceImpl.java index 694d9540..a30fa327 100644 --- a/jacq-service-output/src/main/java/org/jacq/service/output/rest/impl/SearchServiceImpl.java +++ b/jacq-service-output/src/main/java/org/jacq/service/output/rest/impl/SearchServiceImpl.java @@ -16,7 +16,7 @@ package org.jacq.service.output.rest.impl; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.model.jpa.custom.BotanicalObjectDerivative; import org.jacq.common.model.rest.OrderDirection; import org.jacq.common.model.rest.OrganisationResult; diff --git a/jacq-service-output/src/main/resources/META-INF/persistence.xml b/jacq-service-output/src/main/resources/META-INF/persistence.xml index 3d1d0031..f5e4a4b5 100644 --- a/jacq-service-output/src/main/resources/META-INF/persistence.xml +++ b/jacq-service-output/src/main/resources/META-INF/persistence.xml @@ -1,5 +1,8 @@ - + java:/jacqDS @@ -8,13 +11,13 @@ false - - - - - - - + + + + + + + diff --git a/jacq-service-output/src/main/webapp/WEB-INF/beans.xml b/jacq-service-output/src/main/webapp/WEB-INF/beans.xml index 6c419b21..12baef60 100644 --- a/jacq-service-output/src/main/webapp/WEB-INF/beans.xml +++ b/jacq-service-output/src/main/webapp/WEB-INF/beans.xml @@ -1,5 +1,5 @@ - - - + \ No newline at end of file diff --git a/jacq-service-report/pom.xml b/jacq-service-report/pom.xml index 0795b1de..b13e13f2 100644 --- a/jacq-service-report/pom.xml +++ b/jacq-service-report/pom.xml @@ -39,21 +39,22 @@ - javax - javaee-web-api - 7.0 + jakarta.platform + jakarta.jakartaee-web-api + 10.0.0 provided org.jboss.resteasy resteasy-client - 3.0.19.Final + 6.2.4.Final provided - org.glassfish.soteria - javax.security.enterprise - 1.0 + jakarta.security.enterprise + jakarta.security.enterprise-api + 3.0.0 + provided @@ -63,47 +64,14 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 - 1.8 - 1.8 - - ${endorsed.dir} - + 17 + 17 org.apache.maven.plugins maven-war-plugin - 2.3 - - false - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.6 - - - validate - - copy - - - ${endorsed.dir} - true - - - javax - javaee-endorsed-api - 7.0 - jar - - - - - diff --git a/jacq-service-report/src/main/java/org/jacq/service/report/ApplicationManager.java b/jacq-service-report/src/main/java/org/jacq/service/report/ApplicationManager.java index 27758124..a41f50f6 100644 --- a/jacq-service-report/src/main/java/org/jacq/service/report/ApplicationManager.java +++ b/jacq-service-report/src/main/java/org/jacq/service/report/ApplicationManager.java @@ -5,12 +5,12 @@ */ package org.jacq.service.report; +import jakarta.inject.Named; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.birt.core.framework.Platform; import org.eclipse.birt.report.engine.api.EngineConfig; import org.eclipse.birt.report.engine.api.IReportEngine; @@ -24,7 +24,7 @@ * * @author wkoller */ -@ManagedBean +@Named @ApplicationScoped public class ApplicationManager { diff --git a/jacq-service-report/src/main/java/org/jacq/service/report/JacqConfig.java b/jacq-service-report/src/main/java/org/jacq/service/report/JacqConfig.java index 9f3a1614..18c3a6d9 100644 --- a/jacq-service-report/src/main/java/org/jacq/service/report/JacqConfig.java +++ b/jacq-service-report/src/main/java/org/jacq/service/report/JacqConfig.java @@ -5,14 +5,14 @@ */ package org.jacq.service.report; +import jakarta.inject.Named; import java.util.HashMap; import java.util.List; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.ejb.Singleton; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; +import jakarta.annotation.PostConstruct; +import jakarta.ejb.Singleton; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; import org.jacq.common.model.jpa.FrmwrkConfig; /** @@ -20,7 +20,7 @@ * * @author wkoller */ -@ManagedBean +@Named @Singleton public class JacqConfig { diff --git a/jacq-service-report/src/main/java/org/jacq/service/report/manager/LabelManager.java b/jacq-service-report/src/main/java/org/jacq/service/report/manager/LabelManager.java index 21914212..0c29d646 100644 --- a/jacq-service-report/src/main/java/org/jacq/service/report/manager/LabelManager.java +++ b/jacq-service-report/src/main/java/org/jacq/service/report/manager/LabelManager.java @@ -1,17 +1,17 @@ package org.jacq.service.report.manager; +import jakarta.inject.Named; import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.eclipse.birt.report.engine.api.EngineConstants; import org.eclipse.birt.report.engine.api.EngineException; import org.eclipse.birt.report.engine.api.IReportEngine; @@ -33,7 +33,7 @@ * * @author wkoller */ -@ManagedBean +@Named public class LabelManager { public static String REPORT_PATH = null; diff --git a/jacq-service-report/src/main/java/org/jacq/service/report/rest/JacqServiceReport.java b/jacq-service-report/src/main/java/org/jacq/service/report/rest/JacqServiceReport.java index d7fcfe07..20654a06 100644 --- a/jacq-service-report/src/main/java/org/jacq/service/report/rest/JacqServiceReport.java +++ b/jacq-service-report/src/main/java/org/jacq/service/report/rest/JacqServiceReport.java @@ -1,7 +1,7 @@ package org.jacq.service.report.rest; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/rest") public class JacqServiceReport extends Application { diff --git a/jacq-service-report/src/main/java/org/jacq/service/report/rest/impl/LabelServiceImpl.java b/jacq-service-report/src/main/java/org/jacq/service/report/rest/impl/LabelServiceImpl.java index 041dcebd..2301ae38 100644 --- a/jacq-service-report/src/main/java/org/jacq/service/report/rest/impl/LabelServiceImpl.java +++ b/jacq-service-report/src/main/java/org/jacq/service/report/rest/impl/LabelServiceImpl.java @@ -8,9 +8,9 @@ import java.io.Serializable; import java.util.logging.Level; import java.util.logging.Logger; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; import org.jacq.common.rest.report.LabelService; import org.jacq.common.rest.exception.JacqRestException; import org.jacq.service.report.manager.LabelManager; diff --git a/jacq-service-report/src/main/java/org/jacq/service/report/security/PassthroughClientRequestFilter.java b/jacq-service-report/src/main/java/org/jacq/service/report/security/PassthroughClientRequestFilter.java index 1993710c..d8ae099f 100644 --- a/jacq-service-report/src/main/java/org/jacq/service/report/security/PassthroughClientRequestFilter.java +++ b/jacq-service-report/src/main/java/org/jacq/service/report/security/PassthroughClientRequestFilter.java @@ -8,11 +8,11 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.ext.Provider; import org.apache.commons.codec.binary.Base64; import org.jacq.common.security.JacqCallerPrincipal; diff --git a/jacq-service-report/src/main/java/org/jacq/service/report/security/ReportIdentityStore.java b/jacq-service-report/src/main/java/org/jacq/service/report/security/ReportIdentityStore.java index 14ab85d1..57b50162 100644 --- a/jacq-service-report/src/main/java/org/jacq/service/report/security/ReportIdentityStore.java +++ b/jacq-service-report/src/main/java/org/jacq/service/report/security/ReportIdentityStore.java @@ -16,13 +16,13 @@ package org.jacq.service.report.security; import java.util.HashSet; -import javax.annotation.PostConstruct; -import javax.annotation.security.DeclareRoles; -import javax.enterprise.context.ApplicationScoped; -import javax.security.enterprise.authentication.mechanism.http.BasicAuthenticationMechanismDefinition; -import javax.security.enterprise.credential.UsernamePasswordCredential; -import javax.security.enterprise.identitystore.CredentialValidationResult; -import javax.security.enterprise.identitystore.IdentityStore; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.security.DeclareRoles; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.security.enterprise.authentication.mechanism.http.BasicAuthenticationMechanismDefinition; +import jakarta.security.enterprise.credential.UsernamePasswordCredential; +import jakarta.security.enterprise.identitystore.CredentialValidationResult; +import jakarta.security.enterprise.identitystore.IdentityStore; import org.jacq.common.model.rest.RoleResult; import org.jacq.common.model.rest.UserResult; import org.jacq.common.rest.UserService; diff --git a/jacq-service-report/src/main/resources/META-INF/persistence.xml b/jacq-service-report/src/main/resources/META-INF/persistence.xml index e55612fd..1c13d8a1 100644 --- a/jacq-service-report/src/main/resources/META-INF/persistence.xml +++ b/jacq-service-report/src/main/resources/META-INF/persistence.xml @@ -1,5 +1,8 @@ - + java:/jacqDS @@ -8,13 +11,13 @@ false - - - - - - - + + + + + + + diff --git a/jacq-service-report/src/main/webapp/WEB-INF/beans.xml b/jacq-service-report/src/main/webapp/WEB-INF/beans.xml index ba9b1015..12baef60 100644 --- a/jacq-service-report/src/main/webapp/WEB-INF/beans.xml +++ b/jacq-service-report/src/main/webapp/WEB-INF/beans.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/jacq-service-report/src/main/webapp/WEB-INF/jboss-web.xml b/jacq-service-report/src/main/webapp/WEB-INF/jboss-web.xml index 8095cb59..dbecf0cd 100644 --- a/jacq-service-report/src/main/webapp/WEB-INF/jboss-web.xml +++ b/jacq-service-report/src/main/webapp/WEB-INF/jboss-web.xml @@ -1,4 +1,3 @@ - jaspitest \ No newline at end of file diff --git a/jacq-service/pom.xml b/jacq-service/pom.xml index 8f365129..3e75cda8 100644 --- a/jacq-service/pom.xml +++ b/jacq-service/pom.xml @@ -15,9 +15,9 @@ - javax - javaee-api - 7.0 + jakarta.platform + jakarta.jakartaee-api + 9.1.0 provided @@ -28,7 +28,7 @@ org.jboss.resteasy resteasy-client - 3.0.10.Final + 6.2.4.Final provided @@ -47,9 +47,10 @@ 7.0.5 - org.glassfish.soteria - javax.security.enterprise - 1.0 + jakarta.security.enterprise + jakarta.security.enterprise-api + 3.0.0 + provided @@ -60,8 +61,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 + 17 + 17 diff --git a/jacq-service/src/main/java/org/jacq/service/ApplicationManager.java b/jacq-service/src/main/java/org/jacq/service/ApplicationManager.java index 40543074..b761a80f 100644 --- a/jacq-service/src/main/java/org/jacq/service/ApplicationManager.java +++ b/jacq-service/src/main/java/org/jacq/service/ApplicationManager.java @@ -6,11 +6,11 @@ package org.jacq.service; import java.util.logging.Logger; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.ManagedBean; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jacq.common.manager.BaseApplicationManager; /** diff --git a/jacq-service/src/main/java/org/jacq/service/JacqServiceConfig.java b/jacq-service/src/main/java/org/jacq/service/JacqServiceConfig.java index 0e713b67..59c4874e 100644 --- a/jacq-service/src/main/java/org/jacq/service/JacqServiceConfig.java +++ b/jacq-service/src/main/java/org/jacq/service/JacqServiceConfig.java @@ -7,12 +7,12 @@ import java.util.HashMap; import java.util.List; -import javax.annotation.ManagedBean; -import javax.annotation.PostConstruct; -import javax.ejb.Singleton; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; +import jakarta.annotation.ManagedBean; +import jakarta.annotation.PostConstruct; +import jakarta.ejb.Singleton; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; import org.jacq.common.manager.JacqConfig; import org.jacq.common.model.jpa.FrmwrkConfig; diff --git a/jacq-service/src/main/java/org/jacq/service/TimerManager.java b/jacq-service/src/main/java/org/jacq/service/TimerManager.java index c77bfbfb..e7738473 100644 --- a/jacq-service/src/main/java/org/jacq/service/TimerManager.java +++ b/jacq-service/src/main/java/org/jacq/service/TimerManager.java @@ -15,9 +15,9 @@ */ package org.jacq.service; -import javax.annotation.ManagedBean; -import javax.ejb.Schedule; -import javax.inject.Inject; +import jakarta.annotation.ManagedBean; +import jakarta.ejb.Schedule; +import jakarta.inject.Inject; import org.jacq.service.manager.ImageServerManager; /** diff --git a/jacq-service/src/main/java/org/jacq/service/manager/AcquisitionManager.java b/jacq-service/src/main/java/org/jacq/service/manager/AcquisitionManager.java index 463225b7..d1e1500a 100644 --- a/jacq-service/src/main/java/org/jacq/service/manager/AcquisitionManager.java +++ b/jacq-service/src/main/java/org/jacq/service/manager/AcquisitionManager.java @@ -6,10 +6,10 @@ package org.jacq.service.manager; import java.util.List; -import javax.annotation.ManagedBean; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; +import jakarta.annotation.ManagedBean; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; import org.jacq.common.model.jpa.TblAcquisitionSource; import org.jacq.common.model.rest.AcquisitionSourceResult; import org.jacq.common.rest.AcquisitionService; diff --git a/jacq-service/src/main/java/org/jacq/service/manager/AuthorizationManager.java b/jacq-service/src/main/java/org/jacq/service/manager/AuthorizationManager.java index 73a80c8e..fa497588 100644 --- a/jacq-service/src/main/java/org/jacq/service/manager/AuthorizationManager.java +++ b/jacq-service/src/main/java/org/jacq/service/manager/AuthorizationManager.java @@ -18,17 +18,17 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.transaction.Transactional; import org.jacq.common.model.jpa.FrmwrkUser; import org.jacq.common.model.jpa.FrmwrkaccessOrganisation; import org.jacq.common.model.jpa.TblOrganisation; @@ -118,12 +118,12 @@ protected void applySearchCriteria(CriteriaBuilder cb, CriteriaQuery cq, Root - + java:/jacqDS @@ -8,14 +11,14 @@ false - - - - - - - - + + + + + + + + diff --git a/jacq-service/src/main/webapp/WEB-INF/beans.xml b/jacq-service/src/main/webapp/WEB-INF/beans.xml index ccf1976a..6c9b0739 100644 --- a/jacq-service/src/main/webapp/WEB-INF/beans.xml +++ b/jacq-service/src/main/webapp/WEB-INF/beans.xml @@ -1,5 +1,5 @@ - - - + \ No newline at end of file diff --git a/jacq-service/src/main/webapp/WEB-INF/jboss-web.xml b/jacq-service/src/main/webapp/WEB-INF/jboss-web.xml index 8095cb59..dbecf0cd 100644 --- a/jacq-service/src/main/webapp/WEB-INF/jboss-web.xml +++ b/jacq-service/src/main/webapp/WEB-INF/jboss-web.xml @@ -1,4 +1,3 @@ - jaspitest \ No newline at end of file diff --git a/jacq/.mvn/wrapper/maven-wrapper.jar b/jacq/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..cb28b0e37c7d206feb564310fdeec0927af4123a GIT binary patch literal 62547 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 A?*IS* literal 0 HcmV?d00001 diff --git a/jacq/.mvn/wrapper/maven-wrapper.properties b/jacq/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..ac184013 --- /dev/null +++ b/jacq/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/jacq/mvnw b/jacq/mvnw new file mode 100755 index 00000000..8d937f4c --- /dev/null +++ b/jacq/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/jacq/mvnw.cmd b/jacq/mvnw.cmd new file mode 100644 index 00000000..c4586b56 --- /dev/null +++ b/jacq/mvnw.cmd @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/jacq/pom.xml b/jacq/pom.xml index 71972814..8f140d1d 100644 --- a/jacq/pom.xml +++ b/jacq/pom.xml @@ -17,33 +17,53 @@ - - - org.codehaus.mojo - versions-maven-plugin - 2.3 - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - + + + + org.codehaus.mojo + versions-maven-plugin + 2.3 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.2 + + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + + false + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.6.0 + + + - 1.8 - 1.8 + 17 + 17 UTF-8 From 7e3481fc2c44319cb4c3bd101bc5ffd226e196b7 Mon Sep 17 00:00:00 2001 From: Hans Sowa Date: Mon, 22 Apr 2024 15:13:12 +0200 Subject: [PATCH 2/6] Use jakarta ee 10 --- jacq-common/pom.xml | 2 +- jacq-dataimport/pom.xml | 4 ++-- jacq-input/pom.xml | 2 +- jacq-input/src/main/webapp/pages/livingplant/manage.xhtml | 4 ++-- jacq-names/pom.xml | 2 +- jacq-output/pom.xml | 2 +- jacq-service-output/pom.xml | 2 +- jacq-service-report/pom.xml | 2 +- jacq-service/pom.xml | 2 +- jacq/pom.xml | 1 + 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/jacq-common/pom.xml b/jacq-common/pom.xml index 32073da8..00a555a8 100644 --- a/jacq-common/pom.xml +++ b/jacq-common/pom.xml @@ -34,7 +34,7 @@ jakarta.platform jakarta.jakartaee-api - 9.1.0 + ${jakartaee.version} provided diff --git a/jacq-dataimport/pom.xml b/jacq-dataimport/pom.xml index 40c95154..bed41cea 100644 --- a/jacq-dataimport/pom.xml +++ b/jacq-dataimport/pom.xml @@ -42,13 +42,13 @@ jakarta.platform jakarta.jakartaee-api - 9.1.0 + ${jakartaee.version} provided jakarta.platform jakarta.jakartaee-web-api - 9.1.0 + ${jakartaee.version} provided diff --git a/jacq-input/pom.xml b/jacq-input/pom.xml index 7e1b2ce0..1d30b542 100644 --- a/jacq-input/pom.xml +++ b/jacq-input/pom.xml @@ -66,7 +66,7 @@ jakarta.platform jakarta.jakartaee-api - 9.1.0 + ${jakartaee.version} provided diff --git a/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml b/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml index 72b990ce..3b531347 100644 --- a/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml +++ b/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml @@ -186,11 +186,11 @@ lazy="true" value="#{livingPlantController.dataModel}" paginator="true" - paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {Exporters}" + paginatorTemplate="{RowsPerPageDropdown} {CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {Exporters}" rows="10" widgetVar="derivativeTable" id="derivativeTable" - rowsPerPageTemplate="10,20,30,50,100"> + rowsPerPageTemplate="10,50,100"> diff --git a/jacq-names/pom.xml b/jacq-names/pom.xml index c9b589b2..9cbaafc3 100644 --- a/jacq-names/pom.xml +++ b/jacq-names/pom.xml @@ -40,7 +40,7 @@ jakarta.platform jakarta.jakartaee-api - 9.1.0 + ${jakartaee.version} provided diff --git a/jacq-output/pom.xml b/jacq-output/pom.xml index 6b340de2..6da58bf9 100644 --- a/jacq-output/pom.xml +++ b/jacq-output/pom.xml @@ -34,7 +34,7 @@ jakarta.platform jakarta.jakartaee-api - 9.1.0 + ${jakartaee.version} provided diff --git a/jacq-service-output/pom.xml b/jacq-service-output/pom.xml index 4d615802..493698fa 100644 --- a/jacq-service-output/pom.xml +++ b/jacq-service-output/pom.xml @@ -17,7 +17,7 @@ jakarta.platform jakarta.jakartaee-api - 9.1.0 + ${jakartaee.version} provided diff --git a/jacq-service-report/pom.xml b/jacq-service-report/pom.xml index b13e13f2..d05d4c1c 100644 --- a/jacq-service-report/pom.xml +++ b/jacq-service-report/pom.xml @@ -41,7 +41,7 @@ jakarta.platform jakarta.jakartaee-web-api - 10.0.0 + ${jakartaee.version} provided diff --git a/jacq-service/pom.xml b/jacq-service/pom.xml index 3e75cda8..e7275b4c 100644 --- a/jacq-service/pom.xml +++ b/jacq-service/pom.xml @@ -17,7 +17,7 @@ jakarta.platform jakarta.jakartaee-api - 9.1.0 + ${jakartaee.version} provided diff --git a/jacq/pom.xml b/jacq/pom.xml index 8f140d1d..e3a27cd2 100644 --- a/jacq/pom.xml +++ b/jacq/pom.xml @@ -65,5 +65,6 @@ 17 17 UTF-8 + 10.0.0 From 6931e7fb3584b775e2d4eeda98caef765f15d030 Mon Sep 17 00:00:00 2001 From: Hans Sowa Date: Fri, 25 Apr 2025 16:10:43 +0200 Subject: [PATCH 3/6] Add github action build --- .github/workflows/build.yml | 36 +++++++++++++ .github/workflows/deploy.yml | 100 +++++++++++++++++++++++++++++++++++ README.md | 64 ++++++++++++++++++++-- jacq/pom.xml | 18 +++++++ 4 files changed, 215 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..20f8d551 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,36 @@ +name: Build + +on: + push: + branches: [ main, master, feature/next ] + pull_request: + branches: [ main, master, feature/next ] + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + + - name: Make Maven wrapper executable + run: chmod +x jacq/mvnw + + - name: Build with Maven + run: cd jacq && ./mvnw -B package -DskipTests=true + + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: jacq-artifacts + path: | + **/target/*.jar + **/target/*.war diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..a6333cd6 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,100 @@ +name: Deploy to Remote WildFly + +on: + workflow_run: + workflows: ["Build"] + types: + - completed + branches: [main, master, feature/next] + workflow_dispatch: + +jobs: + deploy: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }} + + env: + WILDFLY_HOST: ${{ vars.WILDFLY_HOST }} + WILDFLY_PORT: ${{ vars.WILDFLY_PORT || '9990' }} + WILDFLY_USERNAME: ${{ secrets.WILDFLY_USERNAME }} + WILDFLY_PASSWORD: ${{ secrets.WILDFLY_PASSWORD }} + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Make Maven wrapper executable + run: chmod +x jacq/mvnw + if: ${{ github.event_name == 'workflow_dispatch' }} + + - name: Download artifacts + uses: actions/download-artifact@v4 + with: + name: jacq-artifacts + path: artifacts + if: ${{ github.event_name != 'workflow_dispatch' }} + + - name: Build with Maven if triggered manually + run: cd jacq && ./mvnw -B package -DskipTests=true + if: ${{ github.event_name == 'workflow_dispatch' }} + + - name: Download WildFly CLI Client (TEMPORARILY DISABLED) + run: | + # TEMPORARILY DISABLED FOR TESTING OTHER GITHUB ACTIONS + # Uncomment the following code to re-enable deployment + + # wget https://download.jboss.org/wildfly/31.0.1.Final/wildfly-31.0.1.Final.tar.gz + # tar -xzf wildfly-31.0.1.Final.tar.gz --strip-components=1 wildfly-31.0.1.Final/bin + # chmod +x bin/jboss-cli.sh + echo "WildFly CLI Client download is currently disabled for testing purposes." + + - name: Validate WildFly Connection Parameters (TEMPORARILY DISABLED) + run: | + # TEMPORARILY DISABLED FOR TESTING OTHER GITHUB ACTIONS + # Uncomment the following code to re-enable deployment + + # if [ -z "$WILDFLY_HOST" ]; then + # echo "Error: WILDFLY_HOST is not set. Please configure this in GitHub repository variables." + # exit 1 + # fi + # + # if [ -z "$WILDFLY_USERNAME" ] || [ -z "$WILDFLY_PASSWORD" ]; then + # echo "Error: WILDFLY_USERNAME and/or WILDFLY_PASSWORD are not set. Please configure these in GitHub repository secrets." + # exit 1 + # fi + # + # echo "WildFly connection parameters validated." + echo "WildFly connection parameter validation is currently disabled for testing purposes." + + - name: Deploy to Remote WildFly (TEMPORARILY DISABLED) + run: | + # DEPLOYMENT TEMPORARILY DISABLED FOR TESTING OTHER GITHUB ACTIONS + # Uncomment the following code to re-enable deployment + + # # Create CLI connection properties file + # cat > wildfly-connection.properties << EOF + # remote.connection.host=$WILDFLY_HOST + # remote.connection.port=$WILDFLY_PORT + # remote.connection.username=$WILDFLY_USERNAME + # remote.connection.password=$WILDFLY_PASSWORD + # EOF + + # # If manually triggered, use the newly built artifacts + # if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then + # ARTIFACTS_PATH="**/target" + # else + # ARTIFACTS_PATH="artifacts" + # fi + + # # Deploy each WAR file to WildFly + # for war_file in $(find $ARTIFACTS_PATH -name "*.war"); do + # echo "Deploying $war_file to remote WildFly at $WILDFLY_HOST:$WILDFLY_PORT..." + # ./bin/jboss-cli.sh --controller=$WILDFLY_HOST:$WILDFLY_PORT --connect --file=wildfly-connection.properties --command="deploy $war_file --force" + # done + + echo "Deployment is currently disabled for testing purposes." diff --git a/README.md b/README.md index 9b119bfa..9e4e9b1d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Development Setup - openjdk 17 - WildFly Plugin / JavaEE Edition -- WildFly 13.0.0 +- WildFly 31.0.1.Final Maven project can be opened directly from netbeans. @@ -15,11 +15,69 @@ have a look at https://maven.apache.org/wrapper/index.html This means you don't have to install maven manually. +## Skipping Tests -# Wildfly 13.0.0 +You can disable tests during the build process in two ways: + +1. Using the command-line parameter: + ``` + ./mvnw package -DskipTests=true + ``` + +2. Using the skip-tests profile: + ``` + ./mvnw package -Pskip-tests + ``` + +Both methods will skip the execution of tests during the build process. + + +# Wildfly 31.0.1.Final To avoid the error `ModuleNotFoundException` java.se with Java 17 you have to add in the standalone.sh following line. Add it at the beginning of the file. ``` +JAVA_OPTS="$JAVA_OPTS --add-modules=java.se" +``` + +# GitHub Actions + +This project uses GitHub Actions for continuous integration and deployment: + +## Build Workflow + +The build workflow automatically builds the project when changes are pushed to the main/master or feature/next branches, or when a pull request is created targeting these branches. It: + +1. Sets up Java 17 +2. Builds the project using the Maven wrapper (mvnw) with tests skipped (-DskipTests=true) +3. Uploads the built artifacts (JAR and WAR files) for later use + +You can also trigger the build workflow manually from the Actions tab in GitHub. + +## Deploy Workflow + +> **Note:** The deployment functionality is temporarily disabled for testing purposes. The workflow will run but will not actually deploy to the WildFly server. + +The deploy workflow is designed to automatically deploy the application to a remote WildFly server when the build workflow completes successfully for the main/master or feature/next branches. When fully enabled, it: + +1. Sets up Java 17 +2. Downloads the built artifacts (or builds the project using the Maven wrapper if triggered manually) +3. Downloads the WildFly CLI client +4. Validates the WildFly connection parameters +5. Deploys the WAR files to the remote WildFly server + +You can also trigger the deploy workflow manually from the Actions tab in GitHub. + +### Required GitHub Variables and Secrets + +To deploy to a remote WildFly server, you need to configure the following GitHub repository variables and secrets: + +#### Variables (Settings > Secrets and variables > Actions > Variables) +- `WILDFLY_HOST`: The hostname or IP address of your WildFly server +- `WILDFLY_PORT`: (Optional) The management port of your WildFly server (default: 9990) + +#### Secrets (Settings > Secrets and variables > Actions > Secrets) +- `WILDFLY_USERNAME`: The username for WildFly management authentication +- `WILDFLY_PASSWORD`: The password for WildFly management authentication -``` \ No newline at end of file +These credentials are used securely by the GitHub Actions workflow to connect to your remote WildFly server and deploy the application. diff --git a/jacq/pom.xml b/jacq/pom.xml index e3a27cd2..118caa73 100644 --- a/jacq/pom.xml +++ b/jacq/pom.xml @@ -58,13 +58,31 @@ maven-dependency-plugin 3.6.0 + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.5 + + ${skipTests} + + + + + + skip-tests + + true + + + 17 17 UTF-8 10.0.0 + false From e7699c4ea1145ae51a1aac482e240c9d2767d706 Mon Sep 17 00:00:00 2001 From: Hans Sowa Date: Wed, 3 Dec 2025 12:07:45 +0100 Subject: [PATCH 4/6] Fix living plant issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ClassCastException - xslt export adding missing header - security header problem - separation on living plant - generation of etikett as pdf - Löschen von Akzessionsnummern im Datenblatt --- .../controller/LivingPlantController.java | 58 ++++++++++++ .../controller/LivingPlantEditController.java | 24 ++--- .../webapp/pages/livingplant/manage.xhtml | 60 ++++++------- jacq-service-report/pom.xml | 5 ++ .../security/AuthorizationHeaderHolder.java | 31 +++++++ .../AuthorizationHolderCleanupFilter.java | 23 +++++ .../IncomingAuthorizationCaptureFilter.java | 23 +++++ .../PassthroughClientRequestFilter.java | 28 ++++-- .../service/manager/LivingPlantManager.java | 90 +++++++++++++++++-- jacq/.gitignore | 1 + 10 files changed, 288 insertions(+), 55 deletions(-) create mode 100644 jacq-service-report/src/main/java/org/jacq/service/report/security/AuthorizationHeaderHolder.java create mode 100644 jacq-service-report/src/main/java/org/jacq/service/report/security/AuthorizationHolderCleanupFilter.java create mode 100644 jacq-service-report/src/main/java/org/jacq/service/report/security/IncomingAuthorizationCaptureFilter.java diff --git a/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantController.java b/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantController.java index 179028c2..eb6c36a9 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantController.java @@ -7,6 +7,7 @@ import org.jacq.input.SessionManager; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; import jakarta.annotation.PostConstruct; import jakarta.faces.application.FacesMessage; @@ -14,6 +15,7 @@ import jakarta.faces.view.ViewScoped; import jakarta.faces.context.FacesContext; import jakarta.inject.Inject; +import jakarta.faces.component.UIComponent; import org.jacq.common.model.rest.CultivarResult; import org.jacq.common.model.rest.LocationResult; import org.jacq.common.model.rest.OrganisationResult; @@ -28,6 +30,13 @@ import org.jacq.input.view.LazyDerivativeDataModel; import org.jacq.input.view.LazyDerivativeDownloadDataModel; import org.primefaces.event.SelectEvent; +import org.primefaces.component.datatable.DataTable; +import org.primefaces.component.column.Column; +import org.primefaces.component.api.UIColumn; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Cell; /** * @@ -165,4 +174,53 @@ public void setOrganisationHierarchicSelectController(OrganisationHierarchicSele this.organisationHierarchicSelectController = organisationHierarchicSelectController; } + public void postProcessXlsx(Object document) { + if (document == null) { + return; + } + + try { + Workbook workbook = (Workbook) document; + Sheet sheet = workbook.getNumberOfSheets() > 0 ? workbook.getSheetAt(0) : workbook.createSheet("Export"); + + // Locate the export table to extract header labels + FacesContext fc = FacesContext.getCurrentInstance(); + UIComponent comp = fc.getViewRoot().findComponent("jacq_form:downloadDerivativeTable"); + if (!(comp instanceof DataTable)) { + return; + } + DataTable dataTable = (DataTable) comp; + + List uiColumns = dataTable.getColumns(); + List headers = new ArrayList<>(); + for (UIColumn uiCol : uiColumns) { + String headerText = null; + if (uiCol instanceof Column) { + Column col = (Column) uiCol; + Object exportHeader = col.getExportHeaderValue(); + if (exportHeader != null) { + headerText = exportHeader.toString(); + } else { + headerText = col.getHeaderText(); + } + } + headers.add(headerText != null ? headerText : ""); + } + + // Shift existing rows down to insert header at row 0 + int lastRowNum = sheet.getLastRowNum(); + if (lastRowNum >= 0 || sheet.getPhysicalNumberOfRows() > 0) { + sheet.shiftRows(0, lastRowNum, 1, true, false); + } + + Row headerRow = sheet.createRow(0); + for (int c = 0; c < headers.size(); c++) { + Cell cell = headerRow.createCell(c); + cell.setCellValue(headers.get(c)); + } + } catch (ClassCastException e) { + // If document is not a Workbook (shouldn't happen for type=xlsx), ignore gracefully + } + } + } diff --git a/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantEditController.java b/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantEditController.java index 0d834c3b..d5c3afa9 100644 --- a/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantEditController.java +++ b/jacq-input/src/main/java/org/jacq/input/controller/LivingPlantEditController.java @@ -156,10 +156,10 @@ public class LivingPlantEditController implements OrganisationSelectListener, Se protected List certificateTypes; protected List sexes; - protected List selectedSexes; + protected List selectedSexes; protected List labelTypes; - protected List selectedLabelTypes; + protected List selectedLabelTypes; protected CultivarResult cultivarResult; @@ -353,13 +353,13 @@ public void onLoad() { public void save() { // convert selected sex entries to SexResult(s) this.livingPlantResult.getSexes().clear(); - for (String sexId : this.selectedSexes) { - this.livingPlantResult.getSexes().add(new SexResult(Long.parseLong(sexId))); + for (Long sexId : this.selectedSexes) { + this.livingPlantResult.getSexes().add(new SexResult(sexId)); } // convert selected label type entries to LabelTypeResult(s) this.livingPlantResult.getLabelTypes().clear(); - for (String labelTypeId : this.selectedLabelTypes) { - this.livingPlantResult.getLabelTypes().add(new LabelTypeResult(Long.parseLong(labelTypeId))); + for (Long labelTypeId : this.selectedLabelTypes) { + this.livingPlantResult.getLabelTypes().add(new LabelTypeResult(labelTypeId)); } // convert selected relevancy tpes entries this.livingPlantResult.getRelevancyTypes().clear(); @@ -402,12 +402,12 @@ protected void syncInfo() { // convert selected sex entries for (SexResult sex : this.livingPlantResult.getSexes()) { - this.selectedSexes.add(sex.getSexId().toString()); + this.selectedSexes.add(sex.getSexId()); } // convert selected label-type entries for (LabelTypeResult labelType : this.livingPlantResult.getLabelTypes()) { - this.selectedLabelTypes.add(labelType.getLabelTypeId().toString()); + this.selectedLabelTypes.add(labelType.getLabelTypeId()); } // convert selected relevancy-type entries @@ -613,11 +613,11 @@ public List getSexes() { return sexes; } - public List getSelectedSexes() { + public List getSelectedSexes() { return selectedSexes; } - public void setSelectedSexes(List selectedSexes) { + public void setSelectedSexes(List selectedSexes) { this.selectedSexes = selectedSexes; } @@ -625,11 +625,11 @@ public List getLabelTypes() { return labelTypes; } - public List getSelectedLabelTypes() { + public List getSelectedLabelTypes() { return selectedLabelTypes; } - public void setSelectedLabelTypes(List selectedLabelTypes) { + public void setSelectedLabelTypes(List selectedLabelTypes) { this.selectedLabelTypes = selectedLabelTypes; } diff --git a/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml b/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml index 3b531347..13e7c350 100644 --- a/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml +++ b/jacq-input/src/main/webapp/pages/livingplant/manage.xhtml @@ -261,123 +261,123 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/jacq-service-report/pom.xml b/jacq-service-report/pom.xml index d05d4c1c..22b83331 100644 --- a/jacq-service-report/pom.xml +++ b/jacq-service-report/pom.xml @@ -38,6 +38,11 @@ + + xml-apis + xml-apis + 1.4.01 + jakarta.platform jakarta.jakartaee-web-api diff --git a/jacq-service-report/src/main/java/org/jacq/service/report/security/AuthorizationHeaderHolder.java b/jacq-service-report/src/main/java/org/jacq/service/report/security/AuthorizationHeaderHolder.java new file mode 100644 index 00000000..f4838f65 --- /dev/null +++ b/jacq-service-report/src/main/java/org/jacq/service/report/security/AuthorizationHeaderHolder.java @@ -0,0 +1,31 @@ +package org.jacq.service.report.security; + +/** + * Simple ThreadLocal holder for propagating the incoming Authorization header + * from server-side request filters to client-side request filters within the + * same request/thread. + */ +public final class AuthorizationHeaderHolder { + + private static final ThreadLocal AUTHORIZATION = new ThreadLocal<>(); + + private AuthorizationHeaderHolder() { + // utility class + } + + public static void set(String value) { + if (value == null || value.isEmpty()) { + AUTHORIZATION.remove(); + } else { + AUTHORIZATION.set(value); + } + } + + public static String get() { + return AUTHORIZATION.get(); + } + + public static void clear() { + AUTHORIZATION.remove(); + } +} diff --git a/jacq-service-report/src/main/java/org/jacq/service/report/security/AuthorizationHolderCleanupFilter.java b/jacq-service-report/src/main/java/org/jacq/service/report/security/AuthorizationHolderCleanupFilter.java new file mode 100644 index 00000000..65e7a51c --- /dev/null +++ b/jacq-service-report/src/main/java/org/jacq/service/report/security/AuthorizationHolderCleanupFilter.java @@ -0,0 +1,23 @@ +package org.jacq.service.report.security; + +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.ext.Provider; +import java.io.IOException; + +/** + * Ensures the ThreadLocal authorization holder is cleared after the request is + * processed to avoid leaking values between requests on reused threads. + */ +@Provider +@Priority(Priorities.HEADER_DECORATOR) +public class AuthorizationHolderCleanupFilter implements ContainerResponseFilter { + + @Override + public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException { + AuthorizationHeaderHolder.clear(); + } +} diff --git a/jacq-service-report/src/main/java/org/jacq/service/report/security/IncomingAuthorizationCaptureFilter.java b/jacq-service-report/src/main/java/org/jacq/service/report/security/IncomingAuthorizationCaptureFilter.java new file mode 100644 index 00000000..925556d0 --- /dev/null +++ b/jacq-service-report/src/main/java/org/jacq/service/report/security/IncomingAuthorizationCaptureFilter.java @@ -0,0 +1,23 @@ +package org.jacq.service.report.security; + +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; +import java.io.IOException; + +/** + * Captures the incoming Authorization header at the start of request handling + * and stores it in a ThreadLocal holder for client-side propagation. + */ +@Provider +@Priority(Priorities.AUTHENTICATION) +public class IncomingAuthorizationCaptureFilter implements ContainerRequestFilter { + + @Override + public void filter(ContainerRequestContext requestContext) throws IOException { + String authorization = requestContext.getHeaderString("Authorization"); + AuthorizationHeaderHolder.set(authorization); + } +} diff --git a/jacq-service-report/src/main/java/org/jacq/service/report/security/PassthroughClientRequestFilter.java b/jacq-service-report/src/main/java/org/jacq/service/report/security/PassthroughClientRequestFilter.java index d8ae099f..a8464660 100644 --- a/jacq-service-report/src/main/java/org/jacq/service/report/security/PassthroughClientRequestFilter.java +++ b/jacq-service-report/src/main/java/org/jacq/service/report/security/PassthroughClientRequestFilter.java @@ -15,6 +15,7 @@ import jakarta.ws.rs.ext.Provider; import org.apache.commons.codec.binary.Base64; import org.jacq.common.security.JacqCallerPrincipal; +import java.security.Principal; /** * @@ -28,14 +29,29 @@ public class PassthroughClientRequestFilter implements ClientRequestFilter { @Override public void filter(ClientRequestContext requestContext) throws IOException { + // First try to propagate an Authorization header captured from the incoming request + String propagated = AuthorizationHeaderHolder.get(); + if (propagated != null && !propagated.isEmpty()) { + List authorization = new ArrayList<>(); + authorization.add(propagated); + requestContext.getHeaders().put("Authorization", authorization); + return; + } - List authorization = new ArrayList() { - { - add(((JacqCallerPrincipal) securityContext.getUserPrincipal()).getAuthorizationHeader()); + // Fallback to securityContext (may not be available in client filters) + try { + Principal principal = (securityContext != null) ? securityContext.getUserPrincipal() : null; + if (principal instanceof JacqCallerPrincipal) { + String authHeader = ((JacqCallerPrincipal) principal).getAuthorizationHeader(); + if (authHeader != null && !authHeader.isEmpty()) { + List authorization = new ArrayList<>(); + authorization.add(authHeader); + requestContext.getHeaders().put("Authorization", authorization); + } } - }; - - requestContext.getHeaders().put("Authorization", authorization); + } catch (Exception ignore) { + // No-op: skip adding header when context/principal is unavailable + } } } diff --git a/jacq-service/src/main/java/org/jacq/service/manager/LivingPlantManager.java b/jacq-service/src/main/java/org/jacq/service/manager/LivingPlantManager.java index bac6824a..6794aa48 100644 --- a/jacq-service/src/main/java/org/jacq/service/manager/LivingPlantManager.java +++ b/jacq-service/src/main/java/org/jacq/service/manager/LivingPlantManager.java @@ -307,11 +307,47 @@ public LivingPlantResult save(LivingPlantResult livingPlantResult) { em.persist(tblLivingPlant); // save alternative accession numbers + // ensure list initialized + if (tblLivingPlant.getTblAlternativeAccessionNumberList() == null) { + tblLivingPlant.setTblAlternativeAccessionNumberList(new ArrayList<>()); + } + + // remove deleted alternative accession numbers (present in DB but not in incoming list) + List removeAltAccNos = new ArrayList<>(); + for (TblAlternativeAccessionNumber existingAlt : tblLivingPlant.getTblAlternativeAccessionNumberList()) { + boolean contains = false; + for (AlternativeAccessionNumberResult incomingAlt : livingPlantResult.getAlternativeAccessionNumbers()) { + if (incomingAlt.getAlternativeAccessionNumberId() != null + && Objects.equals(existingAlt.getId(), incomingAlt.getAlternativeAccessionNumberId())) { + contains = true; + break; + } + } + if (!contains) { + removeAltAccNos.add(existingAlt); + } + } + for (TblAlternativeAccessionNumber toRemove : removeAltAccNos) { + tblLivingPlant.getTblAlternativeAccessionNumberList().remove(toRemove); + em.remove(toRemove); + } + + // add or update alternative accession numbers from incoming list for (AlternativeAccessionNumberResult alternativeAccessionNumber : livingPlantResult.getAlternativeAccessionNumbers()) { - TblAlternativeAccessionNumber tblAlternativeAccessionNumber = null; + // skip completely empty values to avoid storing blank rows + if (alternativeAccessionNumber.getNumber() == null || alternativeAccessionNumber.getNumber().trim().isEmpty()) { + continue; + } + + TblAlternativeAccessionNumber tblAlternativeAccessionNumber; if (alternativeAccessionNumber.getAlternativeAccessionNumberId() != null) { + // update existing tblAlternativeAccessionNumber = em.find(TblAlternativeAccessionNumber.class, alternativeAccessionNumber.getAlternativeAccessionNumberId()); + if (tblAlternativeAccessionNumber == null) { + tblAlternativeAccessionNumber = new TblAlternativeAccessionNumber(); + } } else { + // create new tblAlternativeAccessionNumber = new TblAlternativeAccessionNumber(); } @@ -319,6 +355,10 @@ public LivingPlantResult save(LivingPlantResult livingPlantResult) { tblAlternativeAccessionNumber.setLivingPlantId(tblLivingPlant); tblAlternativeAccessionNumber.setNumber(alternativeAccessionNumber.getNumber()); + if (!tblLivingPlant.getTblAlternativeAccessionNumberList().contains(tblAlternativeAccessionNumber)) { + tblLivingPlant.getTblAlternativeAccessionNumberList().add(tblAlternativeAccessionNumber); + } + // save alternative accession number em.persist(tblAlternativeAccessionNumber); } @@ -352,12 +392,38 @@ public LivingPlantResult save(LivingPlantResult livingPlantResult) { if (tblDerivative.getTblSeparationList() == null) { tblDerivative.setTblSeparationList(new ArrayList()); } - tblDerivative.getTblSeparationList().clear(); + + // remove deleted separations (those present in DB but not in incoming list) + List removeSeparations = new ArrayList<>(); + for (TblSeparation existingSeparation : tblDerivative.getTblSeparationList()) { + boolean contains = false; + for (SeparationResult separation : livingPlantResult.getSeparations()) { + if (separation.getSeparationId() != null && Objects.equals(existingSeparation.getSeparationId(), separation.getSeparationId())) { + contains = true; + break; + } + } + if (!contains) { + removeSeparations.add(existingSeparation); + } + } + for (TblSeparation toRemove : removeSeparations) { + tblDerivative.getTblSeparationList().remove(toRemove); + em.remove(toRemove); + } + + // add or update separations from incoming list for (SeparationResult separation : livingPlantResult.getSeparations()) { - TblSeparation tblSeparation = null; + TblSeparation tblSeparation; if (separation.getSeparationId() != null) { + // update existing tblSeparation = em.find(TblSeparation.class, separation.getSeparationId()); + if (tblSeparation == null) { + // fallback: create if not found (should not happen normally) + tblSeparation = new TblSeparation(); + } } else { + // create new tblSeparation = new TblSeparation(); } @@ -365,12 +431,22 @@ public LivingPlantResult save(LivingPlantResult livingPlantResult) { tblSeparation.setDerivativeId(tblDerivative); tblSeparation.setDate(separation.getDate()); tblSeparation.setAnnotation(separation.getAnnotation()); - tblSeparation.setSeparationTypeId(em.find(TblSeparationType.class, separation.getSeparationType().getSeparationTypeId())); + if (separation.getSeparationType() != null && separation.getSeparationType().getSeparationTypeId() != null) { + tblSeparation.setSeparationTypeId(em.find(TblSeparationType.class, separation.getSeparationType().getSeparationTypeId())); + } else { + tblSeparation.setSeparationTypeId(null); + } - tblDerivative.getTblSeparationList().add(tblSeparation); + if (!tblDerivative.getTblSeparationList().contains(tblSeparation)) { + tblDerivative.getTblSeparationList().add(tblSeparation); + } - // save separation - em.persist(tblSeparation); + // persist or merge as needed + if (separation.getSeparationId() == null) { + em.persist(tblSeparation); + } else { + em.merge(tblSeparation); + } } // remove deleted acquisition event sources diff --git a/jacq/.gitignore b/jacq/.gitignore index 613c968d..001fb75b 100644 --- a/jacq/.gitignore +++ b/jacq/.gitignore @@ -1 +1,2 @@ /jacq.mwb.bak +/out \ No newline at end of file From 23e0c28980cd95f6c213aa09689ede61400c9f5c Mon Sep 17 00:00:00 2001 From: Hans Sowa Date: Wed, 18 Mar 2026 15:02:48 +0100 Subject: [PATCH 5/6] Add deployment based on ssh --- .github/workflows/build.yml | 22 ++++ .github/workflows/deploy.yml | 180 +++++++++++++++--------------- jacq-birt/hbv_worklabel.rptdesign | 4 +- 3 files changed, 116 insertions(+), 90 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20f8d551..5a8d2570 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,24 @@ on: pull_request: branches: [ main, master, feature/next ] workflow_dispatch: + inputs: + deploy: + description: 'Deploy after build?' + type: boolean + default: false + environment: + description: 'Environment to deploy to' + type: choice + options: [test, production] + default: test + workflow_call: + inputs: + deploy: + type: boolean + default: false + environment: + type: string + default: test jobs: build: @@ -34,3 +52,7 @@ jobs: path: | **/target/*.jar **/target/*.war + jacq-birt/*.ttf + jacq-birt/*.rptdesign + jacq-*/target/*.jar + jacq-*/target/*.war diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a6333cd6..afa2b504 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,100 +1,104 @@ -name: Deploy to Remote WildFly +name: Deploy on: - workflow_run: - workflows: ["Build"] - types: - - completed - branches: [main, master, feature/next] workflow_dispatch: + inputs: + run_id: + description: 'Build workflow run ID' + required: true + type: string + environment: + description: 'Environment' + required: true + type: choice + options: [test, production] jobs: deploy: runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }} + environment: ${{ github.event.inputs.environment }} env: WILDFLY_HOST: ${{ vars.WILDFLY_HOST }} - WILDFLY_PORT: ${{ vars.WILDFLY_PORT || '9990' }} - WILDFLY_USERNAME: ${{ secrets.WILDFLY_USERNAME }} - WILDFLY_PASSWORD: ${{ secrets.WILDFLY_PASSWORD }} steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - - - name: Make Maven wrapper executable - run: chmod +x jacq/mvnw - if: ${{ github.event_name == 'workflow_dispatch' }} - - - name: Download artifacts - uses: actions/download-artifact@v4 - with: - name: jacq-artifacts - path: artifacts - if: ${{ github.event_name != 'workflow_dispatch' }} - - - name: Build with Maven if triggered manually - run: cd jacq && ./mvnw -B package -DskipTests=true - if: ${{ github.event_name == 'workflow_dispatch' }} - - - name: Download WildFly CLI Client (TEMPORARILY DISABLED) - run: | - # TEMPORARILY DISABLED FOR TESTING OTHER GITHUB ACTIONS - # Uncomment the following code to re-enable deployment - - # wget https://download.jboss.org/wildfly/31.0.1.Final/wildfly-31.0.1.Final.tar.gz - # tar -xzf wildfly-31.0.1.Final.tar.gz --strip-components=1 wildfly-31.0.1.Final/bin - # chmod +x bin/jboss-cli.sh - echo "WildFly CLI Client download is currently disabled for testing purposes." - - - name: Validate WildFly Connection Parameters (TEMPORARILY DISABLED) - run: | - # TEMPORARILY DISABLED FOR TESTING OTHER GITHUB ACTIONS - # Uncomment the following code to re-enable deployment - - # if [ -z "$WILDFLY_HOST" ]; then - # echo "Error: WILDFLY_HOST is not set. Please configure this in GitHub repository variables." - # exit 1 - # fi - # - # if [ -z "$WILDFLY_USERNAME" ] || [ -z "$WILDFLY_PASSWORD" ]; then - # echo "Error: WILDFLY_USERNAME and/or WILDFLY_PASSWORD are not set. Please configure these in GitHub repository secrets." - # exit 1 - # fi - # - # echo "WildFly connection parameters validated." - echo "WildFly connection parameter validation is currently disabled for testing purposes." - - - name: Deploy to Remote WildFly (TEMPORARILY DISABLED) - run: | - # DEPLOYMENT TEMPORARILY DISABLED FOR TESTING OTHER GITHUB ACTIONS - # Uncomment the following code to re-enable deployment - - # # Create CLI connection properties file - # cat > wildfly-connection.properties << EOF - # remote.connection.host=$WILDFLY_HOST - # remote.connection.port=$WILDFLY_PORT - # remote.connection.username=$WILDFLY_USERNAME - # remote.connection.password=$WILDFLY_PASSWORD - # EOF - - # # If manually triggered, use the newly built artifacts - # if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then - # ARTIFACTS_PATH="**/target" - # else - # ARTIFACTS_PATH="artifacts" - # fi - - # # Deploy each WAR file to WildFly - # for war_file in $(find $ARTIFACTS_PATH -name "*.war"); do - # echo "Deploying $war_file to remote WildFly at $WILDFLY_HOST:$WILDFLY_PORT..." - # ./bin/jboss-cli.sh --controller=$WILDFLY_HOST:$WILDFLY_PORT --connect --file=wildfly-connection.properties --command="deploy $war_file --force" - # done - - echo "Deployment is currently disabled for testing purposes." + - name: Download build artifacts + uses: actions/download-artifact@v4 + with: + name: jacq-artifacts + path: artifacts + run-id: ${{ github.event.inputs.run_id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - name: List downloaded files + run: | + echo "Listing artifacts..." + ls -R artifacts + + - name: Create jacq-javaee directory + uses: appleboy/ssh-action@v1.0.3 + with: + host: ${{ env.WILDFLY_HOST }} + username: root + key: ${{ secrets.SSH_PRIVATE_KEY }} + script: mkdir -p /opt/jacq-javaee/jacq-birt + + - name: Copy jacq-birt files + uses: appleboy/scp-action@v0.1.7 + with: + host: ${{ env.WILDFLY_HOST }} + username: root + key: ${{ secrets.SSH_PRIVATE_KEY }} + source: "artifacts/jacq-birt/*" + target: "/opt/jacq-javaee/jacq-birt/" + strip_components: 2 + overwrite: true + + - name: Prepare JARs for upload + run: | + mkdir -p upload + cp artifacts/jacq-common/target/jacq-common-*.jar upload/ + cp artifacts/jacq-service-report/target/jacq-service-report.jar upload/ + ls -l upload + + - name: Copy JARs + uses: appleboy/scp-action@v0.1.7 + with: + host: ${{ env.WILDFLY_HOST }} + username: root + key: ${{ secrets.SSH_PRIVATE_KEY }} + source: "upload/*" + target: "/opt/jacq-javaee/jacq-birt/" + strip_components: 1 + overwrite: true + + - name: Install Code-39 TTF font system-wide + uses: appleboy/ssh-action@v1.0.3 + with: + host: ${{ env.WILDFLY_HOST }} + username: root + key: ${{ secrets.SSH_PRIVATE_KEY }} + script: | + mkdir -p /usr/share/fonts/truetype/ + cp /opt/jacq-javaee/jacq-birt/Code-39-Logitogo-sene.ttf /usr/share/fonts/truetype/ + chmod 644 /usr/share/fonts/truetype/Code-39-Logitogo-sene.ttf + fc-cache -fv + + - name: Deploy via SSH + uses: appleboy/scp-action@v0.1.7 + with: + host: ${{ env.WILDFLY_HOST }} + username: root + key: ${{ secrets.SSH_PRIVATE_KEY }} + source: "artifacts/jacq-*/target/*.war" + target: "/opt/wildfly/standalone/deployments/" + strip_components: 3 + overwrite: true + + - name: Restart WildFly + uses: appleboy/ssh-action@v1.0.3 + with: + host: ${{ env.WILDFLY_HOST }} + username: root + key: ${{ secrets.SSH_PRIVATE_KEY }} + script: systemctl restart wildfly diff --git a/jacq-birt/hbv_worklabel.rptdesign b/jacq-birt/hbv_worklabel.rptdesign index 7bec5e00..772256f8 100644 --- a/jacq-birt/hbv_worklabel.rptdesign +++ b/jacq-birt/hbv_worklabel.rptdesign @@ -28,10 +28,10 @@ pojoClassPath - /opt/jacq-javaee/jacq-birt/jacq-common-0.5.0.jar;/opt/jacq-javaee/jacq-birt/jacq-service-report.jar; + /opt/jacq-javaee/jacq-birt/jacq-common-0.10.0.jar;/opt/jacq-javaee/jacq-birt/jacq-service-report.jar; - /opt/jacq-javaee/jacq-birt/jacq-common-0.5.0.jar;/opt/jacq-javaee/jacq-birt/jacq-service-report.jar; + /opt/jacq-javaee/jacq-birt/jacq-common-0.10.0.jar;/opt/jacq-javaee/jacq-birt/jacq-service-report.jar; From b44a3054b77ae2475f375816126f0acde716e354 Mon Sep 17 00:00:00 2001 From: Hans Sowa Date: Wed, 25 Mar 2026 10:55:48 +0100 Subject: [PATCH 6/6] Update the README --- README.md | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 9e4e9b1d..c13449ed 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ jacq-service contains the actual implementation using manager classes. # To build -We are using the the maven wrapper. So, instead of call mvn please use mvnw. For furher information +We are using the the maven wrapper. So, instead of call mvn please use mvnw which is located in the `jacq` directory. For furher information have a look at https://maven.apache.org/wrapper/index.html This means you don't have to install maven manually. @@ -21,12 +21,12 @@ You can disable tests during the build process in two ways: 1. Using the command-line parameter: ``` - ./mvnw package -DskipTests=true + cd jacq && ./mvnw package -DskipTests=true ``` 2. Using the skip-tests profile: ``` - ./mvnw package -Pskip-tests + cd jacq && ./mvnw package -Pskip-tests ``` Both methods will skip the execution of tests during the build process. @@ -49,24 +49,20 @@ This project uses GitHub Actions for continuous integration and deployment: The build workflow automatically builds the project when changes are pushed to the main/master or feature/next branches, or when a pull request is created targeting these branches. It: 1. Sets up Java 17 -2. Builds the project using the Maven wrapper (mvnw) with tests skipped (-DskipTests=true) -3. Uploads the built artifacts (JAR and WAR files) for later use +2. Builds the project using the Maven wrapper (mvnw) in the `jacq` directory with tests skipped (-DskipTests=true) +3. Uploads the built artifacts (JAR and WAR files, as well as BIRT reports and fonts) for later use You can also trigger the build workflow manually from the Actions tab in GitHub. ## Deploy Workflow -> **Note:** The deployment functionality is temporarily disabled for testing purposes. The workflow will run but will not actually deploy to the WildFly server. +The deploy workflow is designed to automatically deploy the application to a remote WildFly server via SSH/SCP when manually triggered. It: -The deploy workflow is designed to automatically deploy the application to a remote WildFly server when the build workflow completes successfully for the main/master or feature/next branches. When fully enabled, it: - -1. Sets up Java 17 -2. Downloads the built artifacts (or builds the project using the Maven wrapper if triggered manually) -3. Downloads the WildFly CLI client -4. Validates the WildFly connection parameters -5. Deploys the WAR files to the remote WildFly server - -You can also trigger the deploy workflow manually from the Actions tab in GitHub. +1. Downloads the built artifacts from a specific build run +2. Creates the necessary directories on the remote server +3. Copies JARs, WARs, BIRT reports, and fonts to the remote server +4. Installs the Code-39 TTF font system-wide +5. Restarts the WildFly service ### Required GitHub Variables and Secrets @@ -74,10 +70,9 @@ To deploy to a remote WildFly server, you need to configure the following GitHub #### Variables (Settings > Secrets and variables > Actions > Variables) - `WILDFLY_HOST`: The hostname or IP address of your WildFly server -- `WILDFLY_PORT`: (Optional) The management port of your WildFly server (default: 9990) #### Secrets (Settings > Secrets and variables > Actions > Secrets) -- `WILDFLY_USERNAME`: The username for WildFly management authentication -- `WILDFLY_PASSWORD`: The password for WildFly management authentication +- `SSH_PRIVATE_KEY`: The private SSH key used for authentication on the remote server +- `GITHUB_TOKEN`: (Provided automatically by GitHub) Used to download artifacts from other workflows These credentials are used securely by the GitHub Actions workflow to connect to your remote WildFly server and deploy the application.