diff --git a/imixs-archive-api/src/main/resources/META-INF/beans.xml b/imixs-archive-api/src/main/resources/META-INF/beans.xml index e7d2c6c7..debd97c1 100644 --- a/imixs-archive-api/src/main/resources/META-INF/beans.xml +++ b/imixs-archive-api/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" + bean-discovery-mode="all" version="3.0"> \ No newline at end of file diff --git a/imixs-archive-backup/src/main/resources/bundle/message.properties b/imixs-archive-backup/src/main/resources/bundle/message.properties index 36e1e237..f8fca14e 100644 --- a/imixs-archive-backup/src/main/resources/bundle/message.properties +++ b/imixs-archive-backup/src/main/resources/bundle/message.properties @@ -28,5 +28,5 @@ dateTimePatternLong=EEE, dd. MMM yyyy HH:mm:ss ################################################## error_title=Input Errors! error_message=Please correct input fields marked with a * -javax.faces.component.UIInput.REQUIRED=* -javax.faces.component.UIInput.REQUIRED_detail=please enter the required value +jakarta.faces.component.UIInput.REQUIRED=* +jakarta.faces.component.UIInput.REQUIRED_detail=please enter the required value diff --git a/imixs-archive-backup/src/main/webapp/WEB-INF/beans.xml b/imixs-archive-backup/src/main/webapp/WEB-INF/beans.xml index 978c86db..7822072f 100644 --- a/imixs-archive-backup/src/main/webapp/WEB-INF/beans.xml +++ b/imixs-archive-backup/src/main/webapp/WEB-INF/beans.xml @@ -1,8 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" + bean-discovery-mode="all" version="3.0"> \ No newline at end of file diff --git a/imixs-archive-documents/src/main/resources/META-INF/beans.xml b/imixs-archive-documents/src/main/resources/META-INF/beans.xml index 51e8caf9..debd97c1 100644 --- a/imixs-archive-documents/src/main/resources/META-INF/beans.xml +++ b/imixs-archive-documents/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" + bean-discovery-mode="all" version="3.0"> \ No newline at end of file diff --git a/imixs-archive-exporter/src/main/resources/bundle/message.properties b/imixs-archive-exporter/src/main/resources/bundle/message.properties index 12738ea5..acbf799b 100644 --- a/imixs-archive-exporter/src/main/resources/bundle/message.properties +++ b/imixs-archive-exporter/src/main/resources/bundle/message.properties @@ -28,5 +28,5 @@ dateTimePatternLong=EEE, dd. MMM yyyy HH:mm:ss ################################################## error_title=Input Errors! error_message=Please correct input fields marked with a * -javax.faces.component.UIInput.REQUIRED=* -javax.faces.component.UIInput.REQUIRED_detail=please enter the required value +jakarta.faces.component.UIInput.REQUIRED=* +jakarta.faces.component.UIInput.REQUIRED_detail=please enter the required value diff --git a/imixs-archive-exporter/src/main/webapp/WEB-INF/beans.xml b/imixs-archive-exporter/src/main/webapp/WEB-INF/beans.xml index 978c86db..7822072f 100644 --- a/imixs-archive-exporter/src/main/webapp/WEB-INF/beans.xml +++ b/imixs-archive-exporter/src/main/webapp/WEB-INF/beans.xml @@ -1,8 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" + bean-discovery-mode="all" version="3.0"> \ No newline at end of file diff --git a/imixs-archive-importer/src/main/java/org/imixs/archive/importer/ftp/FTPImportService.java b/imixs-archive-importer/src/main/java/org/imixs/archive/importer/ftp/FTPImportService.java index 81e3faf0..37b89390 100644 --- a/imixs-archive-importer/src/main/java/org/imixs/archive/importer/ftp/FTPImportService.java +++ b/imixs-archive-importer/src/main/java/org/imixs/archive/importer/ftp/FTPImportService.java @@ -32,11 +32,6 @@ import java.io.IOException; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.enterprise.event.Observes; -import javax.ws.rs.core.MediaType; - import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPFile; @@ -52,6 +47,11 @@ import org.imixs.workflow.exceptions.PluginException; import org.imixs.workflow.exceptions.ProcessingErrorException; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.core.MediaType; + /** * The FTPImportService reacts on DocumentImportEvent and processes a FTP data * source. @@ -161,7 +161,7 @@ public void onEvent(@Observes DocumentImportEvent event) { continue; } logger.info("import file " + file.getName() + "..."); - //String fullFileName = ftpPath + "/" + file.getName(); + // String fullFileName = ftpPath + "/" + file.getName(); try (ByteArrayOutputStream is = new ByteArrayOutputStream();) { ftpClient.retrieveFile(file.getName(), is); byte[] rawData = is.toByteArray(); diff --git a/imixs-archive-importer/src/main/resources/META-INF/beans.xml b/imixs-archive-importer/src/main/resources/META-INF/beans.xml index df2f19fe..7822072f 100644 --- a/imixs-archive-importer/src/main/resources/META-INF/beans.xml +++ b/imixs-archive-importer/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - - + \ No newline at end of file diff --git a/imixs-archive-service/src/main/webapp/WEB-INF/beans.xml b/imixs-archive-service/src/main/webapp/WEB-INF/beans.xml index 1c97df0e..debd97c1 100644 --- a/imixs-archive-service/src/main/webapp/WEB-INF/beans.xml +++ b/imixs-archive-service/src/main/webapp/WEB-INF/beans.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd" + bean-discovery-mode="all" version="3.0"> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1b4bae50..5a780ae4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 org.imixs.workflow imixs-archive @@ -81,14 +83,14 @@ UTF-8 UTF-8 11 - 11 + 11 10.0.0 - 6.0.3 + 6.0.4-SNAPSHOT 2.0.1 6.0.0 2.0.21 6.0 - 4.0 + 4.0 @@ -302,10 +304,10 @@ - jakarta.platform - jakarta.jakartaee-api - ${jakarta.version} - provided + jakarta.platform + jakarta.jakartaee-api + ${jakarta.version} + provided @@ -316,7 +318,7 @@ pom provided - + org.eclipse.parsson @@ -325,17 +327,17 @@ test - org.glassfish.jaxb - jaxb-runtime - 3.0.0 - test + org.glassfish.jaxb + jaxb-runtime + 3.0.0 + test + + + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.0 + test - - jakarta.xml.bind - jakarta.xml.bind-api - 3.0.0 - test - junit junit @@ -353,7 +355,7 @@ imixs-mock ${org.imixs.mock.version} test - +