This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new df917aa975 FELIX-6640 : Avoid split packages
df917aa975 is described below
commit df917aa9753a2933c8728a957ae4a0da94b09236
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Mon Aug 28 08:08:57 2023 +0200
FELIX-6640 : Avoid split packages
---
.../org/apache/felix/http/base/internal/runtime/PreprocessorInfo.java | 2 +-
.../apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java | 2 +-
.../http/base/internal/whiteboard/tracker/JavaxPreprocessorTracker.java | 2 +-
.../internal/whiteboard/tracker/JavaxServletContextHelperTracker.java | 2 +-
.../apache/felix/http/base/internal/wrappers/PreprocessorWrapper.java | 2 +-
.../apache/felix/http/base/internal/wrappers/RuntimeServiceWrapper.java | 2 +-
.../felix/http/base/internal/wrappers/ServletContextHelperWrapper.java | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/http/base/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
index 531ec280a0..46c3a159ac 100644
---
a/http/base/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
@@ -21,7 +21,7 @@ package org.apache.felix.http.base.internal.runtime;
import java.util.Map;
import java.util.Objects;
-import org.apache.felix.http.base.internal.jakartawrappers.PreprocessorWrapper;
+import org.apache.felix.http.base.internal.wrappers.PreprocessorWrapper;
import org.jetbrains.annotations.NotNull;
import org.osgi.framework.ServiceReference;
import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
diff --git
a/http/base/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
index 8a66b6403f..d4625a2601 100644
---
a/http/base/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
@@ -24,11 +24,11 @@ import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.felix.http.base.internal.javaxwrappers.RuntimeServiceWrapper;
import org.apache.felix.http.base.internal.registry.HandlerRegistry;
import org.apache.felix.http.base.internal.runtime.dto.RequestInfoDTOBuilder;
import org.apache.felix.http.base.internal.runtime.dto.RuntimeDTOBuilder;
import org.apache.felix.http.base.internal.whiteboard.WhiteboardManager;
+import org.apache.felix.http.base.internal.wrappers.RuntimeServiceWrapper;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxPreprocessorTracker.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxPreprocessorTracker.java
index 1f3f7ecc46..2e98d4697d 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxPreprocessorTracker.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxPreprocessorTracker.java
@@ -16,11 +16,11 @@
*/
package org.apache.felix.http.base.internal.whiteboard.tracker;
-import org.apache.felix.http.base.internal.jakartawrappers.PreprocessorWrapper;
import org.apache.felix.http.base.internal.runtime.PreprocessorInfo;
import org.apache.felix.http.base.internal.runtime.WhiteboardServiceInfo;
import org.apache.felix.http.base.internal.util.ServiceUtils;
import org.apache.felix.http.base.internal.whiteboard.WhiteboardManager;
+import org.apache.felix.http.base.internal.wrappers.PreprocessorWrapper;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.servlet.whiteboard.Preprocessor;
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxServletContextHelperTracker.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxServletContextHelperTracker.java
index 01fd03d2bf..881015771c 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxServletContextHelperTracker.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/JavaxServletContextHelperTracker.java
@@ -19,10 +19,10 @@ package
org.apache.felix.http.base.internal.whiteboard.tracker;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import
org.apache.felix.http.base.internal.jakartawrappers.ServletContextHelperWrapper;
import org.apache.felix.http.base.internal.runtime.ServletContextHelperInfo;
import org.apache.felix.http.base.internal.util.ServiceUtils;
import org.apache.felix.http.base.internal.whiteboard.WhiteboardManager;
+import
org.apache.felix.http.base.internal.wrappers.ServletContextHelperWrapper;
import org.jetbrains.annotations.NotNull;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/PreprocessorWrapper.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/PreprocessorWrapper.java
index fe618f2890..ac4ffea188 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/PreprocessorWrapper.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/PreprocessorWrapper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.http.base.internal.jakartawrappers;
+package org.apache.felix.http.base.internal.wrappers;
import org.apache.felix.http.jakartawrappers.FilterWrapper;
import org.jetbrains.annotations.NotNull;
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/RuntimeServiceWrapper.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/RuntimeServiceWrapper.java
index 0de935bd0f..d432fd384b 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/RuntimeServiceWrapper.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/RuntimeServiceWrapper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.http.base.internal.javaxwrappers;
+package org.apache.felix.http.base.internal.wrappers;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.dto.ServiceReferenceDTO;
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/ServletContextHelperWrapper.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/ServletContextHelperWrapper.java
index db15dd21cd..13fa24ae40 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/ServletContextHelperWrapper.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/wrappers/ServletContextHelperWrapper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.http.base.internal.jakartawrappers;
+package org.apache.felix.http.base.internal.wrappers;
import java.io.IOException;
import java.net.URL;
