This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch http-4.x
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/http-4.x by this push:
new 811346e689 Rename directories
811346e689 is described below
commit 811346e689e128ce47b0e6493712c7bd249fe378
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Thu Oct 6 15:29:48 2022 +0200
Rename directories
---
http/{base-4.x => base}/pom.xml | 0
.../main/java/org/apache/felix/http/base/internal/AbstractActivator.java | 0
.../java/org/apache/felix/http/base/internal/AbstractHttpActivator.java | 0
.../main/java/org/apache/felix/http/base/internal/EventDispatcher.java | 0
.../src/main/java/org/apache/felix/http/base/internal/HttpConfig.java | 0
.../java/org/apache/felix/http/base/internal/HttpServiceController.java | 0
.../org/apache/felix/http/base/internal/console/HttpServicePlugin.java | 0
.../org/apache/felix/http/base/internal/context/ExtServletContext.java | 0
.../apache/felix/http/base/internal/context/ExtServletContextWrapper.java | 0
.../java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java | 0
.../org/apache/felix/http/base/internal/dispatch/DispatcherServlet.java | 0
.../apache/felix/http/base/internal/dispatch/IncludeResponseWrapper.java | 0
.../org/apache/felix/http/base/internal/dispatch/InvocationChain.java | 0
.../org/apache/felix/http/base/internal/dispatch/MultipartConfig.java | 0
.../apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java | 0
.../java/org/apache/felix/http/base/internal/dispatch/RequestInfo.java | 0
.../apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java | 0
.../apache/felix/http/base/internal/dispatch/ServletResponseWrapper.java | 0
.../org/apache/felix/http/base/internal/handler/FilterConfigImpl.java | 0
.../java/org/apache/felix/http/base/internal/handler/FilterHandler.java | 0
.../felix/http/base/internal/handler/HttpServiceServletHandler.java | 0
.../org/apache/felix/http/base/internal/handler/HttpSessionWrapper.java | 0
.../java/org/apache/felix/http/base/internal/handler/ListenerHandler.java | 0
.../org/apache/felix/http/base/internal/handler/PreprocessorHandler.java | 0
.../org/apache/felix/http/base/internal/handler/ServletConfigImpl.java | 0
.../java/org/apache/felix/http/base/internal/handler/ServletHandler.java | 0
.../apache/felix/http/base/internal/handler/WhiteboardServletHandler.java | 0
.../java/org/apache/felix/http/base/internal/logger/ConsoleLogger.java | 0
.../java/org/apache/felix/http/base/internal/logger/InternalLogger.java | 0
.../main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java | 0
.../apache/felix/http/base/internal/logger/LogServiceEnabledLogger.java | 0
.../org/apache/felix/http/base/internal/logger/LogServiceSupport.java | 0
.../org/apache/felix/http/base/internal/logger/R6LogServiceLogger.java | 0
.../java/org/apache/felix/http/base/internal/logger/SystemLogger.java | 0
.../org/apache/felix/http/base/internal/registry/ErrorPageRegistry.java | 0
.../apache/felix/http/base/internal/registry/EventListenerRegistry.java | 0
.../java/org/apache/felix/http/base/internal/registry/FilterRegistry.java | 0
.../org/apache/felix/http/base/internal/registry/HandlerRegistry.java | 0
.../java/org/apache/felix/http/base/internal/registry/ListenerMap.java | 0
.../java/org/apache/felix/http/base/internal/registry/PathResolution.java | 0
.../java/org/apache/felix/http/base/internal/registry/PathResolver.java | 0
.../org/apache/felix/http/base/internal/registry/PathResolverFactory.java | 0
.../felix/http/base/internal/registry/PerContextHandlerRegistry.java | 0
.../org/apache/felix/http/base/internal/registry/ServletRegistry.java | 0
.../org/apache/felix/http/base/internal/registry/ServletResolution.java | 0
.../java/org/apache/felix/http/base/internal/runtime/AbstractInfo.java | 0
.../main/java/org/apache/felix/http/base/internal/runtime/FilterInfo.java | 0
.../java/org/apache/felix/http/base/internal/runtime/ListenerInfo.java | 0
.../org/apache/felix/http/base/internal/runtime/PreprocessorInfo.java | 0
.../java/org/apache/felix/http/base/internal/runtime/ResourceInfo.java | 0
.../apache/felix/http/base/internal/runtime/ServletContextHelperInfo.java | 0
.../java/org/apache/felix/http/base/internal/runtime/ServletInfo.java | 0
.../apache/felix/http/base/internal/runtime/WhiteboardServiceInfo.java | 0
.../felix/http/base/internal/runtime/dto/BaseServletDTOBuilder.java | 0
.../org/apache/felix/http/base/internal/runtime/dto/BuilderConstants.java | 0
.../apache/felix/http/base/internal/runtime/dto/ErrorPageDTOBuilder.java | 0
.../org/apache/felix/http/base/internal/runtime/dto/FailedDTOHolder.java | 0
.../org/apache/felix/http/base/internal/runtime/dto/FilterDTOBuilder.java | 0
.../apache/felix/http/base/internal/runtime/dto/ListenerDTOBuilder.java | 0
.../felix/http/base/internal/runtime/dto/PreprocessorDTOBuilder.java | 0
.../org/apache/felix/http/base/internal/runtime/dto/RegistryRuntime.java | 0
.../felix/http/base/internal/runtime/dto/RequestInfoDTOBuilder.java | 0
.../apache/felix/http/base/internal/runtime/dto/ResourceDTOBuilder.java | 0
.../apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilder.java | 0
.../felix/http/base/internal/runtime/dto/ServletContextDTOBuilder.java | 0
.../apache/felix/http/base/internal/runtime/dto/ServletDTOBuilder.java | 0
.../org/apache/felix/http/base/internal/service/DefaultHttpContext.java | 0
.../org/apache/felix/http/base/internal/service/HttpServiceFactory.java | 0
.../apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java | 0
.../apache/felix/http/base/internal/service/PerBundleHttpServiceImpl.java | 0
.../java/org/apache/felix/http/base/internal/service/ResourceServlet.java | 0
.../org/apache/felix/http/base/internal/service/ServletContextImpl.java | 0
.../apache/felix/http/base/internal/service/ServletContextManager.java | 0
.../apache/felix/http/base/internal/service/SharedHttpServiceImpl.java | 0
.../java/org/apache/felix/http/base/internal/util/InternalIdFactory.java | 0
.../src/main/java/org/apache/felix/http/base/internal/util/MimeTypes.java | 0
.../main/java/org/apache/felix/http/base/internal/util/PatternUtil.java | 0
.../main/java/org/apache/felix/http/base/internal/util/ServiceUtils.java | 0
.../src/main/java/org/apache/felix/http/base/internal/util/UriUtils.java | 0
.../apache/felix/http/base/internal/whiteboard/FailureStateHandler.java | 0
.../felix/http/base/internal/whiteboard/HttpServiceContextHandler.java | 0
.../felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java | 0
.../felix/http/base/internal/whiteboard/RegistrationFailureException.java | 0
.../felix/http/base/internal/whiteboard/SharedServletContextImpl.java | 0
.../felix/http/base/internal/whiteboard/WhiteboardContextHandler.java | 0
.../org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java | 0
.../apache/felix/http/base/internal/whiteboard/tracker/FilterTracker.java | 0
.../felix/http/base/internal/whiteboard/tracker/ListenersTracker.java | 0
.../felix/http/base/internal/whiteboard/tracker/PreprocessorTracker.java | 0
.../felix/http/base/internal/whiteboard/tracker/ResourceTracker.java | 0
.../base/internal/whiteboard/tracker/ServletContextHelperTracker.java | 0
.../felix/http/base/internal/whiteboard/tracker/ServletTracker.java | 0
.../http/base/internal/whiteboard/tracker/WhiteboardServiceTracker.java | 0
.../apache/felix/http/base/internal/context/ServletContextImplTest.java | 0
.../felix/http/base/internal/context/ServletContextManagerTest.java | 0
.../felix/http/base/internal/dispatch/IncludeResponseWrapperTest.java | 0
.../org/apache/felix/http/base/internal/handler/FilterConfigImplTest.java | 0
.../org/apache/felix/http/base/internal/handler/FilterHandlerTest.java | 0
.../felix/http/base/internal/handler/HttpServiceServletHandlerTest.java | 0
.../apache/felix/http/base/internal/handler/HttpSessionWrapperTest.java | 0
.../apache/felix/http/base/internal/handler/ServletConfigImplTest.java | 0
.../apache/felix/http/base/internal/registry/ErrorPageRegistryTest.java | 0
.../felix/http/base/internal/registry/EventListenerRegistryTest.java | 0
.../org/apache/felix/http/base/internal/registry/FilterRegistryTest.java | 0
.../org/apache/felix/http/base/internal/registry/HandlerRegistryTest.java | 0
.../apache/felix/http/base/internal/registry/PathResolverFactoryTest.java | 0
.../felix/http/base/internal/registry/PerContextHandlerRegistryTest.java | 0
.../org/apache/felix/http/base/internal/registry/ServletRegistryTest.java | 0
.../apache/felix/http/base/internal/runtime/AbstractInfoOrderingTest.java | 0
.../org/apache/felix/http/base/internal/runtime/ListenerInfoTest.java | 0
.../felix/http/base/internal/runtime/dto/RuntimeDTOBuilderTest.java | 0
.../apache/felix/http/base/internal/service/HttpServiceFactoryTest.java | 0
.../test/java/org/apache/felix/http/base/internal/util/MimeTypesTest.java | 0
.../java/org/apache/felix/http/base/internal/util/PatternUtilTest.java | 0
.../test/java/org/apache/felix/http/base/internal/util/UriUtilsTest.java | 0
.../felix/http/base/internal/whiteboard/FailureStateHandlerTest.java | 0
.../resources/org/apache/felix/http/base/internal/context/resource.txt | 0
http/{bridge-4.x => bridge}/pom.xml | 0
.../src/main/appended-resources/META-INF/DEPENDENCIES | 0
http/{bridge-4.x => bridge}/src/main/appended-resources/META-INF/NOTICE | 0
.../main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java | 0
http/{jetty-4.x => jetty}/pom.xml | 0
.../src/main/appended-resources/META-INF/DEPENDENCIES | 0
http/{jetty-4.x => jetty}/src/main/appended-resources/META-INF/NOTICE | 0
.../src/main/java/org/apache/felix/http/jetty/ConnectorFactory.java | 0
.../java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java | 0
.../java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java | 0
.../org/apache/felix/http/jetty/internal/ConnectorFactoryTracker.java | 0
.../main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java | 0
.../main/java/org/apache/felix/http/jetty/internal/FileRequestLog.java | 0
.../felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java | 0
.../main/java/org/apache/felix/http/jetty/internal/JettyActivator.java | 0
.../src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java | 0
.../src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java | 0
.../java/org/apache/felix/http/jetty/internal/JettyManagedService.java | 0
.../org/apache/felix/http/jetty/internal/JettyManagedServiceFactory.java | 0
.../src/main/java/org/apache/felix/http/jetty/internal/JettyService.java | 0
.../java/org/apache/felix/http/jetty/internal/JettyServiceStarter.java | 0
.../felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java | 0
.../java/org/apache/felix/http/jetty/internal/LogServiceRequestLog.java | 0
.../java/org/apache/felix/http/jetty/internal/MBeanServerTracker.java | 0
.../main/java/org/apache/felix/http/jetty/internal/RequestLogTracker.java | 0
.../org/apache/felix/http/jetty/internal/webapp/WebAppBundleContext.java | 0
.../org/apache/felix/http/jetty/internal/webapp/WebAppBundleTracker.java | 0
.../main/java/org/apache/felix/http/jetty/internal/webapp/WebEvent.java | 0
.../src/main/java/org/apache/felix/http/jetty/package-info.java | 0
.../test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java | 0
.../test/java/org/apache/felix/http/jetty/internal/JettyServiceTest.java | 0
.../http/jetty/internal/LoadBalancerCustomizerFactoryTrackerTest.java | 0
.../java/org/apache/felix/http/jetty/internal/RequestLogTrackerTest.java | 0
150 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/http/base-4.x/pom.xml b/http/base/pom.xml
similarity index 100%
rename from http/base-4.x/pom.xml
rename to http/base/pom.xml
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/AbstractActivator.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/AbstractActivator.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/AbstractActivator.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/AbstractActivator.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/AbstractHttpActivator.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/AbstractHttpActivator.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/AbstractHttpActivator.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/AbstractHttpActivator.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/EventDispatcher.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/EventDispatcher.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/EventDispatcher.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/EventDispatcher.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/HttpConfig.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpConfig.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/HttpConfig.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/HttpConfig.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/console/HttpServicePlugin.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContext.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContext.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContext.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContext.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContextWrapper.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContextWrapper.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContextWrapper.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/context/ExtServletContextWrapper.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/Dispatcher.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/DispatcherServlet.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/DispatcherServlet.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/DispatcherServlet.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/DispatcherServlet.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/IncludeResponseWrapper.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/IncludeResponseWrapper.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/IncludeResponseWrapper.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/IncludeResponseWrapper.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/InvocationChain.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/InvocationChain.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/InvocationChain.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/InvocationChain.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/MultipartConfig.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/MultipartConfig.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/MultipartConfig.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/MultipartConfig.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestDispatcherImpl.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestInfo.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestInfo.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestInfo.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/RequestInfo.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletRequestWrapper.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletResponseWrapper.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletResponseWrapper.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletResponseWrapper.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletResponseWrapper.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/FilterConfigImpl.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/FilterConfigImpl.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/FilterConfigImpl.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/handler/FilterConfigImpl.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/FilterHandler.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/FilterHandler.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/FilterHandler.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/handler/FilterHandler.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/HttpServiceServletHandler.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpServiceServletHandler.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/HttpServiceServletHandler.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpServiceServletHandler.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapper.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapper.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapper.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapper.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/ListenerHandler.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ListenerHandler.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/ListenerHandler.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/handler/ListenerHandler.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/handler/PreprocessorHandler.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/ServletConfigImpl.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletConfigImpl.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/ServletConfigImpl.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletConfigImpl.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandler.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandler.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandler.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandler.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/WhiteboardServletHandler.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/WhiteboardServletHandler.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/handler/WhiteboardServletHandler.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/handler/WhiteboardServletHandler.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/ConsoleLogger.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/logger/ConsoleLogger.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/ConsoleLogger.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/logger/ConsoleLogger.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/InternalLogger.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/logger/InternalLogger.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/InternalLogger.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/logger/InternalLogger.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceEnabledLogger.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceEnabledLogger.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceEnabledLogger.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceEnabledLogger.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceSupport.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceSupport.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceSupport.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceSupport.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/R6LogServiceLogger.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/logger/R6LogServiceLogger.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/R6LogServiceLogger.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/logger/R6LogServiceLogger.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/SystemLogger.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/logger/SystemLogger.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/logger/SystemLogger.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/logger/SystemLogger.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistry.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistry.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistry.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistry.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/FilterRegistry.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/FilterRegistry.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/FilterRegistry.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/registry/FilterRegistry.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/HandlerRegistry.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/HandlerRegistry.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/HandlerRegistry.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/registry/HandlerRegistry.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/ListenerMap.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ListenerMap.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/ListenerMap.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/registry/ListenerMap.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/PathResolution.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolution.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/PathResolution.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolution.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/PathResolver.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolver.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/PathResolver.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolver.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/PathResolverFactory.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolverFactory.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/PathResolverFactory.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/registry/PathResolverFactory.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/PerContextHandlerRegistry.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/PerContextHandlerRegistry.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/PerContextHandlerRegistry.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/registry/PerContextHandlerRegistry.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/ServletRegistry.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ServletRegistry.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/ServletRegistry.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/registry/ServletRegistry.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/ServletResolution.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ServletResolution.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/registry/ServletResolution.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/registry/ServletResolution.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/AbstractInfo.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/AbstractInfo.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/AbstractInfo.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/AbstractInfo.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/FilterInfo.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/FilterInfo.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/FilterInfo.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/FilterInfo.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/ListenerInfo.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ListenerInfo.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/ListenerInfo.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ListenerInfo.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/PreprocessorInfo.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/PreprocessorInfo.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/PreprocessorInfo.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/PreprocessorInfo.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/ResourceInfo.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ResourceInfo.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/ResourceInfo.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ResourceInfo.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/ServletContextHelperInfo.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletContextHelperInfo.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/ServletContextHelperInfo.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletContextHelperInfo.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/WhiteboardServiceInfo.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/WhiteboardServiceInfo.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/WhiteboardServiceInfo.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/WhiteboardServiceInfo.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BaseServletDTOBuilder.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BaseServletDTOBuilder.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BaseServletDTOBuilder.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BaseServletDTOBuilder.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BuilderConstants.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BuilderConstants.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BuilderConstants.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/BuilderConstants.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ErrorPageDTOBuilder.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ErrorPageDTOBuilder.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ErrorPageDTOBuilder.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ErrorPageDTOBuilder.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FailedDTOHolder.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FailedDTOHolder.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FailedDTOHolder.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FailedDTOHolder.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FilterDTOBuilder.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FilterDTOBuilder.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FilterDTOBuilder.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/FilterDTOBuilder.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ListenerDTOBuilder.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ListenerDTOBuilder.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ListenerDTOBuilder.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ListenerDTOBuilder.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/PreprocessorDTOBuilder.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/PreprocessorDTOBuilder.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/PreprocessorDTOBuilder.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/PreprocessorDTOBuilder.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RegistryRuntime.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RegistryRuntime.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RegistryRuntime.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RegistryRuntime.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RequestInfoDTOBuilder.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RequestInfoDTOBuilder.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RequestInfoDTOBuilder.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RequestInfoDTOBuilder.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ResourceDTOBuilder.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ResourceDTOBuilder.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ResourceDTOBuilder.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ResourceDTOBuilder.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilder.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilder.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilder.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilder.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletContextDTOBuilder.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletContextDTOBuilder.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletContextDTOBuilder.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletContextDTOBuilder.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletDTOBuilder.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletDTOBuilder.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletDTOBuilder.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/runtime/dto/ServletDTOBuilder.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/DefaultHttpContext.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/service/DefaultHttpContext.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/DefaultHttpContext.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/service/DefaultHttpContext.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceFactory.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceFactory.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceFactory.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceFactory.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/PerBundleHttpServiceImpl.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/service/PerBundleHttpServiceImpl.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/PerBundleHttpServiceImpl.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/service/PerBundleHttpServiceImpl.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/ResourceServlet.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ResourceServlet.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/ResourceServlet.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/service/ResourceServlet.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/SharedHttpServiceImpl.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/service/SharedHttpServiceImpl.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/service/SharedHttpServiceImpl.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/service/SharedHttpServiceImpl.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/util/InternalIdFactory.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/util/InternalIdFactory.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/util/InternalIdFactory.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/util/InternalIdFactory.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/util/MimeTypes.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/util/MimeTypes.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/util/MimeTypes.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/util/MimeTypes.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/util/PatternUtil.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/util/PatternUtil.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/util/PatternUtil.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/util/PatternUtil.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/util/ServiceUtils.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/util/ServiceUtils.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/util/ServiceUtils.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/util/ServiceUtils.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/util/UriUtils.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/util/UriUtils.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/util/UriUtils.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/util/UriUtils.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/FailureStateHandler.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/FailureStateHandler.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/FailureStateHandler.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/FailureStateHandler.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/HttpServiceContextHandler.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/HttpServiceContextHandler.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/HttpServiceContextHandler.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/HttpServiceContextHandler.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/RegistrationFailureException.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/RegistrationFailureException.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/RegistrationFailureException.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/RegistrationFailureException.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardContextHandler.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardContextHandler.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardContextHandler.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardContextHandler.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/FilterTracker.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/FilterTracker.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/FilterTracker.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/FilterTracker.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ListenersTracker.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ListenersTracker.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ListenersTracker.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ListenersTracker.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/PreprocessorTracker.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/PreprocessorTracker.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/PreprocessorTracker.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/PreprocessorTracker.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ResourceTracker.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ResourceTracker.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ResourceTracker.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ResourceTracker.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletTracker.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletTracker.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletTracker.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletTracker.java
diff --git
a/http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/WhiteboardServiceTracker.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/WhiteboardServiceTracker.java
similarity index 100%
rename from
http/base-4.x/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/WhiteboardServiceTracker.java
rename to
http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/WhiteboardServiceTracker.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/dispatch/IncludeResponseWrapperTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/dispatch/IncludeResponseWrapperTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/dispatch/IncludeResponseWrapperTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/dispatch/IncludeResponseWrapperTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/handler/FilterConfigImplTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/handler/FilterConfigImplTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/handler/FilterConfigImplTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/handler/FilterConfigImplTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/handler/FilterHandlerTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/handler/FilterHandlerTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/handler/FilterHandlerTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/handler/FilterHandlerTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/handler/HttpServiceServletHandlerTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/handler/HttpServiceServletHandlerTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/handler/HttpServiceServletHandlerTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/handler/HttpServiceServletHandlerTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapperTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapperTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapperTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapperTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/handler/ServletConfigImplTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/handler/ServletConfigImplTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/handler/ServletConfigImplTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/handler/ServletConfigImplTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistryTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistryTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistryTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistryTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/EventListenerRegistryTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/registry/EventListenerRegistryTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/EventListenerRegistryTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/registry/EventListenerRegistryTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/FilterRegistryTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/registry/FilterRegistryTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/FilterRegistryTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/registry/FilterRegistryTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/HandlerRegistryTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/registry/HandlerRegistryTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/HandlerRegistryTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/registry/HandlerRegistryTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/PathResolverFactoryTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/registry/PathResolverFactoryTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/PathResolverFactoryTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/registry/PathResolverFactoryTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/PerContextHandlerRegistryTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/registry/PerContextHandlerRegistryTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/PerContextHandlerRegistryTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/registry/PerContextHandlerRegistryTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/ServletRegistryTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/registry/ServletRegistryTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/registry/ServletRegistryTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/registry/ServletRegistryTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/runtime/AbstractInfoOrderingTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/runtime/AbstractInfoOrderingTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/runtime/AbstractInfoOrderingTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/runtime/AbstractInfoOrderingTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/runtime/ListenerInfoTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/runtime/ListenerInfoTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/runtime/ListenerInfoTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/runtime/ListenerInfoTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilderTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilderTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilderTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/runtime/dto/RuntimeDTOBuilderTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/service/HttpServiceFactoryTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/service/HttpServiceFactoryTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/service/HttpServiceFactoryTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/service/HttpServiceFactoryTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/util/MimeTypesTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/util/MimeTypesTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/util/MimeTypesTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/util/MimeTypesTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/util/PatternUtilTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/util/PatternUtilTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/util/PatternUtilTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/util/PatternUtilTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/util/UriUtilsTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/util/UriUtilsTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/util/UriUtilsTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/util/UriUtilsTest.java
diff --git
a/http/base-4.x/src/test/java/org/apache/felix/http/base/internal/whiteboard/FailureStateHandlerTest.java
b/http/base/src/test/java/org/apache/felix/http/base/internal/whiteboard/FailureStateHandlerTest.java
similarity index 100%
rename from
http/base-4.x/src/test/java/org/apache/felix/http/base/internal/whiteboard/FailureStateHandlerTest.java
rename to
http/base/src/test/java/org/apache/felix/http/base/internal/whiteboard/FailureStateHandlerTest.java
diff --git
a/http/base-4.x/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt
b/http/base/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt
similarity index 100%
rename from
http/base-4.x/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt
rename to
http/base/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt
diff --git a/http/bridge-4.x/pom.xml b/http/bridge/pom.xml
similarity index 100%
rename from http/bridge-4.x/pom.xml
rename to http/bridge/pom.xml
diff --git a/http/bridge-4.x/src/main/appended-resources/META-INF/DEPENDENCIES
b/http/bridge/src/main/appended-resources/META-INF/DEPENDENCIES
similarity index 100%
rename from http/bridge-4.x/src/main/appended-resources/META-INF/DEPENDENCIES
rename to http/bridge/src/main/appended-resources/META-INF/DEPENDENCIES
diff --git a/http/bridge-4.x/src/main/appended-resources/META-INF/NOTICE
b/http/bridge/src/main/appended-resources/META-INF/NOTICE
similarity index 100%
rename from http/bridge-4.x/src/main/appended-resources/META-INF/NOTICE
rename to http/bridge/src/main/appended-resources/META-INF/NOTICE
diff --git
a/http/bridge-4.x/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java
b/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java
similarity index 100%
rename from
http/bridge-4.x/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java
rename to
http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java
diff --git a/http/jetty-4.x/pom.xml b/http/jetty/pom.xml
similarity index 100%
rename from http/jetty-4.x/pom.xml
rename to http/jetty/pom.xml
diff --git a/http/jetty-4.x/src/main/appended-resources/META-INF/DEPENDENCIES
b/http/jetty/src/main/appended-resources/META-INF/DEPENDENCIES
similarity index 100%
rename from http/jetty-4.x/src/main/appended-resources/META-INF/DEPENDENCIES
rename to http/jetty/src/main/appended-resources/META-INF/DEPENDENCIES
diff --git a/http/jetty-4.x/src/main/appended-resources/META-INF/NOTICE
b/http/jetty/src/main/appended-resources/META-INF/NOTICE
similarity index 100%
rename from http/jetty-4.x/src/main/appended-resources/META-INF/NOTICE
rename to http/jetty/src/main/appended-resources/META-INF/NOTICE
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/ConnectorFactory.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/ConnectorFactory.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/ConnectorFactory.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/ConnectorFactory.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/ConnectorFactoryTracker.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConnectorFactoryTracker.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/ConnectorFactoryTracker.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConnectorFactoryTracker.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/FileRequestLog.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/FileRequestLog.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/FileRequestLog.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/FileRequestLog.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyActivator.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyActivator.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyActivator.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyActivator.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyManagedService.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyManagedService.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyManagedService.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyManagedService.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyManagedServiceFactory.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyManagedServiceFactory.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyManagedServiceFactory.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyManagedServiceFactory.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyServiceStarter.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyServiceStarter.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/JettyServiceStarter.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyServiceStarter.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/LogServiceRequestLog.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LogServiceRequestLog.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/LogServiceRequestLog.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LogServiceRequestLog.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/MBeanServerTracker.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/MBeanServerTracker.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/MBeanServerTracker.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/MBeanServerTracker.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/RequestLogTracker.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/RequestLogTracker.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/RequestLogTracker.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/RequestLogTracker.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebAppBundleContext.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebAppBundleContext.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebAppBundleContext.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebAppBundleContext.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebAppBundleTracker.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebAppBundleTracker.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebAppBundleTracker.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebAppBundleTracker.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebEvent.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebEvent.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebEvent.java
rename to
http/jetty/src/main/java/org/apache/felix/http/jetty/internal/webapp/WebEvent.java
diff --git
a/http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/package-info.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/package-info.java
similarity index 100%
rename from
http/jetty-4.x/src/main/java/org/apache/felix/http/jetty/package-info.java
rename to http/jetty/src/main/java/org/apache/felix/http/jetty/package-info.java
diff --git
a/http/jetty-4.x/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java
similarity index 100%
rename from
http/jetty-4.x/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java
rename to
http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyConfigTest.java
diff --git
a/http/jetty-4.x/src/test/java/org/apache/felix/http/jetty/internal/JettyServiceTest.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyServiceTest.java
similarity index 100%
rename from
http/jetty-4.x/src/test/java/org/apache/felix/http/jetty/internal/JettyServiceTest.java
rename to
http/jetty/src/test/java/org/apache/felix/http/jetty/internal/JettyServiceTest.java
diff --git
a/http/jetty-4.x/src/test/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTrackerTest.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTrackerTest.java
similarity index 100%
rename from
http/jetty-4.x/src/test/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTrackerTest.java
rename to
http/jetty/src/test/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTrackerTest.java
diff --git
a/http/jetty-4.x/src/test/java/org/apache/felix/http/jetty/internal/RequestLogTrackerTest.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/internal/RequestLogTrackerTest.java
similarity index 100%
rename from
http/jetty-4.x/src/test/java/org/apache/felix/http/jetty/internal/RequestLogTrackerTest.java
rename to
http/jetty/src/test/java/org/apache/felix/http/jetty/internal/RequestLogTrackerTest.java
