diff --git a/dist/github/pom.xml b/dist/github/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..bdc93f167aae797ef17dd775dc62da7b3279448d --- /dev/null +++ b/dist/github/pom.xml @@ -0,0 +1,55 @@ + + 4.0.0 + brown.tracingplane + tracingplane-github + pom + + Tracing Plane Distributions - Github Distribution + + + brown.tracingplane + tracingplane-dist-project + 1.0 + + + + ${basedir}/../.. + + ${GITHUB_USERNAME} + ${GITHUB_OAUTH_TOKEN} + + + + + + + + com.github.github + site-maven-plugin + 0.12 + + Maven artifacts for ${project.version} + true + ${tracingplane.root}/target/mvn-repo + refs/heads/mvn-repo + + **/* + + tracingplane-java + tracingplane + + + + + site + + deploy + + + + + + + + diff --git a/dist/pom.xml b/dist/pom.xml index dd81cff068939d8915a46fc6d12f450880d0a9c9..838eb6be96e7122d6d3a94005f32fa16eb5d41ba 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -1,81 +1,25 @@ - 4.0.0 - brown.tracingplane - tracingplane-dist - pom - - Tracing Plane - Dist - - - brown.tracingplane - tracingplane-project - 1.0 - - - - ${basedir}/.. - - - - - brown.tracingplane - bdl-baggagecontext - ${project.version} - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy-artifact - package - - copy-dependencies - - - ${project.build.directory} - true - true - true - - - - - - - - com.github.github - site-maven-plugin - 0.12 - - Maven artifacts for ${project.version} - true - ${tracingplane.root}/target/mvn-repo - refs/heads/mvn-repo - - **/* - - tracingplane-java - tracingplane - - - - - site - - deploy - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + brown.tracingplane + tracingplane-dist-project + pom + + Tracing Plane Distributions + + + tracingplane + github + + + + brown.tracingplane + tracingplane-project + 1.0 + + + + ${basedir}/.. + diff --git a/dist/tracingplane/pom.xml b/dist/tracingplane/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..f7739f0f0cf19b37bff49fd5ae5df7b2d7ed2314 --- /dev/null +++ b/dist/tracingplane/pom.xml @@ -0,0 +1,90 @@ + + 4.0.0 + brown.tracingplane + tracingplane + jar + + Tracing Plane Distributions - Main Distribution + + + brown.tracingplane + tracingplane-dist-project + 1.0 + + + + ${basedir}/../.. + + + + + brown.tracingplane + bdl-baggagecontext + ${project.version} + + + brown.tracingplane + baggagecontext-staticapi + ${project.version} + + + brown.tracingplane + transitlayer + ${project.version} + + + com.typesafe + config + + + junit + junit + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + copy-artifact + package + + copy-dependencies + + + ${project.build.directory}/lib + true + true + true + + + + + + + maven-assembly-plugin + 3.0.0 + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + + diff --git a/dist/tracingplane/src/main/resources/reference.conf b/dist/tracingplane/src/main/resources/reference.conf new file mode 100644 index 0000000000000000000000000000000000000000..73aa49adaa5fd172ff57befdc3083ed67faadb27 --- /dev/null +++ b/dist/tracingplane/src/main/resources/reference.conf @@ -0,0 +1,2 @@ +baggage.transit = "brown.tracingplane.impl.ThreadLocalTransitLayerFactory" +baggage.provider = "brown.tracingplane.impl.BDLContextProviderFactory" \ No newline at end of file diff --git a/dist/tracingplane/src/test/java/brown/tracingplane/TestConfiguration.java b/dist/tracingplane/src/test/java/brown/tracingplane/TestConfiguration.java new file mode 100644 index 0000000000000000000000000000000000000000..cae342ddb6dbfc055f1fcd9f854e9de97cebeb83 --- /dev/null +++ b/dist/tracingplane/src/test/java/brown/tracingplane/TestConfiguration.java @@ -0,0 +1,25 @@ +package brown.tracingplane; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import org.junit.Test; +import brown.tracingplane.impl.BDLContextProvider; +import brown.tracingplane.impl.ThreadLocalTransitLayer; + +public class TestConfiguration { + + @Test + public void testDefaultBaggageProviderIsBDLContextProvider() { + BaggageProvider provider = DefaultBaggageProvider.get(); + assertNotNull(provider); + assertTrue(provider instanceof BDLContextProvider); + } + + @Test + public void testDefaultTransitLayerIsThreadLocalTransitLayer() { + TransitLayer transit = DefaultTransitLayer.get(); + assertNotNull(transit); + assertTrue(transit instanceof ThreadLocalTransitLayer); + } + +} diff --git a/pom.xml b/pom.xml index a3dfe3467a2f960cda6789f429daf7385652dfcb..5267581a40176e0638ca155937c03dc736e244b0 100644 --- a/pom.xml +++ b/pom.xml @@ -24,9 +24,6 @@ UTF-8 ${basedir} - - ${GITHUB_USERNAME} - ${GITHUB_OAUTH_TOKEN}