From d7dcc7011930d7ffc7f136423a4c656a9d1e8816 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 22 Jul 2021 20:25:43 +0300 Subject: [PATCH] Rename jws-1.1 to jaxws-jws-api-1.1 (#3653) --- .../jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts | 2 +- .../jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts | 2 +- .../jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts | 2 +- instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts | 2 +- .../jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts | 2 +- .../{jws-1.1 => jaxws-jws-api-1.1}/javaagent/build.gradle.kts | 0 .../jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java | 0 .../jaxws/jws/v1_1/JwsInstrumentationModule.java | 0 .../instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy | 0 .../instrumentation/jaxws/jws/v1_1/ProxyInvocationHandler.java | 0 .../src/test/java/io/opentelemetry/test/WebServiceClass.java | 0 .../io/opentelemetry/test/WebServiceDefinitionInterface.java | 0 .../java/io/opentelemetry/test/WebServiceFromInterface.java | 0 settings.gradle.kts | 2 +- 14 files changed, 6 insertions(+), 6 deletions(-) rename instrumentation/jaxws/{jws-1.1 => jaxws-jws-api-1.1}/javaagent/build.gradle.kts (100%) rename instrumentation/jaxws/{jws-1.1 => jaxws-jws-api-1.1}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java (100%) rename instrumentation/jaxws/{jws-1.1 => jaxws-jws-api-1.1}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java (100%) rename instrumentation/jaxws/{jws-1.1 => jaxws-jws-api-1.1}/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy (100%) rename instrumentation/jaxws/{jws-1.1 => jaxws-jws-api-1.1}/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/ProxyInvocationHandler.java (100%) rename instrumentation/jaxws/{jws-1.1 => jaxws-jws-api-1.1}/javaagent/src/test/java/io/opentelemetry/test/WebServiceClass.java (100%) rename instrumentation/jaxws/{jws-1.1 => jaxws-jws-api-1.1}/javaagent/src/test/java/io/opentelemetry/test/WebServiceDefinitionInterface.java (100%) rename instrumentation/jaxws/{jws-1.1 => jaxws-jws-api-1.1}/javaagent/src/test/java/io/opentelemetry/test/WebServiceFromInterface.java (100%) diff --git a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts index 5ebc7e0c0a..8921020a7f 100644 --- a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts @@ -34,7 +34,7 @@ dependencies { testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing")) testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent")) - testInstrumentation(project(":instrumentation:jaxws:jws-1.1:javaagent")) + testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent")) testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent")) diff --git a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts index 3b78778e06..1f5c11c383 100644 --- a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing")) testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent")) - testInstrumentation(project(":instrumentation:jaxws:jws-1.1:javaagent")) + testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent")) testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent")) diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts index f61a6c2c3a..3a512aedbd 100644 --- a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing")) testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent")) - testInstrumentation(project(":instrumentation:jaxws:jws-1.1:javaagent")) + testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent")) testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent")) diff --git a/instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts index 0e949c0779..06e3bdcce5 100644 --- a/instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-tomee-testing/build.gradle.kts @@ -12,5 +12,5 @@ dependencies { testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent")) testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent")) - testInstrumentation(project(":instrumentation:jaxws:jws-1.1:javaagent")) + testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent")) } diff --git a/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts index de8c5904c7..b118034cca 100644 --- a/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent")) testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent")) - testInstrumentation(project(":instrumentation:jaxws:jws-1.1:javaagent")) + testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent")) // wildfly version used to run tests testServer("org.wildfly:wildfly-dist:18.0.0.Final@zip") diff --git a/instrumentation/jaxws/jws-1.1/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/jaxws/jws-1.1/javaagent/build.gradle.kts rename to instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/build.gradle.kts diff --git a/instrumentation/jaxws/jws-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java similarity index 100% rename from instrumentation/jaxws/jws-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java rename to instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java diff --git a/instrumentation/jaxws/jws-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java similarity index 100% rename from instrumentation/jaxws/jws-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java rename to instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsInstrumentationModule.java diff --git a/instrumentation/jaxws/jws-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy similarity index 100% rename from instrumentation/jaxws/jws-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy rename to instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy diff --git a/instrumentation/jaxws/jws-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/ProxyInvocationHandler.java b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/ProxyInvocationHandler.java similarity index 100% rename from instrumentation/jaxws/jws-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/ProxyInvocationHandler.java rename to instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/ProxyInvocationHandler.java diff --git a/instrumentation/jaxws/jws-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceClass.java b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceClass.java similarity index 100% rename from instrumentation/jaxws/jws-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceClass.java rename to instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceClass.java diff --git a/instrumentation/jaxws/jws-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceDefinitionInterface.java b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceDefinitionInterface.java similarity index 100% rename from instrumentation/jaxws/jws-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceDefinitionInterface.java rename to instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceDefinitionInterface.java diff --git a/instrumentation/jaxws/jws-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceFromInterface.java b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceFromInterface.java similarity index 100% rename from instrumentation/jaxws/jws-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceFromInterface.java rename to instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/test/WebServiceFromInterface.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 9d99849904..826a0be6bb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -185,7 +185,7 @@ include(":instrumentation:jaxws:jaxws-2.0-testing") include(":instrumentation:jaxws:jaxws-2.0-tomee-testing") include(":instrumentation:jaxws:jaxws-2.0-wildfly-testing") include(":instrumentation:jaxws:jaxws-common:library") -include(":instrumentation:jaxws:jws-1.1:javaagent") +include(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent") include(":instrumentation:jdbc:javaagent") include(":instrumentation:jdbc:library") include(":instrumentation:jdbc:testing")