diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..5a8d2570 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,58 @@ +name: Build + +on: + push: + branches: [ main, master, feature/next ] + 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: + 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 + jacq-birt/*.ttf + jacq-birt/*.rptdesign + jacq-*/target/*.jar + jacq-*/target/*.war diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..afa2b504 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,104 @@ +name: Deploy + +on: + 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 + environment: ${{ github.event.inputs.environment }} + + env: + WILDFLY_HOST: ${{ vars.WILDFLY_HOST }} + + steps: + - 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/README.md b/README.md index 779c1e2f..c13449ed 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,78 @@ Development Setup -- Netbeans (8.0.2) +- openjdk 17 - WildFly Plugin / JavaEE Edition -- WildFly 8.2 +- WildFly 31.0.1.Final 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 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. + +## Skipping Tests + +You can disable tests during the build process in two ways: + +1. Using the command-line parameter: + ``` + cd jacq && ./mvnw package -DskipTests=true + ``` + +2. Using the skip-tests profile: + ``` + cd jacq && ./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) 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 + +The deploy workflow is designed to automatically deploy the application to a remote WildFly server via SSH/SCP when manually triggered. It: + +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 + +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 + +#### Secrets (Settings > Secrets and variables > Actions > Secrets) +- `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. 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; diff --git a/jacq-common/pom.xml b/jacq-common/pom.xml index 7ed72e4f..00a555a8 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 + ${jakartaee.version} 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..bed41cea 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 + ${jakartaee.version} + provided + + + jakarta.platform + jakarta.jakartaee-web-api + ${jakartaee.version} 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..1d30b542 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 + ${jakartaee.version} 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..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,14 +7,15 @@ import org.jacq.input.SessionManager; 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.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 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; @@ -29,12 +30,19 @@ 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; /** * * @author wkoller */ -@ManagedBean +@Named @ViewScoped public class LivingPlantController implements Serializable, OrganisationSelectListener { @@ -60,7 +68,7 @@ public class LivingPlantController implements Serializable, OrganisationSelectLi protected Boolean downloadRender; - @ManagedProperty(value = "#{organisationHierarchicSelectController}") + @Inject protected OrganisationHierarchicSelectController organisationHierarchicSelectController; @PostConstruct @@ -166,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 a101b8c4..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 @@ -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 { @@ -157,14 +156,14 @@ 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; - @ManagedProperty(value = "#{organisationHierarchicSelectController}") + @Inject() protected OrganisationHierarchicSelectController organisationHierarchicSelectController; @PostConstruct @@ -354,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(); @@ -403,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 @@ -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(); } /** @@ -610,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; } @@ -622,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/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 c33c579c..00000000 Binary files a/jacq-input/src/main/webapp/WEB-INF/lib/omega-menu-1.1.2.jar and /dev/null differ 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 00000000..3b2fde28 Binary files /dev/null and b/jacq-input/src/main/webapp/WEB-INF/lib/omega-theme-5.1.0-jakarta.jar differ 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..13e7c350 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"> - +
@@ -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"> @@ -261,123 +261,123 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 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 e8a10db6..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/404.png and /dev/null differ 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 bb8b1d37..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/access.png and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_1.png b/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_1.png deleted file mode 100644 index 94c97111..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_1.png and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_2.png b/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_2.png deleted file mode 100644 index 9bd298d2..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_2.png and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_3.png b/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_3.png deleted file mode 100644 index fbc3d881..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_3.png and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_4.png b/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_4.png deleted file mode 100644 index 5fd11309..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/avatar_4.png and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/error.png b/jacq-input/src/main/webapp/resources/omega-layout/images/error.png deleted file mode 100644 index d24df7ab..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/error.png and /dev/null differ 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 b55b3b0f..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section1_bg.jpg and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section1_logo.png b/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section1_logo.png deleted file mode 100644 index d15a1ef1..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section1_logo.png and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_1.png b/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_1.png deleted file mode 100644 index 6243d720..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_1.png and /dev/null differ 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 f7b93916..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_2.png and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_3.png b/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_3.png deleted file mode 100644 index 0121fb14..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_3.png and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_4.png b/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_4.png deleted file mode 100644 index 01131d97..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_4.png and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_5.png b/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_5.png deleted file mode 100644 index 1d7bcff8..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_5.png and /dev/null differ 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 61fa40fe..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section2_6.png and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section3_mobile.png b/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section3_mobile.png deleted file mode 100644 index 641b56c9..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/landing/section3_mobile.png and /dev/null differ diff --git a/jacq-input/src/main/webapp/resources/omega-layout/images/login-logo.png b/jacq-input/src/main/webapp/resources/omega-layout/images/login-logo.png deleted file mode 100644 index 1f5d2500..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/login-logo.png and /dev/null differ 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 a2020474..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/logo-colored.png and /dev/null differ 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 b17fffea..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/logo.png and /dev/null differ 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 510a1322..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/preloader.gif and /dev/null differ 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 471bf6f9..00000000 Binary files a/jacq-input/src/main/webapp/resources/omega-layout/images/profile.png and /dev/null differ 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 + ${jakartaee.version} 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..6da58bf9 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 + ${jakartaee.version} 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..493698fa 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 + ${jakartaee.version} 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..22b83331 100644 --- a/jacq-service-report/pom.xml +++ b/jacq-service-report/pom.xml @@ -39,21 +39,27 @@ - javax - javaee-web-api - 7.0 + xml-apis + xml-apis + 1.4.01 + + + jakarta.platform + jakarta.jakartaee-web-api + ${jakartaee.version} 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 +69,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/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 1993710c..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 @@ -8,13 +8,14 @@ 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; +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-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..e7275b4c 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 + ${jakartaee.version} 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()); + } + + // 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-service/src/main/java/org/jacq/service/manager/OrganisationManager.java b/jacq-service/src/main/java/org/jacq/service/manager/OrganisationManager.java index 26172fe4..bd7e9c3e 100644 --- a/jacq-service/src/main/java/org/jacq/service/manager/OrganisationManager.java +++ b/jacq-service/src/main/java/org/jacq/service/manager/OrganisationManager.java @@ -17,17 +17,17 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -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.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +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.apache.commons.lang3.StringUtils; import org.jacq.common.manager.BaseOrganisationManager; import org.jacq.common.model.rest.OrganisationResult; diff --git a/jacq-service/src/main/java/org/jacq/service/manager/PersonManager.java b/jacq-service/src/main/java/org/jacq/service/manager/PersonManager.java index c31347be..0d77299f 100644 --- a/jacq-service/src/main/java/org/jacq/service/manager/PersonManager.java +++ b/jacq-service/src/main/java/org/jacq/service/manager/PersonManager.java @@ -16,10 +16,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.TblPerson; import org.jacq.common.model.rest.PersonResult; import org.jacq.common.rest.PersonService; diff --git a/jacq-service/src/main/java/org/jacq/service/manager/SecurityManager.java b/jacq-service/src/main/java/org/jacq/service/manager/SecurityManager.java index e10da6f7..e5a2b4eb 100644 --- a/jacq-service/src/main/java/org/jacq/service/manager/SecurityManager.java +++ b/jacq-service/src/main/java/org/jacq/service/manager/SecurityManager.java @@ -16,9 +16,9 @@ package org.jacq.service.manager; import java.io.Serializable; -import javax.annotation.ManagedBean; -import javax.inject.Inject; -import javax.security.enterprise.SecurityContext; +import jakarta.annotation.ManagedBean; +import jakarta.inject.Inject; +import jakarta.security.enterprise.SecurityContext; import org.jacq.common.model.rest.UserResult; import org.jacq.service.security.ServiceCallerPrincipal; diff --git a/jacq-service/src/main/java/org/jacq/service/manager/SeedExchangeManager.java b/jacq-service/src/main/java/org/jacq/service/manager/SeedExchangeManager.java index 328b4399..656cddf8 100644 --- a/jacq-service/src/main/java/org/jacq/service/manager/SeedExchangeManager.java +++ b/jacq-service/src/main/java/org/jacq/service/manager/SeedExchangeManager.java @@ -5,15 +5,15 @@ */ package org.jacq.service.manager; +import java.time.LocalDate; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import javax.annotation.ManagedBean; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.transaction.Transactional; +import jakarta.annotation.ManagedBean; +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.FrmwrkUser; import org.jacq.common.model.jpa.TblDerivative; import org.jacq.common.model.jpa.TblOrganisation; @@ -84,7 +84,7 @@ public SeedOrderResult save(SeedOrderResult seedOrderResult) { FrmwrkUser frmwrkUser = em.find(FrmwrkUser.class, securityManager.getUser().getId()); // set all necessary properties for order - tblSeedOrder.setOrderDate(new Date()); + tblSeedOrder.setOrderDate(LocalDate.now()); tblSeedOrder.setAnnotation(seedOrderResult.getAnnotation()); tblSeedOrder.setComplete(true); tblSeedOrder.setOrdererOrganisationId(em.find(TblOrganisation.class, seedOrderResult.getOrdererOrganisation().getOrganisationId())); diff --git a/jacq-service/src/main/java/org/jacq/service/manager/TreeRecordFileManager.java b/jacq-service/src/main/java/org/jacq/service/manager/TreeRecordFileManager.java index e0f1867f..89f4b6cb 100644 --- a/jacq-service/src/main/java/org/jacq/service/manager/TreeRecordFileManager.java +++ b/jacq-service/src/main/java/org/jacq/service/manager/TreeRecordFileManager.java @@ -27,16 +27,16 @@ import java.util.Date; import java.util.List; import java.util.logging.Logger; -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.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.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.rest.TreeRecordFileResult; import org.jacq.common.model.jpa.TblTreeRecordFile; import org.jacq.common.model.jpa.TblTreeRecordFilePage; diff --git a/jacq-service/src/main/java/org/jacq/service/manager/UserManager.java b/jacq-service/src/main/java/org/jacq/service/manager/UserManager.java index 9c6df4b1..150748ab 100644 --- a/jacq-service/src/main/java/org/jacq/service/manager/UserManager.java +++ b/jacq-service/src/main/java/org/jacq/service/manager/UserManager.java @@ -18,19 +18,19 @@ 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.Join; -import javax.persistence.criteria.JoinType; -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.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.transaction.Transactional; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; diff --git a/jacq-service/src/main/java/org/jacq/service/manager/UuidManager.java b/jacq-service/src/main/java/org/jacq/service/manager/UuidManager.java index ec425bf2..7b1690f3 100644 --- a/jacq-service/src/main/java/org/jacq/service/manager/UuidManager.java +++ b/jacq-service/src/main/java/org/jacq/service/manager/UuidManager.java @@ -2,11 +2,11 @@ import java.io.Serializable; import java.util.UUID; -import javax.annotation.ManagedBean; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.ws.rs.NotFoundException; +import jakarta.annotation.ManagedBean; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.ws.rs.NotFoundException; import org.jacq.common.model.jpa.SrvcUuidMinter; import org.jacq.common.model.jpa.SrvcUuidMinterType; import org.jacq.common.rest.UuidService; diff --git a/jacq-service/src/main/java/org/jacq/service/manager/VegetativeManager.java b/jacq-service/src/main/java/org/jacq/service/manager/VegetativeManager.java index 043673bf..e04190e3 100644 --- a/jacq-service/src/main/java/org/jacq/service/manager/VegetativeManager.java +++ b/jacq-service/src/main/java/org/jacq/service/manager/VegetativeManager.java @@ -5,10 +5,10 @@ */ package org.jacq.service.manager; -import javax.annotation.ManagedBean; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.transaction.Transactional; +import jakarta.annotation.ManagedBean; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.transaction.Transactional; import org.jacq.common.model.jpa.TblDerivative; import org.jacq.common.model.jpa.TblDerivativeType; import org.jacq.common.model.jpa.TblOrganisation; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/JacqService.java b/jacq-service/src/main/java/org/jacq/service/rest/JacqService.java index e6e9c443..02a0357e 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/JacqService.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/JacqService.java @@ -1,7 +1,7 @@ package org.jacq.service.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 JacqService extends Application { diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/AcquisitionServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/AcquisitionServiceImpl.java index cb1867d7..56555a87 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/AcquisitionServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/AcquisitionServiceImpl.java @@ -6,7 +6,7 @@ package org.jacq.service.rest.impl; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.model.rest.AcquisitionSourceResult; import org.jacq.common.rest.AcquisitionService; import org.jacq.service.manager.AcquisitionManager; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/AuthorizationServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/AuthorizationServiceImpl.java index ef45530d..605facd5 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/AuthorizationServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/AuthorizationServiceImpl.java @@ -17,7 +17,7 @@ import java.util.Date; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.model.rest.AccessOrganisationResult; import org.jacq.common.rest.AuthorizationService; import org.jacq.service.manager.AuthorizationManager; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/ClassificationServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/ClassificationServiceImpl.java index 59897cd9..011769dc 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/ClassificationServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/ClassificationServiceImpl.java @@ -19,9 +19,9 @@ import java.util.UUID; 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.jacq.common.model.rest.ClassificationSourceType; import org.jacq.common.model.jpa.RevClassification; import org.jacq.common.model.jpa.ViewClassificationResult; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/DerivativeServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/DerivativeServiceImpl.java index ef6ddd69..0a7912a7 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/DerivativeServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/DerivativeServiceImpl.java @@ -16,9 +16,9 @@ package org.jacq.service.rest.impl; import java.util.List; -import javax.annotation.ManagedBean; -import javax.inject.Inject; -import javax.ws.rs.core.Response; +import jakarta.annotation.ManagedBean; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; import org.jacq.service.manager.DerivativeManager; import org.jacq.common.model.jpa.custom.BotanicalObjectDerivative; import org.jacq.common.model.rest.BotanicalObjectDownloadResult; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/GatheringServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/GatheringServiceImpl.java index 9871188c..f1ef2d24 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/GatheringServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/GatheringServiceImpl.java @@ -6,7 +6,7 @@ package org.jacq.service.rest.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.manager.GatheringManager; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/IndexSeminumServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/IndexSeminumServiceImpl.java index 50fd1dc1..b3114736 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/IndexSeminumServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/IndexSeminumServiceImpl.java @@ -18,8 +18,8 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; 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-service/src/main/java/org/jacq/service/rest/impl/InventoryServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/InventoryServiceImpl.java index b6b488f9..ba74edc3 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/InventoryServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/InventoryServiceImpl.java @@ -16,7 +16,7 @@ package org.jacq.service.rest.impl; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.model.rest.InventoryResult; import org.jacq.common.model.rest.InventoryTypeResult; import org.jacq.common.rest.InventoryService; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/OrganisationServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/OrganisationServiceImpl.java index 833a73f7..6e5f86d0 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/OrganisationServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/OrganisationServiceImpl.java @@ -16,7 +16,7 @@ package org.jacq.service.rest.impl; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.model.rest.OrganisationResult; import org.jacq.common.rest.OrganisationService; import org.jacq.service.manager.OrganisationManager; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/PersonServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/PersonServiceImpl.java index 7d757a72..57f634a5 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/PersonServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/PersonServiceImpl.java @@ -16,7 +16,7 @@ package org.jacq.service.rest.impl; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.model.rest.PersonResult; import org.jacq.common.rest.PersonService; import org.jacq.service.manager.PersonManager; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/PortalServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/PortalServiceImpl.java index 803013dd..f60c482e 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/PortalServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/PortalServiceImpl.java @@ -16,7 +16,7 @@ package org.jacq.service.rest.impl; import java.util.HashMap; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.rest.PortalService; import org.jacq.service.JacqServiceConfig; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/SeedExchangeServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/SeedExchangeServiceImpl.java index 3335d987..b64dc074 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/SeedExchangeServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/SeedExchangeServiceImpl.java @@ -6,7 +6,7 @@ package org.jacq.service.rest.impl; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.model.rest.SeedOrderResult; import org.jacq.common.rest.SeedExchangeService; import org.jacq.service.manager.SeedExchangeManager; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/TreeRecordFileServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/TreeRecordFileServiceImpl.java index ca789474..7f4a2415 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/TreeRecordFileServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/TreeRecordFileServiceImpl.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.model.rest.TreeRecordFilePageResult; import org.jacq.common.model.rest.TreeRecordFileResult; import org.jacq.common.rest.TreeRecordFileService; diff --git a/jacq-service/src/main/java/org/jacq/service/rest/impl/UserServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/UserServiceImpl.java index 1ddeaabb..b1275dec 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/UserServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/UserServiceImpl.java @@ -17,7 +17,7 @@ import java.util.Date; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; 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-service/src/main/java/org/jacq/service/rest/impl/UuidServiceImpl.java b/jacq-service/src/main/java/org/jacq/service/rest/impl/UuidServiceImpl.java index af63c781..002d384a 100644 --- a/jacq-service/src/main/java/org/jacq/service/rest/impl/UuidServiceImpl.java +++ b/jacq-service/src/main/java/org/jacq/service/rest/impl/UuidServiceImpl.java @@ -1,6 +1,6 @@ package org.jacq.service.rest.impl; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jacq.common.rest.UuidService; import org.jacq.service.manager.UuidManager; diff --git a/jacq-service/src/main/java/org/jacq/service/security/ServiceCallerPrincipal.java b/jacq-service/src/main/java/org/jacq/service/security/ServiceCallerPrincipal.java index 1ed16f5f..77abe0a8 100644 --- a/jacq-service/src/main/java/org/jacq/service/security/ServiceCallerPrincipal.java +++ b/jacq-service/src/main/java/org/jacq/service/security/ServiceCallerPrincipal.java @@ -15,7 +15,7 @@ */ package org.jacq.service.security; -import javax.security.enterprise.CallerPrincipal; +import jakarta.security.enterprise.CallerPrincipal; import org.jacq.common.model.rest.UserResult; /** diff --git a/jacq-service/src/main/java/org/jacq/service/security/ServiceIdentityStore.java b/jacq-service/src/main/java/org/jacq/service/security/ServiceIdentityStore.java index c42e7b61..368f3a96 100644 --- a/jacq-service/src/main/java/org/jacq/service/security/ServiceIdentityStore.java +++ b/jacq-service/src/main/java/org/jacq/service/security/ServiceIdentityStore.java @@ -16,13 +16,13 @@ package org.jacq.service.security; import java.util.HashSet; -import javax.annotation.security.DeclareRoles; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -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.security.DeclareRoles; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +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.service.manager.UserManager; diff --git a/jacq-service/src/main/resources/META-INF/persistence.xml b/jacq-service/src/main/resources/META-INF/persistence.xml index 586814c8..201ce8d9 100644 --- a/jacq-service/src/main/resources/META-INF/persistence.xml +++ b/jacq-service/src/main/resources/META-INF/persistence.xml @@ -1,5 +1,8 @@ - + 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/.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 diff --git a/jacq/.mvn/wrapper/maven-wrapper.jar b/jacq/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..cb28b0e3 Binary files /dev/null and b/jacq/.mvn/wrapper/maven-wrapper.jar differ 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..118caa73 100644 --- a/jacq/pom.xml +++ b/jacq/pom.xml @@ -17,33 +17,72 @@ - - - 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 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.5 + + ${skipTests} + + + + + + + + skip-tests + + true + + + - 1.8 - 1.8 + 17 + 17 UTF-8 + 10.0.0 + false