From ed73505292c586bd05cda4ae0bf560e534ea2e9d Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Fri, 15 Mar 2024 15:17:19 +0100 Subject: [PATCH] Fix /moon property warning Remove javax's WebServlet annotation usage which specifies URL patterns and comes into conflict with osgi's HttpWhiteboardServletName and HttpWhiteboardServletPattern when processed by org.ops4j.pax.web's ServletTracker. JIRA: AAA-272 Change-Id: I8ee07583f227cf8e3ebb657455906175ac79b617 Signed-off-by: Ivan Hrasko --- .../java/org/opendaylight/aaa/shiro/moon/MoonTokenEndpoint.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/moon/MoonTokenEndpoint.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/moon/MoonTokenEndpoint.java index bbf6ba696..e6e2da9f9 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/moon/MoonTokenEndpoint.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/moon/MoonTokenEndpoint.java @@ -9,7 +9,6 @@ package org.opendaylight.aaa.shiro.moon; import java.io.IOException; import javax.servlet.Servlet; -import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -21,7 +20,6 @@ import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPatte import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@WebServlet(value = "/moon", name = "MoonTokenEndpoint") @HttpWhiteboardServletPattern("/moon") @HttpWhiteboardServletName("MoonTokenEndpoint") @RequireHttpWhiteboard -- 2.36.6