diff --git a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java index 7479d06c3f6..58e351b3af1 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java @@ -172,6 +172,7 @@ public void destroyResource() { } } + //FIXME TOMEE-4159 Requires implementation @Override public CompletableFuture completedFuture(U u) { return null; diff --git a/tck/concurrency-signature-test/pom.xml b/tck/concurrency-signature-test/pom.xml new file mode 100644 index 00000000000..e873e6a88d8 --- /dev/null +++ b/tck/concurrency-signature-test/pom.xml @@ -0,0 +1,31 @@ + + + + + tck + org.apache.tomee + 10.0.0-M1-SNAPSHOT + + + 4.0.0 + concurrency-signature-test + TomEE :: TCK :: Concurrency Signature Tests + + + + \ No newline at end of file diff --git a/tck/concurrency-standalone/dev.xml b/tck/concurrency-standalone/dev.xml new file mode 100644 index 00000000000..606eb1d9fd8 --- /dev/null +++ b/tck/concurrency-standalone/dev.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + diff --git a/tck/concurrency-standalone/logging.properties b/tck/concurrency-standalone/logging.properties new file mode 100644 index 00000000000..891082e1450 --- /dev/null +++ b/tck/concurrency-standalone/logging.properties @@ -0,0 +1,40 @@ +# Ensure that both your client and sever JVMs point to this file using the java.util.logging property +# -Djava.util.logging.config.file=/path/to/logging.properties + +#Handlers we plan to use +handlers=java.util.logging.FileHandler,java.util.logging.ConsoleHandler + +#Global logger - By default only log warnings +.level=WARNING + +#Concurrency logger - By default log everything for concurrency loggers +ee.jakarta.tck.concurrent.level=ALL + +#Formatting for the simple formatter +java.util.logging.SimpleFormatter.class.log=true +java.util.logging.SimpleFormatter.class.full=false +java.util.logging.SimpleFormatter.class.length=30 + +java.util.logging.SimpleFormatter.level.log=true + +java.util.logging.SimpleFormatter.method.log=true +java.util.logging.SimpleFormatter.method.length=30 + +java.util.logging.SimpleFormatter.thread.log=true +java.util.logging.SimpleFormatter.thread.length=3 + +java.util.logging.SimpleFormatter.time.log=true +java.util.logging.SimpleFormatter.time.format=[MM/dd/yyyy HH:mm:ss:SSS z] + +java.util.logging.SimpleFormatter.format=[%1$tF %1$tT] %4$.1s %3$s %5$s %n + +#File logging +java.util.logging.FileHandler.pattern=ConcurrentTCK%g%u.log +java.util.logging.FileHandler.limit = 500000 +java.util.logging.FileHandler.count = 5 +java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter +java.util.logging.FileHandler.level=CONFIG + +# Console Logging +java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter +java.util.logging.ConsoleHandler.level=WARNING \ No newline at end of file diff --git a/tck/concurrency-standalone/pom.xml b/tck/concurrency-standalone/pom.xml new file mode 100644 index 00000000000..d8788070c61 --- /dev/null +++ b/tck/concurrency-standalone/pom.xml @@ -0,0 +1,234 @@ + + + + + tck + org.apache.tomee + 10.0.0-M1-SNAPSHOT + + + 4.0.0 + concurrency-standalone + TomEE :: TCK :: Concurrency Standalone + + + + UTF-8 + 11 + 11 + + + 3.0.3 + 6.0.0 + 7.5 + 1.6 + 3.3.0 + 3.10.1 + 2.22.2 + + + + + + suite.xml + + + logging.properties + + + ${project.basedir}/target + + + + + + + + org.jboss.arquillian + arquillian-bom + ${version.arquillian.bom} + pom + import + + + + + + + + + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-tck + ${jakarta.concurrent.version} + + + + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-api + ${jakarta.concurrent.version} + + + + org.jboss.arquillian.testng + arquillian-testng-container + ${version.arquillian} + + + + + ${project.groupId} + apache-tomee + ${project.version} + zip + plus + test + + + ${project.groupId} + arquillian-tomee-remote + ${project.version} + test + + + + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.version} + + + + org.testng + testng + ${testng.version} + + + + org.netbeans.tools + sigtest-maven-plugin + ${sigtest.version} + + + + org.apache.derby + derby + ${version.derby} + provided + + + org.apache.derby + derbytools + ${version.derby} + provided + + + + + + + + tck-concurrency + + ${targetDirectory} + clean test + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven.dep.plugin.version} + + + + org.testng + testng + ${testng.version} + + + org.apache.derby + derby + ${derby.version} + + + org.netbeans.tools + sigtest-maven-plugin + ${sigtest.version} + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.comp.plugin.version} + + ${maven.compiler.source} + ${maven.compiler.target} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + + + + java.util.logging.config.file + ${logging.config} + + + + + + + + + + + + + + + + ${suiteXmlFile} + + + + ${basedir}${file.separarator}src${file.separarator}main${file.separarator}java${file.separarator} + + + + + + + + + + \ No newline at end of file diff --git a/tck/concurrency-standalone/src/test/conf/tomcat-users.xml b/tck/concurrency-standalone/src/test/conf/tomcat-users.xml new file mode 100644 index 00000000000..a1fd82bde32 --- /dev/null +++ b/tck/concurrency-standalone/src/test/conf/tomcat-users.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + diff --git a/tck/concurrency-standalone/src/test/resources/arquillian.xml b/tck/concurrency-standalone/src/test/resources/arquillian.xml new file mode 100644 index 00000000000..94022dc59d8 --- /dev/null +++ b/tck/concurrency-standalone/src/test/resources/arquillian.xml @@ -0,0 +1,104 @@ + + + + + + -1 + -1 + -1 + microprofile + false + src/test/conf + false + + mvn:org.apache.derby:derby:10.15.2.0 + mvn:org.apache.derby:derbytools:10.15.2.0 + mvn:org.testng:testng:7.5 + + target/tomee + + openejb.environment.default=true + + + + + + -1 + -1 + -1 + microprofile + false + src/test/conf + false + + mvn:org.apache.derby:derby:10.15.2.0 + mvn:org.apache.derby:derbytools:10.15.2.0 + mvn:org.testng:testng:7.5 + + target/tomee + + openejb.environment.default=true + + + + + + -1 + -1 + -1 + microprofile + false + src/test/conf + false + + mvn:org.apache.derby:derby:10.15.2.0 + mvn:org.apache.derby:derbytools:10.15.2.0 + mvn:org.testng:testng:7.5 + + target/tomee + + openejb.environment.default=true + + + + + + -1 + -1 + -1 + webprofile + false + src/test/conf + false + + mvn:org.apache.derby:derby:10.15.2.0 + mvn:org.apache.derby:derbytools:10.15.2.0 + mvn:org.testng:testng:7.5 + + target/tomee + + openejb.environment.default=true + + + + diff --git a/tck/concurrency-standalone/suite-web.xml b/tck/concurrency-standalone/suite-web.xml new file mode 100644 index 00000000000..5bf8dc87347 --- /dev/null +++ b/tck/concurrency-standalone/suite-web.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tck/concurrency-standalone/suite.xml b/tck/concurrency-standalone/suite.xml new file mode 100644 index 00000000000..119824cfc17 --- /dev/null +++ b/tck/concurrency-standalone/suite.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tck/pom.xml b/tck/pom.xml index 89fa460d21d..5414411d678 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -41,6 +41,8 @@ bval-embedded bval-tomee bval-signature-test + concurrency-standalone + concurrency-signature-test microprofile-tck