remove old version

of devicemodel devicemanager oldux featureaggregator

Issue-ID: SDNC-1004
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I5337643181e2398e5a8097e4ee14fa4ac96d0d4c

15 files changed, 0 insertions, 949 deletions

diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml
deleted file mode 100644
index bc18b2cea..000000000
--- a/sdnr/wt/odlux/core/provider/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-odlux-core-provider</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-odlux-core-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-odlux-framework</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>org.onap.ccsdk.features.sdnr.wt.odlux.*;resolution:=optional,*;
-                        </Import-Package>
-                        <Embed-Dependency>sdnr-wt-odlux-framework;inline=true</Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
-                        <Export-Package>${project.groupId}.*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java
deleted file mode 100644
index d335e52c7..000000000
--- a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.odlux;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundle;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleResourceAccess;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class IndexOdluxBundle extends OdluxBundle implements OdluxBundleResourceAccess {
-
-    private static Logger LOG = LoggerFactory.getLogger(IndexOdluxBundle.class);
-
-    private static final String LR = "\n";
-    private static final String BUNDLENAME_APP = "run";
-    private static final String regexRequire = "require\\(\\[(\"" + BUNDLENAME_APP + "\")\\]";
-    private static final String regexFunction = "function[\\ ]*\\((" + BUNDLENAME_APP + ")\\)[\\ ]*\\{";
-    private static final String regexFunctionBody = "(" + BUNDLENAME_APP + "\\.runApplication\\(\\);)";
-    private static final Pattern patternRequire = Pattern.compile(regexRequire);
-    private static final Pattern patternFunction = Pattern.compile(regexFunction);
-    private static final Pattern patternFunctionBody = Pattern.compile(regexFunctionBody);
-
-    public IndexOdluxBundle() {
-        super(null, BUNDLENAME_APP);
-
-    }
-    @Override
-    protected String loadFileContent(URL url)
-    {
-        return loadFileContent(url, OdluxBundleLoaderImpl.getInstance().getLoadedBundles(this.getBundleName()));
-    }
-
-
-    @Override
-    public String getResourceFileContent(String fn, List<String> bundleNames) {
-        return loadFileContent(this.getResource(fn),bundleNames);
-    }
-
-    private static String loadFileContent(URL url, List<String> bundlesNamesList) {
-        if (url == null) {
-            return null;
-        }
-        LOG.debug("try to load res " + url.toString());
-        StringBuilder sb = new StringBuilder();
-        Matcher matcher;
-        BufferedReader in;
-        try {
-            in = new BufferedReader(new InputStreamReader(url.openStream()));
-
-            String inputLine;
-            while ((inputLine = in.readLine()) != null) {
-                if (url.getFile().endsWith("index.html")) {
-                    matcher = patternRequire.matcher(inputLine);
-                    if (matcher.find()) {
-                        inputLine = inputLine.substring(0, matcher.start(1)) + "\"" + String.join("\",\"", bundlesNamesList)
-                                + "\"" + inputLine.substring(matcher.end(1));
-                    }
-                    matcher = patternFunction.matcher(inputLine);
-                    if (matcher.find()) {
-                        inputLine = inputLine.substring(0, matcher.start(1)) + String.join(",", bundlesNamesList)
-                                + inputLine.substring(matcher.end(1));
-                    }
-                    matcher = patternFunctionBody.matcher(inputLine);
-                    if (matcher.find()) {
-                        String hlp = "";
-                        for (String bundle : bundlesNamesList) {
-                            if (!bundle.equals(BUNDLENAME_APP)) {
-                                hlp += bundle + ".register();" + LR;
-                            }
-                        }
-                        inputLine = inputLine.substring(0, matcher.start(1)) + hlp
-                                + inputLine.substring(matcher.start(1));
-                    }
-                }
-                sb.append(inputLine + LR);
-            }
-            in.close();
-        } catch (IOException e) {
-            LOG.warn("could not load resfile {} : {}", url, e.getMessage());
-            return null;
-        }
-
-        return sb.toString();
-    }
-
-}
diff --git a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexServlet.java b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexServlet.java
deleted file mode 100644
index d6d466ab9..000000000
--- a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexServlet.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.odlux;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.nio.file.Files;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class IndexServlet extends HttpServlet {
-
-	private static final long serialVersionUID = 3039669437157215355L;
-	private static Logger LOG = LoggerFactory.getLogger(IndexServlet.class);
-
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		if (req.getRequestURI() != null && req.getRequestURI().contains("favicon.ico")) {
-			this.sendFile(resp, "etc/favicon.ico","image/x-icon");
-		} else {
-
-			LOG.debug("redirect to odlux/index.html");
-			resp.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
-			resp.setHeader("Location", "odlux/index.html");
-		}
-	}
-
-	private void sendFile(HttpServletResponse response, String filename, String mimeType) {
-		File f = new File(filename);
-		if (f.exists()) {
-			try {
-				byte[] bytes = Files.readAllBytes(f.toPath());
-				response.setContentType(mimeType);
-				response.setContentLength(bytes.length);
-				response.setStatus(HttpURLConnection.HTTP_OK);
-				OutputStream os = response.getOutputStream();
-				os.write(bytes);
-				os.flush();
-				os.close();
-			} catch (IOException e) {
-				LOG.debug("problem sending {}: {}", filename, e);
-			}
-		} else {
-			LOG.debug("file not found: {}",filename);
-			response.setStatus(HttpURLConnection.HTTP_NOT_FOUND);
-		}
-	}
-
-}
diff --git a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/OdluxBundleLoaderImpl.java b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/OdluxBundleLoaderImpl.java
deleted file mode 100644
index 205c96129..000000000
--- a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/OdluxBundleLoaderImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.odlux;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.ConcurrentSkipListSet;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundle;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleLoader;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleResourceAccess;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class OdluxBundleLoaderImpl implements OdluxBundleLoader {
-
-    private final static Logger LOG = LoggerFactory.getLogger(OdluxBundleLoaderImpl.class);
-
-    private static OdluxBundleLoaderImpl singleton = null;
-
-    private Object lock;
-    // private List<OdluxBundle> bundles;
-    private ConcurrentSkipListSet<OdluxBundle> bundles2;
-    private Comparator<OdluxBundle> sortorderbundlecomparator;
-
-    public OdluxBundleLoaderImpl() {
-        if (singleton != null) {
-            LOG.error("Multiple intializations of singleton");
-        } else {
-            lock = new Object();
-            sortorderbundlecomparator = (arg0, arg1) -> {
-                int diff = arg0.getIndex() - arg1.getIndex();
-                return diff > 0 ? 1 : diff < 0 ? -1 : 0;
-            };
-            bundles2 = new ConcurrentSkipListSet<>(sortorderbundlecomparator);
-
-            singleton = this;
-        }
-    }
-
-    public static OdluxBundleLoaderImpl getInstance() {
-        if (singleton == null) {
-            LOG.warn("Test initialization order");
-            new OdluxBundleLoaderImpl();
-        }
-        return singleton;
-    }
-
-    @Override
-    public int getNumberOfBundles() {
-        synchronized (lock) {
-            return this.bundles2.size();
-        }
-    }
-
-    @Override
-    public void addBundle(OdluxBundle bundle) {
-        LOG.debug("odlux bundle " + bundle.getBundleName() + " added");
-        this.bundles2.add(bundle);
-
-
-    }
-
-    @Override
-    public void removeBundle(OdluxBundle bundle) {
-        this.bundles2.remove(bundle);
-        LOG.debug("odlux bundle " + bundle.getBundleName() + " removed");
-
-    }
-
-    public List<String> getLoadedBundles(String myBundleName) {
-        List<String> list = new ArrayList<>();
-        for (OdluxBundle b : bundles2) {
-            list.add(b.getBundleName());
-        }
-        list.add(myBundleName);
-        return list;
-    }
-
-    private List<String> getBundleNames(String myBundleName) {
-        final List<String> names = new ArrayList<>();
-        for (OdluxBundle b : bundles2) {
-            names.add(b.getBundleName());
-        }
-        names.add(myBundleName);
-        return names;
-    }
-
-    public String getResourceContent(String fn, OdluxBundleResourceAccess indexBundle) {
-        String fileContent = null;
-
-        if (indexBundle.hasResource(fn)) {
-            fileContent = indexBundle.getResourceFileContent(fn, getBundleNames(indexBundle.getBundleName()));
-        } else {
-            LOG.debug("not found in framework res. try to find in applications");
-            final Iterator<OdluxBundle> it = bundles2.iterator();
-            while (it.hasNext()) {
-                OdluxBundle b = it.next();
-                if (b.hasResource(fn)) {
-                    LOG.debug("found res in " + b.getBundleName());
-                    fileContent = b.getResourceFileContent(fn);
-                    break;
-                }
-            }
-        }
-        return fileContent;
-    }
-
-}
diff --git a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java
deleted file mode 100644
index fe00662aa..000000000
--- a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.odlux;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ResFilesServlet extends HttpServlet {
-
-    private static final long serialVersionUID = -6807215213921798293L;
-    private static Logger LOG = LoggerFactory.getLogger(ResFilesServlet.class);
-
-
-    private final IndexOdluxBundle indexBundle;
-
-    public ResFilesServlet() {
-        super();
-        indexBundle = new IndexOdluxBundle();
-    }
-
-    @Override
-    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-
-    	final String fn = req.getRequestURI();
-        LOG.debug("Get request with for URI: {}", fn);
-
-        OdluxBundleLoader odluxBundleLoader = OdluxBundleLoaderImpl.getInstance();
-		if (odluxBundleLoader != null) {
-			String fileContent = odluxBundleLoader.getResourceContent(fn, indexBundle);
-			if (fileContent != null) {
-				//Store header info
-				String mimeType = getMimeType(fn);
-				byte[] byteContent = fileContent.getBytes(java.nio.charset.StandardCharsets.UTF_8);
-				int length = byteContent.length;
-
-				LOG.debug("Found file in resources. Name {} mimetype {} length {}  and write to output stream", fn, mimeType, length);
-				resp.setContentType(mimeType);
-				resp.setContentLength(length);
-				resp.setStatus(HttpURLConnection.HTTP_OK);
-				OutputStream os = resp.getOutputStream();
-				os.write(byteContent);
-				os.flush();
-				os.close();
-			} else {
-				LOG.debug("File {} not found in res.", fn);
-				resp.setStatus(HttpURLConnection.HTTP_NOT_FOUND);
-			}
-		} else {
-			LOG.debug("BundleLoaderInstance to found.", fn);
-			resp.setStatus(HttpURLConnection.HTTP_NOT_FOUND);
-		}
-    }
-
-    public String loadFileContent(String filename) {
-        return this.indexBundle.getResourceFileContent(filename);
-    }
-
-    //Provide own function that can be overloaded for test
-    public String getMimeType(String fileName) {
-    	return getServletContext().getMimeType(fileName);
-    }
-
-}
diff --git a/sdnr/wt/odlux/core/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/core/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml
deleted file mode 100644
index 5dab578de..000000000
--- a/sdnr/wt/odlux/core/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs">
-
-    <bean id="indexServlet"
-        class="org.onap.ccsdk.features.sdnr.wt.odlux.IndexServlet">
-    </bean>
-
-   <service interface="javax.servlet.http.HttpServlet" ref="indexServlet">
-        <service-properties>
-            <entry key="alias" value="/index2.html" />
-        </service-properties>
-    </service>
-    
-   <bean id="indexServlet2"
-        class="org.onap.ccsdk.features.sdnr.wt.odlux.IndexServlet">
-    </bean>
-   
-   <service interface="javax.servlet.http.HttpServlet" ref="indexServlet2">
-        <service-properties>
-            <entry key="alias" value="/favicon.ico" />
-        </service-properties>
-    </service>
-    
-    <bean id="resFilesServlet"
-        class="org.onap.ccsdk.features.sdnr.wt.odlux.ResFilesServlet">
-    </bean>
-
-   <service interface="javax.servlet.http.HttpServlet" ref="resFilesServlet">
-        <service-properties>
-            <entry key="alias" value="/odlux" />
-        </service-properties>
-    </service>
-    <bean id="loadersvc" class="org.onap.ccsdk.features.sdnr.wt.odlux.OdluxBundleLoaderImpl"/>
-    <service id="serviceRegistration" interface="org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleLoader" ref="loadersvc"/>
-
-</blueprint>
diff --git a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestBundleLoaderImpl.java b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestBundleLoaderImpl.java
deleted file mode 100644
index bebbffdcf..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestBundleLoaderImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.odlux.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.odlux.OdluxBundleLoaderImpl;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundle;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleLoader;
-
-public class TestBundleLoaderImpl {
-
-    @Test
-    public void test() {
-        OdluxBundleLoader loader = OdluxBundleLoaderImpl.getInstance();
-        int loaded = loader.getNumberOfBundles();
-
-        OdluxBundle bundle1 = new OdluxBundle();
-        bundle1.setBundleName("b1");
-        bundle1.setIndex(0);
-        bundle1.setLoader(loader);
-        OdluxBundle bundle2 = new OdluxBundle();
-        bundle2.setBundleName("b2");
-        bundle2.setIndex(55);
-        bundle2.setLoader(loader);
-        bundle1.initialize();
-        bundle2.initialize();
-        assertNotNull(bundle1.getResourceFileContent("index.html"));
-        assertNotNull(bundle2.getResourceFileContent("index2.html"));
-        assertEquals(loaded+2, loader.getNumberOfBundles());
-        loader.addBundle(bundle1);
-        loader.addBundle(bundle2);
-        assertEquals(loaded+2, loader.getNumberOfBundles());
-        loader.removeBundle(bundle1);
-        loader.removeBundle(bundle2);
-        assertEquals(loaded, loader.getNumberOfBundles());
-
-        assertTrue(bundle1.hasResource("index.html"));
-        assertTrue(bundle2.hasResource("index2.html"));
-        assertNotNull(bundle1.getLoader());
-        assertEquals(0,bundle1.getIndex());
-        bundle1.clean();
-        bundle2.clean();
-        assertEquals(loaded,loader.getNumberOfBundles());
-
-
-    }
-}
diff --git a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestLoadResources.java b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestLoadResources.java
deleted file mode 100644
index 3c9ad4308..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestLoadResources.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.odlux.test;
-import static org.junit.Assert.*;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.odlux.ResFilesServlet;
-
-public class TestLoadResources {
-
-    @Test
-    public void test() {
-        ResFilesServlet servlet = new ResFilesServlet();
-        String indexhtml=null;
-        indexhtml=servlet.loadFileContent("odlux/index.html");
-        assertNotNull(indexhtml);
-        final String regex = "require\\(\\[.*\"run\".*\\]";
-        final Pattern pattern = Pattern.compile(regex,Pattern.MULTILINE);
-        System.out.println(indexhtml);
-        final Matcher matcher = pattern.matcher(indexhtml);
-        assertTrue("Can not find patter '"+regex+"'",matcher.find());
-    }
-    @Test
-    public void test2() {
-
-    }
-
-}
diff --git a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestRedirect.java b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestRedirect.java
deleted file mode 100644
index 78d5eb8fe..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestRedirect.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.odlux.test;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.odlux.IndexServlet;
-
-import static org.mockito.Mockito.*;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class TestRedirect {
-
-	private static final int RESPONSECODE_REDIRECT = 301;
-
-	@Test
-	public void test() {
-		PublicIndexServlet servlet =new PublicIndexServlet();
-		HttpServletRequest req = mock(HttpServletRequest.class);
-		HttpServletResponse resp = mock(HttpServletResponse.class);
-		try {
-			servlet.doGet(req,resp);
-		} catch (Exception e) {
-			fail(e.getMessage());
-		}
-		verify(resp).setStatus(RESPONSECODE_REDIRECT);
-	}
-	
-	private static class PublicIndexServlet extends IndexServlet{
-		@Override
-		public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-			super.doGet(req, resp);
-		}
-	}
-
-}
diff --git a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestResFileServlet.java b/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestResFileServlet.java
deleted file mode 100644
index 217735c40..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/java/org/onap/ccsdk/features/sdnr/odlux/test/TestResFileServlet.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.odlux.test;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.net.HttpURLConnection;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import static org.mockito.Mockito.*;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.odlux.OdluxBundleLoaderImpl;
-import org.onap.ccsdk.features.sdnr.wt.odlux.ResFilesServlet;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundle;
-import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleLoader;
-
-public class TestResFileServlet {
-
-    PublicResFilesServlet servlet;
-
-    @Test
-    public void test() throws ServletException {
-        servlet = new PublicResFilesServlet();
-		servlet.init();
-
-        OdluxBundleLoader loader = OdluxBundleLoaderImpl.getInstance();
-        OdluxBundle b = new OdluxBundle();
-        b.setBundleName("b1");
-        b.setIndex(9);
-        b.setLoader(loader);
-        b.initialize();
-        System.out.println("Subtest1");
-        testResReq("odlux/index.html", HttpURLConnection.HTTP_OK);
-        System.out.println("Subtest2");
-        testResReq("odlux/fragmich.txt", HttpURLConnection.HTTP_NOT_FOUND);
-        System.out.println("Done");
-    }
-
-    private void testResReq(String res, int responseCode) {
-        HttpServletRequest req = mock(HttpServletRequest.class);
-        HttpServletResponse resp = mock(HttpServletResponse.class);
-        when(req.getRequestURI()).thenReturn(res);
-        StringWriter out = new StringWriter();
-        ServletOutputStream printOut = new ServletOutputStream() {
-
-            @Override
-            public void write(int arg0) throws IOException {
-                out.write(arg0);
-            }
-
-            @Override
-            public boolean isReady() {
-                return false;
-            }
-
-            @Override
-            public void setWriteListener(WriteListener writeListener) {
-
-            }
-        };
-        try {
-            when(resp.getOutputStream()).thenReturn(printOut);
-            servlet.doGet(req, resp);
-        } catch (ServletException | IOException e) {
-            fail(e.getMessage());
-        }
-        verify(resp).setStatus(responseCode);
-    }
-
-
-    @SuppressWarnings("serial")
-    private class PublicResFilesServlet extends ResFilesServlet {
-        @Override
-        public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-            super.doGet(req, resp);
-        }
-        @Override
-        public String getMimeType(String fileName) {
-        	return "mimetype";
-        }
-    }
-}
diff --git a/sdnr/wt/odlux/core/provider/src/test/resources/index.html b/sdnr/wt/odlux/core/provider/src/test/resources/index.html
deleted file mode 100644
index 4f4584dd9..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/resources/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>

