You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/04/11 13:09:53 UTC
[tomee] branch master updated (8dc287517e -> 047b906289)
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
from 8dc287517e Basic support and configuration for MicroProfile OpenTracing
new 5891c2746b Don't run SSE tests because TCK still has 1 javax.servlet
new a0f2293602 Disable client tracing for the moment
new 3c6c6591c6 Make sure we always have a default tracer
new 047b906289 Consistent name for examples projects
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/mp-config-example/pom.xml | 2 +-
examples/mp-config-source-database/pom.xml | 2 +-
.../mp-jwt-bean-validation-strongly-typed/pom.xml | 2 +-
examples/mp-jwt-bean-validation/pom.xml | 2 +-
examples/mp-metrics-gauge/pom.xml | 1 +
examples/mp-metrics-metered/pom.xml | 1 +
examples/mp-opentracing-traced/pom.xml | 1 +
...croProfileOpenTracingTCKDeploymentPackager.java | 2 +-
tck/microprofile-tck/rest-client/pom.xml | 5 +++++
.../{config => rest-client}/tck-suite.xml | 13 +++++++++----
.../microprofile/opentracing/TracerProducer.java | 22 +++++++++++++---------
11 files changed, 35 insertions(+), 18 deletions(-)
copy tck/microprofile-tck/{config => rest-client}/tck-suite.xml (70%)
copy tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKTracer.java => tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/TracerProducer.java (70%)
[tomee] 03/04: Make sure we always have a default tracer
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 3c6c6591c63597fbdb9a53b13c169e349bf6724a
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Mon Apr 11 15:09:24 2022 +0200
Make sure we always have a default tracer
---
.../microprofile/opentracing/TracerProducer.java | 32 ++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/TracerProducer.java b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/TracerProducer.java
new file mode 100644
index 0000000000..2e9dd317ec
--- /dev/null
+++ b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/opentracing/TracerProducer.java
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+package org.apache.tomee.microprofile.opentracing;
+
+import io.opentracing.Tracer;
+import io.opentracing.util.GlobalTracer;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+
+@Dependent
+public class TracerProducer {
+ @Produces
+ @ApplicationScoped
+ Tracer tracer() {
+ return GlobalTracer.get();
+ }
+}
\ No newline at end of file
[tomee] 02/04: Disable client tracing for the moment
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a0f229360263a240e255a0310c25ab3494b3b874
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Mon Apr 11 15:09:12 2022 +0200
Disable client tracing for the moment
---
.../MicroProfileOpenTracingTCKDeploymentPackager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java
index a4b251b175..446d425dd1 100644
--- a/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java
+++ b/tck/microprofile-tck/opentracing/src/test/java/org.apache.tomee.microprofile.tck.opentracing/MicroProfileOpenTracingTCKDeploymentPackager.java
@@ -57,7 +57,7 @@ public class MicroProfileOpenTracingTCKDeploymentPackager extends ServletProtoco
webArchive.addClass(MicroProfileOpenTracingTracingFeature.class);
webArchive.addClass(MicroProfileOpenTrackingContextResolver.class);
webArchive.addAsServiceProvider(Providers.class, MicroProfileOpenTrackingContextResolver.class);
- webArchive.addAsServiceProvider(ClientTracingRegistrarProvider.class, MicroProfileOpenTracingClientTracingRegistrarProvider.class);
+ // webArchive.addAsServiceProvider(ClientTracingRegistrarProvider.class, MicroProfileOpenTracingClientTracingRegistrarProvider.class);
System.out.println(webArchive.toString(true));
[tomee] 04/04: Consistent name for examples projects
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 047b9062894e5e6b4515f43e09b9d75fed23cfab
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Mon Apr 11 15:09:45 2022 +0200
Consistent name for examples projects
---
examples/mp-config-example/pom.xml | 2 +-
examples/mp-config-source-database/pom.xml | 2 +-
examples/mp-jwt-bean-validation-strongly-typed/pom.xml | 2 +-
examples/mp-jwt-bean-validation/pom.xml | 2 +-
examples/mp-metrics-gauge/pom.xml | 1 +
examples/mp-metrics-metered/pom.xml | 1 +
examples/mp-opentracing-traced/pom.xml | 1 +
7 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/examples/mp-config-example/pom.xml b/examples/mp-config-example/pom.xml
index 7a6107f28b..8b092019a3 100644
--- a/examples/mp-config-example/pom.xml
+++ b/examples/mp-config-example/pom.xml
@@ -21,7 +21,7 @@
<artifactId>mp-config-example</artifactId>
<version>9.0.0-M8-SNAPSHOT</version>
<packaging>war</packaging>
- <name>MicroProfile :: Examples :: Config</name>
+ <name>TomEE :: Examples :: MicroProfile Config</name>
<properties>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
<microprofile.config.version>3.0.1</microprofile.config.version>
diff --git a/examples/mp-config-source-database/pom.xml b/examples/mp-config-source-database/pom.xml
index b232f15c0d..8ba1a1226b 100644
--- a/examples/mp-config-source-database/pom.xml
+++ b/examples/mp-config-source-database/pom.xml
@@ -21,7 +21,7 @@
<artifactId>mp-config-source-database</artifactId>
<version>9.0.0-M8-SNAPSHOT</version>
<packaging>war</packaging>
- <name>MicroProfile :: Examples :: Config Source Database</name>
+ <name>TomEE :: Examples :: MicroProfile Config Source Database</name>
<properties>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
<version.microprofile>2.0.1</version.microprofile>
diff --git a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
index cb0357fe8e..5ee374601a 100644
--- a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
+++ b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
@@ -22,7 +22,7 @@
<artifactId>mp-jwt-bean-validation-strongly-typed</artifactId>
<version>9.0.0-M8-SNAPSHOT</version>
<packaging>war</packaging>
- <name>Apache TomEE + MicroProfile JWT Bean Validation, Strongly-typed Annotations</name>
+ <name>TomEE :: Examples :: MicroProfile JWT Bean Validation, Strongly-typed Annotations</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
diff --git a/examples/mp-jwt-bean-validation/pom.xml b/examples/mp-jwt-bean-validation/pom.xml
index b2e390ca32..02ff3db49f 100644
--- a/examples/mp-jwt-bean-validation/pom.xml
+++ b/examples/mp-jwt-bean-validation/pom.xml
@@ -22,7 +22,7 @@
<artifactId>mp-jwt-bean-validation</artifactId>
<version>9.0.0-M8-SNAPSHOT</version>
<packaging>war</packaging>
- <name>Apache TomEE + MicroProfile JWT Bean Validation</name>
+ <name>TomEE :: Examples :: MicroProfile JWT Bean Validation</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
diff --git a/examples/mp-metrics-gauge/pom.xml b/examples/mp-metrics-gauge/pom.xml
index 94f95bf516..11643224e3 100644
--- a/examples/mp-metrics-gauge/pom.xml
+++ b/examples/mp-metrics-gauge/pom.xml
@@ -21,6 +21,7 @@
<version>9.0.0-M8-SNAPSHOT</version>
<artifactId>mp-metrics-gauge</artifactId>
<packaging>war</packaging>
+ <name>TomEE :: Examples :: MicroProfile Metrics Gauge</name>
<properties>
<junit.version>4.12</junit.version>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
diff --git a/examples/mp-metrics-metered/pom.xml b/examples/mp-metrics-metered/pom.xml
index 9bf01b21a0..ba07449ad8 100644
--- a/examples/mp-metrics-metered/pom.xml
+++ b/examples/mp-metrics-metered/pom.xml
@@ -20,6 +20,7 @@
<groupId>org.superbiz</groupId>
<version>9.0.0-M8-SNAPSHOT</version>
<artifactId>mp-metrics-metered</artifactId>
+ <name>TomEE :: Examples :: MicroProfile Metrics Metered</name>
<packaging>war</packaging>
<properties>
<version.jakartaee-api>9.1-M2-SNAPSHOT</version.jakartaee-api>
diff --git a/examples/mp-opentracing-traced/pom.xml b/examples/mp-opentracing-traced/pom.xml
index 44d1f170fc..9d99e185d4 100644
--- a/examples/mp-opentracing-traced/pom.xml
+++ b/examples/mp-opentracing-traced/pom.xml
@@ -20,6 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.superbiz</groupId>
<artifactId>mp-opentracing.traced</artifactId>
+ <name>TomEE :: Examples :: MicroProfile OpenTracing Traced</name>
<version>9.0.0-M8-SNAPSHOT</version>
<packaging>war</packaging>
<properties>
[tomee] 01/04: Don't run SSE tests because TCK still has 1 javax.servlet
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 5891c2746bc152006034147fec127dfdaa3b640f
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Mon Apr 11 15:09:00 2022 +0200
Don't run SSE tests because TCK still has 1 javax.servlet
---
tck/microprofile-tck/rest-client/pom.xml | 5 +++++
tck/microprofile-tck/rest-client/tck-suite.xml | 30 ++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index fa531571b0..b509fb3a80 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -61,9 +61,14 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M6</version>
<configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>tck-suite.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <!--
<dependenciesToScan>
<dependency>org.eclipse.microprofile.rest.client:microprofile-rest-client-tck</dependency>
</dependenciesToScan>
+ -->
<excludes>
<!-- TODO - Remove once issue https://github.com/eclipse/microprofile-rest-client/issues/166 is solved -->
<exclude>org.eclipse.microprofile.rest.client.tck.InvokeWithJsonBProviderTest</exclude>
diff --git a/tck/microprofile-tck/rest-client/tck-suite.xml b/tck/microprofile-tck/rest-client/tck-suite.xml
new file mode 100644
index 0000000000..bfe81eb405
--- /dev/null
+++ b/tck/microprofile-tck/rest-client/tck-suite.xml
@@ -0,0 +1,30 @@
+<!--
+ 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.
+ -->
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="microprofile-rest-client-TCK" verbose="2" configfailurepolicy="continue" >
+
+ <test name="microprofile-rest-client TCK">
+ <packages>
+ <package name="org.eclipse.microprofile.rest.client.tck.*">
+ <!-- bug in MyEventSourceServlet which depends on javax servlet api -->
+ <exclude name="org.eclipse.microprofile.rest.client.tck.sse.*"></exclude>
+ </package>
+ </packages>
+ </test>
+
+</suite>
\ No newline at end of file