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 <ivan.hrasko@pantheon.tech>

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 bbf6ba6968c6de8467926645186cb9bd57f817ed..e6e2da9f9dc912cd7809acaa84162eb3c32d5aa7 100644 (file)
--- 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