-<html lang="en">

-

-<head>

-  <meta charset="UTF-8">

-  <meta name="viewport" content="width=device-width, initial-scale=1.0">

-  <meta http-equiv="X-UA-Compatible" content="ie=edge">

-  <!-- <link rel="stylesheet" href="./vendor.css" > -->

-  <title>O D L UX</title>

-</head>

-

-<body>

-  <div id="app"></div>

-  <script type="text/javascript" src="./require.js"></script>

-  <script type="text/javascript" src="./config.js"></script>

-  <script>

-    // run the application

-     require(["run"], function (run) {

-      run.runApplication();

-    });

-  </script>

-</body>

-

-</html>
\ No newline at end of file
diff --git a/sdnr/wt/odlux/core/provider/src/test/resources/index2.html b/sdnr/wt/odlux/core/provider/src/test/resources/index2.html
deleted file mode 100644
index 4f4584dd9..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/resources/index2.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>

-<html lang="en">

-

-<head>

-  <meta charset="UTF-8">

-  <meta name="viewport" content="width=device-width, initial-scale=1.0">

-  <meta http-equiv="X-UA-Compatible" content="ie=edge">

-  <!-- <link rel="stylesheet" href="./vendor.css" > -->

-  <title>O D L UX</title>

-</head>

-

