diff options
11 files changed, 31 insertions, 15 deletions
diff --git a/container-core/pom.xml b/container-core/pom.xml index 0fbb590a1de..68556c70e22 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -101,6 +101,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_http_service</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>linguistics</artifactId> <version>${project.version}</version> <exclusions> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 1caf66e29dc..4a3936b870d 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -37,7 +37,13 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_http_service</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>provided-dependencies</artifactId> <version>${project.version}</version> diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 04bf858ba3c..c0fdf37d82f 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -50,6 +50,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_http_service</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>container-search</artifactId> <version>${project.version}</version> <scope>compile</scope> diff --git a/container-search/pom.xml b/container-search/pom.xml index 6fa32947869..7c167b2db9f 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -32,6 +32,12 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_http_service</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>provided-dependencies</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/FilterBindings.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterBindings.java index 4dabed41bc6..4dabed41bc6 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/FilterBindings.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterBindings.java diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/FilterBindingsProvider.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterBindingsProvider.java index 972f9dd8e18..4f94b18f5bc 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/FilterBindingsProvider.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterBindingsProvider.java @@ -4,13 +4,13 @@ package com.yahoo.container.jdisc; import com.yahoo.component.ComponentId; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.container.di.componentgraph.Provider; -import com.yahoo.container.http.filter.FilterChainRepository; +import com.yahoo.jdisc.http.server.jetty.FilterChainRepository; import com.yahoo.jdisc.application.BindingRepository; import com.yahoo.jdisc.http.ServerConfig; import com.yahoo.jdisc.http.filter.RequestFilter; import com.yahoo.jdisc.http.filter.ResponseFilter; import com.yahoo.jdisc.http.filter.SecurityRequestFilter; -import com.yahoo.jdisc.http.server.FilterBindings; +import com.yahoo.jdisc.http.server.jetty.FilterBindings; import java.util.ArrayList; import java.util.List; diff --git a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterChainRepository.java index 31bceca9337..31bceca9337 100644 --- a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterChainRepository.java diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/FilterUtil.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterUtil.java index 24af56788b9..39139ed5927 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/FilterUtil.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilterUtil.java @@ -4,7 +4,7 @@ package com.yahoo.container.jdisc; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; import com.yahoo.component.provider.ComponentRegistry; -import com.yahoo.container.http.filter.FilterChainRepository; +import com.yahoo.jdisc.http.server.jetty.FilterChainRepository; import com.yahoo.jdisc.application.BindingRepository; import com.yahoo.jdisc.application.UriPattern; import com.yahoo.jdisc.http.filter.RequestFilter; diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/package-info.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/package-info.java deleted file mode 100644 index f6afffbaff0..00000000000 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage -package com.yahoo.jdisc.http.server; -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java b/jdisc_http_service/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java index e3039e88525..6d711da749e 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java @@ -4,13 +4,14 @@ package com.yahoo.container.jdisc; import com.yahoo.component.ComponentId; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.container.core.ChainsConfig; -import com.yahoo.container.http.filter.FilterChainRepository; +import com.yahoo.jdisc.http.server.jetty.FilterBindingsProvider; +import com.yahoo.jdisc.http.server.jetty.FilterChainRepository; import com.yahoo.jdisc.application.BindingRepository; import com.yahoo.jdisc.application.UriPattern; import com.yahoo.jdisc.http.ServerConfig; import com.yahoo.jdisc.http.filter.RequestFilter; import com.yahoo.jdisc.http.filter.ResponseFilter; -import com.yahoo.jdisc.http.server.FilterBindings; +import com.yahoo.jdisc.http.server.jetty.FilterBindings; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 7318e992fc7..6be7ea521f2 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -29,11 +29,6 @@ </exclusions> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_http_service</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> </dependency> |