From 103eb55ecf8d852c75885d136268957b5fc095ff Mon Sep 17 00:00:00 2001
From: Jonathan Mace <jonathan.c.mace@gmail.com>
Date: Tue, 30 May 2017 15:45:22 -0400
Subject: [PATCH] Split out distributions

---
 dist/github/pom.xml                           |  55 ++++++++++
 dist/pom.xml                                  | 100 ++++--------------
 dist/tracingplane/pom.xml                     |  90 ++++++++++++++++
 .../src/main/resources/reference.conf         |   2 +
 .../brown/tracingplane/TestConfiguration.java |  25 +++++
 pom.xml                                       |   3 -
 6 files changed, 194 insertions(+), 81 deletions(-)
 create mode 100644 dist/github/pom.xml
 create mode 100644 dist/tracingplane/pom.xml
 create mode 100644 dist/tracingplane/src/main/resources/reference.conf
 create mode 100644 dist/tracingplane/src/test/java/brown/tracingplane/TestConfiguration.java

diff --git a/dist/github/pom.xml b/dist/github/pom.xml
new file mode 100644
index 0000000..bdc93f1
--- /dev/null
+++ b/dist/github/pom.xml
@@ -0,0 +1,55 @@
+<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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>brown.tracingplane</groupId>
+	<artifactId>tracingplane-github</artifactId>
+	<packaging>pom</packaging>
+
+	<name>Tracing Plane Distributions - Github Distribution</name>
+
+	<parent>
+		<groupId>brown.tracingplane</groupId>
+		<artifactId>tracingplane-dist-project</artifactId>
+		<version>1.0</version>
+	</parent>
+
+	<properties>
+		<tracingplane.root>${basedir}/../..</tracingplane.root>
+
+		<github.global.userName>${GITHUB_USERNAME}</github.global.userName>
+		<github.global.password>${GITHUB_OAUTH_TOKEN}</github.global.password>
+	</properties>
+
+	<build>
+		<plugins>
+
+			<!-- uploads mvn repo dir to github -->
+			<plugin>
+				<groupId>com.github.github</groupId>
+				<artifactId>site-maven-plugin</artifactId>
+				<version>0.12</version>
+				<configuration>
+					<message>Maven artifacts for ${project.version}</message>  				<!-- git commit message -->
+					<noJekyll>true</noJekyll>                                  				<!-- disable webpage processing -->
+					<outputDirectory>${tracingplane.root}/target/mvn-repo</outputDirectory> <!-- matches distribution management repository url above -->
+					<branch>refs/heads/mvn-repo</branch>                       				<!-- remote branch name -->
+					<includes>
+						<include>**/*</include>
+					</includes>
+					<repositoryName>tracingplane-java</repositoryName>      <!-- github repo name -->
+					<repositoryOwner>tracingplane</repositoryOwner>    		<!-- github repo owner -->
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>site</goal>
+						</goals>
+						<phase>deploy</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+
+</project>
diff --git a/dist/pom.xml b/dist/pom.xml
index dd81cff..838eb6b 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -1,81 +1,25 @@
 <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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>brown.tracingplane</groupId>
-	<artifactId>tracingplane-dist</artifactId>
-	<packaging>pom</packaging>
-
-	<name>Tracing Plane - Dist</name>
-
-	<parent>
-		<groupId>brown.tracingplane</groupId>
-		<artifactId>tracingplane-project</artifactId>
-		<version>1.0</version>
-	</parent>
-
-	<properties>
-		<tracingplane.root>${basedir}/..</tracingplane.root>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>brown.tracingplane</groupId>
-			<artifactId>bdl-baggagecontext</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<!-- copies all dependent JARs into the project build directory -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.8</version>
-				<executions>
-					<execution>
-						<id>copy-artifact</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
-							<overWriteReleases>true</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- uploads mvn repo dir to github -->
-			<plugin>
-				<groupId>com.github.github</groupId>
-				<artifactId>site-maven-plugin</artifactId>
-				<version>0.12</version>
-				<configuration>
-					<message>Maven artifacts for ${project.version}</message>  				<!-- git commit message -->
-					<noJekyll>true</noJekyll>                                  				<!-- disable webpage processing -->
-					<outputDirectory>${tracingplane.root}/target/mvn-repo</outputDirectory> <!-- matches distribution management repository url above -->
-					<branch>refs/heads/mvn-repo</branch>                       				<!-- remote branch name -->
-					<includes>
-						<include>**/*</include>
-					</includes>
-					<repositoryName>tracingplane-java</repositoryName>      <!-- github repo name -->
-					<repositoryOwner>tracingplane</repositoryOwner>    		<!-- github username -->
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>site</goal>
-						</goals>
-						<phase>deploy</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>brown.tracingplane</groupId>
+    <artifactId>tracingplane-dist-project</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Tracing Plane Distributions</name>
+
+    <modules>
+        <module>tracingplane</module>
+        <module>github</module>
+    </modules>
+
+    <parent>
+        <groupId>brown.tracingplane</groupId>
+        <artifactId>tracingplane-project</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <properties>
+        <tracingplane.root>${basedir}/..</tracingplane.root>
+    </properties>
 
 </project>
diff --git a/dist/tracingplane/pom.xml b/dist/tracingplane/pom.xml
new file mode 100644
index 0000000..f7739f0
--- /dev/null
+++ b/dist/tracingplane/pom.xml
@@ -0,0 +1,90 @@
+<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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>brown.tracingplane</groupId>
+	<artifactId>tracingplane</artifactId>
+	<packaging>jar</packaging>
+
+	<name>Tracing Plane Distributions - Main Distribution</name>
+
+	<parent>
+		<groupId>brown.tracingplane</groupId>
+		<artifactId>tracingplane-dist-project</artifactId>
+		<version>1.0</version>
+	</parent>
+
+	<properties>
+		<tracingplane.root>${basedir}/../..</tracingplane.root>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>brown.tracingplane</groupId>
+			<artifactId>bdl-baggagecontext</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>brown.tracingplane</groupId>
+			<artifactId>baggagecontext-staticapi</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>brown.tracingplane</groupId>
+			<artifactId>transitlayer</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.typesafe</groupId>
+			<artifactId>config</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<!-- copies all dependent JARs into the project build directory -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.8</version>
+				<executions>
+					<execution>
+						<id>copy-artifact</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
+							<overWriteReleases>true</overWriteReleases>
+							<overWriteSnapshots>true</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- creates a fat jar -->
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.0.0</version>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/dist/tracingplane/src/main/resources/reference.conf b/dist/tracingplane/src/main/resources/reference.conf
new file mode 100644
index 0000000..73aa49a
--- /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 0000000..cae342d
--- /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 a3dfe34..5267581 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,9 +24,6 @@
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<tracingplane.root>${basedir}</tracingplane.root>
-
-		<github.global.userName>${GITHUB_USERNAME}</github.global.userName>
-		<github.global.password>${GITHUB_OAUTH_TOKEN}</github.global.password>
 	</properties>
 
 	<dependencyManagement>
-- 
GitLab