-<body>

-  <div id="app"></div>

-  <script type="text/javascript" src="./require.js"></script>

-  <script type="text/javascript" src="./config.js"></script>

-  <script>

-    // run the application

-     require(["run"], function (run) {

-      run.runApplication();

-    });

-  </script>

-</body>

-

-</html>
\ No newline at end of file
diff --git a/sdnr/wt/odlux/core/provider/src/test/resources/odlux/index.html b/sdnr/wt/odlux/core/provider/src/test/resources/odlux/index.html
deleted file mode 100644
index 4f4584dd9..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/resources/odlux/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>

-<html lang="en">

-

-<head>

-  <meta charset="UTF-8">

-  <meta name="viewport" content="width=device-width, initial-scale=1.0">

-  <meta http-equiv="X-UA-Compatible" content="ie=edge">

-  <!-- <link rel="stylesheet" href="./vendor.css" > -->

-  <title>O D L UX</title>

-</head>

-

-<body>

-  <div id="app"></div>

-  <script type="text/javascript" src="./require.js"></script>

-  <script type="text/javascript" src="./config.js"></script>

-  <script>

-    // run the application

-     require(["run"], function (run) {

-      run.runApplication();

-    });

-  </script>

-</body>

-

-</html>
\ No newline at end of file
diff --git a/sdnr/wt/odlux/core/provider/src/test/resources/odlux/index2.html b/sdnr/wt/odlux/core/provider/src/test/resources/odlux/index2.html
deleted file mode 100644
index 4f4584dd9..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/resources/odlux/index2.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>

