dropping spec jars as discussed on the list
diff --git a/geronimo-microprofile-opentracing-spec/pom.xml b/geronimo-microprofile-opentracing-spec/pom.xml
deleted file mode 100644
index d73cc96..0000000
--- a/geronimo-microprofile-opentracing-spec/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>geronimo-opentracing</artifactId>
- <groupId>org.apache.geronimo</groupId>
- <version>1.0.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>geronimo-microprofile-opentracing-spec</artifactId>
- <name>Geronimo OpenTracing :: Spec</name>
-
- <properties>
- <geronimo.jpms.name>org.eclipse.microprofile.opentracing</geronimo.jpms.name>
- </properties>
-</project>
diff --git a/geronimo-microprofile-opentracing-spec/src/main/java/org/eclipse/microprofile/opentracing/ClientTracingRegistrar.java b/geronimo-microprofile-opentracing-spec/src/main/java/org/eclipse/microprofile/opentracing/ClientTracingRegistrar.java
deleted file mode 100644
index 5526e08..0000000
--- a/geronimo-microprofile-opentracing-spec/src/main/java/org/eclipse/microprofile/opentracing/ClientTracingRegistrar.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.eclipse.microprofile.opentracing;
-
-import java.util.ServiceLoader;
-import java.util.concurrent.ExecutorService;
-import javax.ws.rs.client.ClientBuilder;
-
-/**
- * Allows a user to activate tracing on a client builder.
- */
-public final class ClientTracingRegistrar {
- /**
- * @param cb the client builder to active tracing on.
- * @return the same client builder with tracing activated.
- */
- public static ClientBuilder configure(final ClientBuilder cb) {
- return ServiceLoader.load(ClientTracingRegistrarProvider.class).iterator().next().configure(cb);
- }
-
- /**
- * @param cb the client builder to active tracing on.
- * @param executorService the executor service the client will use.
- * @return the same client builder with tracing activated.
- */
- public static ClientBuilder configure(final ClientBuilder cb, final ExecutorService executorService) {
- return ServiceLoader.load(ClientTracingRegistrarProvider.class).iterator().next().configure(cb, executorService);
- }
-
- private ClientTracingRegistrar() {
- // no-op
- }
-}
diff --git a/geronimo-microprofile-opentracing-spec/src/main/java/org/eclipse/microprofile/opentracing/ClientTracingRegistrarProvider.java b/geronimo-microprofile-opentracing-spec/src/main/java/org/eclipse/microprofile/opentracing/ClientTracingRegistrarProvider.java
deleted file mode 100644
index 1909364..0000000
--- a/geronimo-microprofile-opentracing-spec/src/main/java/org/eclipse/microprofile/opentracing/ClientTracingRegistrarProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.eclipse.microprofile.opentracing;
-
-import java.util.concurrent.ExecutorService;
-
-import javax.ws.rs.client.ClientBuilder;
-
-/**
- * Standard java SPI which is used by {@link ClientTracingRegistrar}.
- */
-public interface ClientTracingRegistrarProvider {
-
- ClientBuilder configure(ClientBuilder builder);
-
- ClientBuilder configure(ClientBuilder builder, ExecutorService executorService);
-}
diff --git a/geronimo-microprofile-opentracing-spec/src/main/java/org/eclipse/microprofile/opentracing/Traced.java b/geronimo-microprofile-opentracing-spec/src/main/java/org/eclipse/microprofile/opentracing/Traced.java
deleted file mode 100644
index 0ddc5fa..0000000
--- a/geronimo-microprofile-opentracing-spec/src/main/java/org/eclipse/microprofile/opentracing/Traced.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.eclipse.microprofile.opentracing;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
-
-@InterceptorBinding
-@Retention(RUNTIME)
-@Target({ TYPE, METHOD })
-public @interface Traced {
-
- /**
- * This method only modifies the default behavior when set to false.
- * Depending if Traced has been set on the class it behaves differently:
- *
- * <ul>
- * <li>If <code>@Traced</code> exists on the class then setting this flag to false
- * on a method will disable the span creation for the endpoint</li>
- * <li>If the class doesn't have the <code>@Traced</code> marker then the parent is ignored.</li>
- * </ul>
- *
- * @return should the method be traced or not.
- */
- @Nonbinding
- boolean value() default true;
-
- /**
- * Allows to customize the span name.
- *
- * @return the span name for the "current" endpoint.
- */
- @Nonbinding
- String operationName() default "";
-}
diff --git a/pom.xml b/pom.xml
index 2317ee8..1512575 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-opentracing</artifactId>
<version>1.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
<name>Geronimo OpenTracing</name>
<description>
@@ -41,14 +40,32 @@
<tag>HEAD</tag>
</scm>
- <modules>
- <module>geronimo-microprofile-opentracing-spec</module>
- <module>geronimo-opentracing-impl</module>
- <module>geronimo-opentracing-spec</module>
- </modules>
-
<dependencies>
<dependency>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ <version>0.31.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<version>9.0.8</version>
@@ -62,34 +79,84 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.2_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>1.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.3_spec</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsonb_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>2.0.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.testng</groupId>
+ <artifactId>arquillian-testng-container</artifactId>
+ <version>1.1.13.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.8.21</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.meecrowave</groupId>
+ <artifactId>meecrowave-arquillian</artifactId>
+ <version>1.2.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-tck</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson-provider</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
@@ -103,6 +170,16 @@
<target>1.8</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.21.0</version>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.basedir}/src/test/resources/tck.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -110,7 +187,7 @@
<configuration>
<archive combine.children="append">
<manifestEntries>
- <Automatic-Module-Name>${geronimo.jpms.name}</Automatic-Module-Name>
+ <Automatic-Module-Name>org.apache.geronimo.opentracing</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
@@ -118,13 +195,12 @@
</plugins>
</build>
-
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
- <inceptionYear>2017</inceptionYear>
+ <inceptionYear>2018</inceptionYear>
<licenses>
<license>
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/config/DefaultOpenTracingConfig.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/config/DefaultOpenTracingConfig.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/config/DefaultOpenTracingConfig.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/config/DefaultOpenTracingConfig.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/config/GeronimoOpenTracingConfig.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/config/GeronimoOpenTracingConfig.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/config/GeronimoOpenTracingConfig.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/config/GeronimoOpenTracingConfig.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/config/OpenTracingConfigMpConfigImpl.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/config/OpenTracingConfigMpConfigImpl.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/config/OpenTracingConfigMpConfigImpl.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/config/OpenTracingConfigMpConfigImpl.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/config/PrefixedConfig.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/config/PrefixedConfig.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/config/PrefixedConfig.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/config/PrefixedConfig.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/FinishedSpan.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/FinishedSpan.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/FinishedSpan.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/impl/FinishedSpan.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/GeronimoTracer.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/GeronimoTracer.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/GeronimoTracer.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/impl/GeronimoTracer.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/IdGenerator.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/IdGenerator.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/IdGenerator.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/impl/IdGenerator.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/JaxRsHeaderTextMap.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/JaxRsHeaderTextMap.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/JaxRsHeaderTextMap.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/impl/JaxRsHeaderTextMap.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ReferenceImpl.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ReferenceImpl.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ReferenceImpl.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ReferenceImpl.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ScopeImpl.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ScopeImpl.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ScopeImpl.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ScopeImpl.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ScopeManagerImpl.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ScopeManagerImpl.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ScopeManagerImpl.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ScopeManagerImpl.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ServletHeaderTextMap.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ServletHeaderTextMap.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ServletHeaderTextMap.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/impl/ServletHeaderTextMap.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanBuilderImpl.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanBuilderImpl.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanBuilderImpl.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanBuilderImpl.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanContextImpl.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanContextImpl.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanContextImpl.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanContextImpl.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanImpl.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanImpl.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanImpl.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanImpl.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/OpenTracingExtension.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/OpenTracingExtension.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/OpenTracingExtension.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/OpenTracingExtension.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedExecutorService.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedExecutorService.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedExecutorService.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedExecutorService.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedExecutorServiceInterceptor.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedExecutorServiceInterceptor.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedExecutorServiceInterceptor.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedExecutorServiceInterceptor.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedInterceptor.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedInterceptor.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedInterceptor.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/cdi/TracedInterceptor.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/GeronimoClientTracingRegistrarProvider.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/GeronimoClientTracingRegistrarProvider.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/GeronimoClientTracingRegistrarProvider.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/GeronimoClientTracingRegistrarProvider.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/OpenTracingClientRequestFilter.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/OpenTracingClientRequestFilter.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/OpenTracingClientRequestFilter.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/OpenTracingClientRequestFilter.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/OpenTracingClientResponseFilter.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/OpenTracingClientResponseFilter.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/OpenTracingClientResponseFilter.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/OpenTracingClientResponseFilter.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/SyncExecutor.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/SyncExecutor.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/SyncExecutor.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/client/SyncExecutor.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/GeronimoOpenTracingFeature.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/GeronimoOpenTracingFeature.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/GeronimoOpenTracingFeature.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/GeronimoOpenTracingFeature.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingFilter.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingFilter.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingFilter.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingFilter.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingServerRequestFilter.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingServerRequestFilter.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingServerRequestFilter.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingServerRequestFilter.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingServerResponseFilter.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingServerResponseFilter.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingServerResponseFilter.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/OpenTracingServerResponseFilter.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/ServletTracingSetup.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/ServletTracingSetup.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/ServletTracingSetup.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/server/ServletTracingSetup.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/thread/OpenTracingExecutorService.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/thread/OpenTracingExecutorService.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/thread/OpenTracingExecutorService.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/thread/OpenTracingExecutorService.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/thread/ScopePropagatingCallable.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/thread/ScopePropagatingCallable.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/thread/ScopePropagatingCallable.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/thread/ScopePropagatingCallable.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinConverter.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinConverter.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinConverter.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinConverter.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinLogger.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinLogger.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinLogger.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinLogger.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinSpan.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinSpan.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinSpan.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/microprofile/zipkin/ZipkinSpan.java
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/package-info.java b/src/main/java/org/apache/geronimo/microprofile/opentracing/package-info.java
similarity index 100%
rename from geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/package-info.java
rename to src/main/java/org/apache/geronimo/microprofile/opentracing/package-info.java
diff --git a/geronimo-opentracing-impl/src/main/resources/META-INF/beans.xml b/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from geronimo-opentracing-impl/src/main/resources/META-INF/beans.xml
rename to src/main/resources/META-INF/beans.xml
diff --git a/geronimo-opentracing-impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
similarity index 100%
rename from geronimo-opentracing-impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
diff --git a/geronimo-opentracing-impl/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
similarity index 100%
rename from geronimo-opentracing-impl/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
rename to src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
diff --git a/geronimo-opentracing-impl/src/main/resources/META-INF/services/org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider b/src/main/resources/META-INF/services/org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider
similarity index 100%
rename from geronimo-opentracing-impl/src/main/resources/META-INF/services/org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider
rename to src/main/resources/META-INF/services/org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider
diff --git a/geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/impl/IdGeneratorTest.java b/src/test/java/org/apache/geronimo/microprofile/opentracing/impl/IdGeneratorTest.java
similarity index 100%
rename from geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/impl/IdGeneratorTest.java
rename to src/test/java/org/apache/geronimo/microprofile/opentracing/impl/IdGeneratorTest.java
diff --git a/geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/CxfCdiWorkaround.java b/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/CxfCdiWorkaround.java
similarity index 100%
rename from geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/CxfCdiWorkaround.java
rename to src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/CxfCdiWorkaround.java
diff --git a/geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/SkipOpentracingApiSetup.java b/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/SkipOpentracingApiSetup.java
similarity index 100%
rename from geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/SkipOpentracingApiSetup.java
rename to src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/SkipOpentracingApiSetup.java
diff --git a/geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/TckTracer.java b/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/TckTracer.java
similarity index 100%
rename from geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/TckTracer.java
rename to src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/TckTracer.java
diff --git a/geronimo-opentracing-impl/src/test/resources/META-INF/geronimo/microprofile/opentracing.properties b/src/test/resources/META-INF/geronimo/microprofile/opentracing.properties
similarity index 100%
rename from geronimo-opentracing-impl/src/test/resources/META-INF/geronimo/microprofile/opentracing.properties
rename to src/test/resources/META-INF/geronimo/microprofile/opentracing.properties
diff --git a/geronimo-opentracing-impl/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from geronimo-opentracing-impl/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/geronimo-opentracing-impl/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml
similarity index 100%
rename from geronimo-opentracing-impl/src/test/resources/arquillian.xml
rename to src/test/resources/arquillian.xml
diff --git a/geronimo-opentracing-impl/src/test/resources/tck-dev.xml b/src/test/resources/tck-dev.xml
similarity index 100%
rename from geronimo-opentracing-impl/src/test/resources/tck-dev.xml
rename to src/test/resources/tck-dev.xml
diff --git a/geronimo-opentracing-impl/src/test/resources/tck.xml b/src/test/resources/tck.xml
similarity index 100%
rename from geronimo-opentracing-impl/src/test/resources/tck.xml
rename to src/test/resources/tck.xml
