Merge pull request #1 from stevenschlansker/bk-386

BK-386: remove disused HTTP header tracking support

pom.xml

@@ -18,13 +18,12 @@
   <groupId>com.nesscomputing.components</groupId>
   <artifactId>ness-tracking</artifactId>
   <name>ness-tracking</name>
-  <version>1.0.3-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <description>Ness Tracking component. Contains the logic to offer tracing and tracking through the Ness Platform.</description>
 
   <properties>
     <ness.dep.jackson.version>1.9.7</ness.dep.jackson.version>
-    <ness.dep.jersey.version>1.12</ness.dep.jersey.version>
     <ness.dep.jetty.version>8.1.3.v20120416</ness.dep.jetty.version>
   </properties>
 
@@ -61,11 +60,6 @@
       <artifactId>guice-servlet</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -81,12 +75,6 @@
       <artifactId>jsr305</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>${ness.dep.jackson.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -105,18 +93,6 @@
       <version>1.0.0</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-      <version>${ness.dep.jersey.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-      <version>${ness.dep.jersey.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>

src/main/java/com/nesscomputing/tracking/guice/TrackingModule.java

@@ -17,7 +17,6 @@
 
 
 import com.google.inject.Scopes;
-import com.google.inject.multibindings.Multibinder;
 import com.google.inject.servlet.ServletModule;
 import com.nesscomputing.config.ConfigProvider;
 import com.nesscomputing.httpclient.guice.HttpClientModule;
@@ -29,10 +28,6 @@
 import com.nesscomputing.tracking.TrackingUUIDProvider;
 import com.nesscomputing.tracking.adapters.HttpClientTrackingObserver;
 import com.nesscomputing.tracking.config.TrackingConfig;
-import com.nesscomputing.tracking.http.HttpRequestTrackingManager;
-import com.nesscomputing.tracking.http.RequestTrackingData;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
 
 /**
  * Add Tracking to a guicified web application. This now requires the {@link ThreadDelegatedScopeModule} to be installed, too. Tracking must be installed *after* that module, so that the
@@ -71,19 +66,6 @@ public void configureServlets()
         // Hook up tracking token to the HttpClient.
         HttpClientModule.bindNewObserver(binder()).to(HttpClientTrackingObserver.class);
 
-        // Request tracking
-        bind (HttpRequestTrackingManager.class).in(Scopes.SINGLETON);
-
-        bind (RequestTrackingData.class).in(ThreadDelegatedScope.SCOPE);
-        binder().requestStaticInjection(RequestTrackingData.class);
-
-        // Hook up request tracking to the HttpClient.
-        HttpClientModule.bindNewObserver(binder()).to(HttpRequestTrackingManager.class);
-
-        // Hook up request tracking to Jersey.
-        Multibinder.newSetBinder(binder(), ContainerRequestFilter.class).addBinding().to(HttpRequestTrackingManager.class);
-        Multibinder.newSetBinder(binder(), ContainerResponseFilter.class).addBinding().to(HttpRequestTrackingManager.class);
-
         bind(TrackingFilter.class).in(Scopes.SINGLETON);
         filter(pattern).through(TrackingFilter.class);
     }