-<html lang="en">

-

-<head>

-  <meta charset="UTF-8">

-  <meta name="viewport" content="width=device-width, initial-scale=1.0">

-  <meta http-equiv="X-UA-Compatible" content="ie=edge">

-  <!-- <link rel="stylesheet" href="./vendor.css" > -->

-  <title>O D L UX</title>

-</head>

-

-<body>

-  <div id="app"></div>

-  <script type="text/javascript" src="./require.js"></script>

-  <script type="text/javascript" src="./config.js"></script>

-  <script>

-    // run the application

-     require(["run"], function (run) {

-      run.runApplication();

-    });

-  </script>

-</body>

-

-</html>
\ No newline at end of file
diff --git a/sdnr/wt/odlux/core/provider/src/test/resources/simplelogger.properties b/sdnr/wt/odlux/core/provider/src/test/resources/simplelogger.properties
deleted file mode 100644
index 426f84834..000000000
--- a/sdnr/wt/odlux/core/provider/src/test/resources/simplelogger.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-# SLF4J's SimpleLogger configuration file
-# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
-
-# Default logging detail level for all instances of SimpleLogger.
-# Must be one of ("trace", "debug", "info", "warn", or "error").
-# If not specified, defaults to "info".
-org.slf4j.simpleLogger.defaultLogLevel=debug
-
-# Logging detail level for a SimpleLogger instance named "xxx.yyy.zzz".
-# Must be one of ("trace", "debug", "info", "warn", or "error").
-# If not specified, the default logging detail level is used.
-# org.slf4j.simpleLogger.log.xxx.yyy=debug
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice=debug
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container=info
-
-# Set to true if you want the current date and time to be included in output messages.
-# Default is false, and will output the number of milliseconds elapsed since startup.
-#org.slf4j.simpleLogger.showDateTime=false
-
-# The date and time format to be used in the output messages.
-# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
-# If the format is not specified or is invalid, the default format is used.
-# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
-#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
-
-# Set to true if you want to output the current thread name.
-# Defaults to true.
-#org.slf4j.simpleLogger.showThreadName=true
-
-# Set to true if you want the Logger instance name to be included in output messages.
-# Defaults to true.
-#org.slf4j.simpleLogger.showLogName=true
-
-# Set to true if you want the last component of the name to be included in output messages.
-# Defaults to false.
-#org.slf4j.simpleLogger.showShortLogName=false