unused code/wrong updates

Author: malmgrens4

pom.xml

@@ -65,7 +65,7 @@
     <fmt.maven.plugin.version>2.3.0</fmt.maven.plugin.version>
 
     <!--Backend properties-->
-    <ddf.version>2.29.15</ddf.version>
+    <ddf.version>2.29.16-SNAPSHOT</ddf.version>
     <ddf-jsonrpc.version>0.9</ddf-jsonrpc.version>
     <ddf.support.version>2.3.16</ddf.support.version>
     <antlr.version>4.3</antlr.version>

ui-backend/catalog-ui-search/src/main/resources/OSGI-INF/blueprint/endpoints.xml

@@ -45,22 +45,6 @@ Services (HTTP/WS) that catalog-ui-search provides for the UI
         </service-properties>
     </service>
 
-<!--    <service ref="socketServlet" interface="org.eclipse.jetty.websocket.servlet.WebSocketServlet">-->
-<!--        <service-properties>-->
-<!--            <entry key="org.ops4j.pax.web.http.whiteboard.websocket" value="true"/>-->
-<!--            <entry key="websocket" value="true"/>-->
-<!--            <entry key="javax.websocket.server.ServerEndpoint" value="/*"/>-->
-<!--            <entry key="osgi.http.whiteboard.servlet.pattern" value="/*"/>-->
-<!--            <entry key="osgi.http.whiteboard.servlet.name" value="websocketServlet"/>-->
-<!--            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.path=websocketContextHelper)"/>-->
-<!--            <entry key="osgi.http.whiteboard.servlet.asyncSupported" value="true"/>-->
-<!--        </service-properties>-->
-<!--    </service>-->
-
-    <bean id="websocketStart" class="org.codice.ddf.catalog.ui.ws.WebSocketStart">
-        <argument ref="blueprintBundleContext"/>
-        <argument ref="socketServlet"/>
-    </bean>
 
     <!--
     =============================================================
@@ -70,7 +54,7 @@ Services (HTTP/WS) that catalog-ui-search provides for the UI
 
     <service interface="javax.servlet.Servlet">
         <service-properties>
-            <entry key="osgi.http.whiteboard.servlet.pattern" value="/search/catalog/proxy/*"/>
+            <entry key="osgi.http.whiteboard.servlet.pattern" value="/*"/>
             <entry key="osgi.http.whiteboard.servlet.name" value="searchCatalogProxyServlet"/>
             <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.name=searchCatalogProxyContextHelper)"/>
             <entry key="osgi.http.whiteboard.servlet.asyncSupported" value="true"/>

ui-backend/intrigue-ui-app/src/main/resources/features.xml

@@ -89,7 +89,7 @@
 
     <feature name="javalin" version="${project.version}" description="Javalin Web Framework">
         <feature prerequisite="true">wrap</feature>
-<!--        <bundle>wrap:mvn:org.checkerframework/checker-qual/2.0.0$Bundle-Name=checker-qual&amp;Bundle-SymbolicName=checker-qual&amp;Bundle-Version=2.0.0&amp;Export-Package=org.checkerframework.checker.nullness.qual;version="2.0.0"</bundle>-->
+        <bundle>wrap:mvn:org.checkerframework/checker-qual/2.0.0$Bundle-Name=checker-qual&amp;Bundle-SymbolicName=checker-qual&amp;Bundle-Version=2.0.0&amp;Export-Package=org.checkerframework.checker.nullness.qual;version="2.0.0"</bundle>
         <bundle>mvn:org.jetbrains.kotlin/kotlin-osgi-bundle/${kotlin-osgi.version}</bundle>
         <bundle>mvn:org.codice.thirdparty/javalin/${javalin.thirdparty.bundle.version}</bundle>
         <bundle>mvn:org.codice.ddf.search/javalin-utils/${project.version}</bundle>