fixed beans.xml and other resources

Issue #199
imixs · Dec 8, 2023 · 4e73e1b · 4e73e1b
1 parent 88c3880
commit 4e73e1b
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 51 deletions.
diff --git 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
-       bean-discovery-mode="annotated" version="2.0">
+       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">
 </beans>
diff --git 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
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
-     https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
-	version="4.0" bean-discovery-mode="annotated">
-	<!-- CDI configuration here. -->
+	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">
 </beans>
diff --git 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
-       bean-discovery-mode="all" version="2.0">
+       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">
 </beans>
diff --git 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
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
-     https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
-	version="4.0" bean-discovery-mode="annotated">
-	<!-- CDI configuration here. -->
+	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">
 </beans>
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
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-	version="1.2" bean-discovery-mode="all">
-
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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">
 </beans>
diff --git 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-       bean-discovery-mode="all">
+       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">
 </beans>
diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.imixs.workflow</groupId>
 	<artifactId>imixs-archive</artifactId>
@@ -81,14 +83,14 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>	
+		<maven.compiler.target>11</maven.compiler.target>
 		<jakarta.version>10.0.0</jakarta.version>
-		<org.imixs.workflow.version>6.0.3</org.imixs.workflow.version>
+		<org.imixs.workflow.version>6.0.4-SNAPSHOT</org.imixs.workflow.version>
 		<org.imixs.melman.version>2.0.1</org.imixs.melman.version>
 		<org.imixs.mock.version>6.0.0</org.imixs.mock.version>
 		<apache.pdfbox.version>2.0.21</apache.pdfbox.version>
 		<microprofile.version>6.0</microprofile.version>
-		<microprofile-metrics.version>4.0</microprofile-metrics.version>		
+		<microprofile-metrics.version>4.0</microprofile-metrics.version>
 	</properties>
 
 	<repositories>
@@ -302,10 +304,10 @@
 
 		<!-- Jakarta EE -->
 		<dependency>
-		    <groupId>jakarta.platform</groupId>
-		    <artifactId>jakarta.jakartaee-api</artifactId>
-		    <version>${jakarta.version}</version>
-		    <scope>provided</scope>
+			<groupId>jakarta.platform</groupId>
+			<artifactId>jakarta.jakartaee-api</artifactId>
+			<version>${jakarta.version}</version>
+			<scope>provided</scope>
 		</dependency>
 
 		<!-- Microprofile -->
@@ -316,7 +318,7 @@
 			<type>pom</type>
 			<scope>provided</scope>
 		</dependency>
-	
+
 		<!-- Testing -->
 		<dependency>
 			<groupId>org.eclipse.parsson</groupId>
@@ -325,17 +327,17 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-		    <groupId>org.glassfish.jaxb</groupId>
-		    <artifactId>jaxb-runtime</artifactId>
-		    <version>3.0.0</version>
-		    <scope>test</scope>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>3.0.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>3.0.0</version>
+			<scope>test</scope>
 		</dependency>
-    	<dependency>
-	       <groupId>jakarta.xml.bind</groupId>
-	       <artifactId>jakarta.xml.bind-api</artifactId>
-	       <version>3.0.0</version>
-	       <scope>test</scope>
-	    </dependency>		
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -353,7 +355,7 @@
 			<artifactId>imixs-mock</artifactId>
 			<version>${org.imixs.mock.version}</version>
 			<scope>test</scope>
-		</dependency>		
+		</dependency>
 	</dependencies>