summaryrefslogtreecommitdiffstats
path: root/sdnr
diff options
context:
space:
mode:
authorMichael Dürre <michael.duerre@highstreet-technologies.com>2023-04-14 14:14:46 +0200
committerhighstreetherbert <herbert.eiselt@highstreet-technologies.com>2023-04-14 17:57:36 +0200
commit9932d3b8395e46ebe57a2a1a95596661a1754896 (patch)
tree615c61bc11e232d484871e60eee2ecc3f88c681d /sdnr
parentb41fae1eee6521287a8f5a9ff0b9a2f33f7a4a5f (diff)
fix apigateway servlets
fix missing whiteboard patterns Issue-ID: CCSDK-3890 Change-Id: I8d127d9a8b97ed91fb74a9ee384d3b4d07c9e242 Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com> Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Diffstat (limited to 'sdnr')
-rw-r--r--sdnr/wt/apigateway/provider/pom.xml6
-rw-r--r--sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/EsServlet.java7
-rw-r--r--sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/SitedocServlet.java7
-rw-r--r--sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TerrainServlet.java7
-rw-r--r--sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TilesServlet.java7
-rw-r--r--sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TopologyServlet.java7
-rw-r--r--sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml30
7 files changed, 43 insertions, 28 deletions
diff --git a/sdnr/wt/apigateway/provider/pom.xml b/sdnr/wt/apigateway/provider/pom.xml
index 1a682eb67..6c69cd7dd 100644
--- a/sdnr/wt/apigateway/provider/pom.xml
+++ b/sdnr/wt/apigateway/provider/pom.xml
@@ -69,6 +69,12 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <version>7.0.0</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/EsServlet.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/EsServlet.java
index f3871a5c4..e1a9ae0f8 100644
--- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/EsServlet.java
+++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/EsServlet.java
@@ -21,10 +21,17 @@
package org.onap.ccsdk.features.sdnr.wt.apigateway;
import java.io.IOException;
+import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern;
+@HttpWhiteboardServletPattern("/database/*")
+@HttpWhiteboardServletName("EsServlet")
+@Component(service = Servlet.class)
public class EsServlet extends BaseServlet {
private static final long serialVersionUID = -3996363343749995011L;
diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/SitedocServlet.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/SitedocServlet.java
index 347dbb0d3..d96ddb613 100644
--- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/SitedocServlet.java
+++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/SitedocServlet.java
@@ -21,10 +21,17 @@
package org.onap.ccsdk.features.sdnr.wt.apigateway;
import java.io.IOException;
+import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern;
+@HttpWhiteboardServletPattern("/sitedoc/*")
+@HttpWhiteboardServletName("SitedocServlet")
+@Component(service = Servlet.class)
public class SitedocServlet extends BaseServlet {
private static final long serialVersionUID = 5946205120796162644L;
diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TerrainServlet.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TerrainServlet.java
index 12954c647..5b5cc8ab9 100644
--- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TerrainServlet.java
+++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TerrainServlet.java
@@ -21,10 +21,17 @@
package org.onap.ccsdk.features.sdnr.wt.apigateway;
import java.io.IOException;
+import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern;
+@HttpWhiteboardServletPattern("/terrain/*")
+@HttpWhiteboardServletName("TerrainServlet")
+@Component(service = Servlet.class)
public class TerrainServlet extends BaseServlet {
private static final long serialVersionUID = 5946205120796162644L;
diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TilesServlet.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TilesServlet.java
index a29717a73..1978d7c6f 100644
--- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TilesServlet.java
+++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TilesServlet.java
@@ -21,10 +21,17 @@
package org.onap.ccsdk.features.sdnr.wt.apigateway;
import java.io.IOException;
+import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern;
+@HttpWhiteboardServletPattern("/tiles/*")
+@HttpWhiteboardServletName("TilesServlet")
+@Component(service = Servlet.class)
public class TilesServlet extends BaseServlet {
private static final long serialVersionUID = 5946205120796162644L;
diff --git a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TopologyServlet.java b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TopologyServlet.java
index 1a8187640..0350d966b 100644
--- a/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TopologyServlet.java
+++ b/sdnr/wt/apigateway/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/apigateway/TopologyServlet.java
@@ -21,10 +21,17 @@
package org.onap.ccsdk.features.sdnr.wt.apigateway;
import java.io.IOException;
+import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName;
+import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern;
+@HttpWhiteboardServletPattern("/topology/*")
+@HttpWhiteboardServletName("TopologyServlet")
+@Component(service = Servlet.class)
public class TopologyServlet extends BaseServlet {
private static final long serialVersionUID = 5946205120796162644L;
diff --git a/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml b/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml
index 37fa4ee9c..a6166b433 100644
--- a/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml
+++ b/sdnr/wt/apigateway/provider/src/main/resources/org/opendaylight/blueprint/blueprint.xml
@@ -26,59 +26,33 @@
class="org.onap.ccsdk.features.sdnr.wt.apigateway.AaiServlet">
</bean>
- <service interface="javax.servlet.http.HttpServlet" ref="aaiServlet">
- <service-properties>
- <entry key="alias" value="/aai"/>
- </service-properties>
- </service>
<bean id="esServlet"
class="org.onap.ccsdk.features.sdnr.wt.apigateway.EsServlet">
</bean>
- <service interface="javax.servlet.http.HttpServlet" ref="esServlet">
- <service-properties>
- <entry key="alias" value="/database"/>
- </service-properties>
- </service>
<bean id="tilesServlet"
class="org.onap.ccsdk.features.sdnr.wt.apigateway.TilesServlet">
</bean>
- <service interface="javax.servlet.http.HttpServlet" ref="tilesServlet">
- <service-properties>
- <entry key="alias" value="/tiles"/>
- </service-properties>
- </service>
<bean id="topologyServlet"
class="org.onap.ccsdk.features.sdnr.wt.apigateway.TopologyServlet">
</bean>
- <service interface="javax.servlet.http.HttpServlet" ref="topologyServlet">
- <service-properties>
- <entry key="alias" value="/topology"/>
- </service-properties>
- </service>
<bean id="sitedocServlet"
class="org.onap.ccsdk.features.sdnr.wt.apigateway.SitedocServlet">
</bean>
- <service interface="javax.servlet.http.HttpServlet" ref="sitedocServlet">
- <service-properties>
- <entry key="alias" value="/sitedoc"/>
- </service-properties>
- </service>
-
<bean id="terrainServlet"
class="org.onap.ccsdk.features.sdnr.wt.apigateway.TerrainServlet">
</bean>
- <service interface="javax.servlet.http.HttpServlet" ref="terrainServlet">
+ <!-- <service interface="javax.servlet.http.HttpServlet" ref="terrainServlet">
<service-properties>
<entry key="alias" value="/terrain"/>
</service-properties>
- </service>
+ </service>-->
</blueprint>