remove old version

of devicemodel devicemanager oldux featureaggregator

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

5 files changed, 0 insertions, 284 deletions

diff --git a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/ClassLoaderUtilExt.java b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/ClassLoaderUtilExt.java
deleted file mode 100644
index 4b58aac44..000000000
--- a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/ClassLoaderUtilExt.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.model.bundles;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Iterator;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-
-public class ClassLoaderUtilExt {
-
-    final static Logger LOG = LoggerFactory.getLogger(ClassLoaderUtilExt.class);
-
-    public static URL getResource(String resourceName, Class<?> callingClass) {
-
-        Iterator<URL> urls = null;
-        URL url = null;
-        try {
-            urls = getResources(resourceName, callingClass, true);
-        } catch (IOException e) {
-            LOG.debug("No resource {}",resourceName);
-        }
-        if (urls != null) {
-            while (urls.hasNext()) {
-                URL u = urls.next();
-                LOG.debug("found " + u.toString());
-                url = u;
-                break;
-            }
-        }
-        if (url == null) {
-            LOG.debug("res currently not found. try to find with bundle");
-            Bundle b = FrameworkUtil.getBundle(callingClass);
-            if(b!=null)
-            {
-                url = b.getEntry(resourceName);
-            }
-            else {
-                ClassLoader loader = Thread.currentThread().getContextClassLoader();
-                url = loader.getResource(resourceName);
-            }
-
-        }
-        return url;
-    }
-
-    public static Iterator<URL> getResources(String resourceName, Class<?> callingClass, boolean aggregate)
-            throws IOException {
-        return ClassLoaderUtil.getResources(resourceName, callingClass, aggregate);
-    }
-
-}
diff --git a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/IndexOdlBundle.java b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/IndexOdlBundle.java
deleted file mode 100644
index d193edb04..000000000
--- a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/IndexOdlBundle.java
+++ /dev/null
@@ -1,22 +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.model.bundles;
-
-public interface IndexOdlBundle {
-
-}
diff --git a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundle.java b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundle.java
deleted file mode 100644
index e85c88b6f..000000000
--- a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundle.java
+++ /dev/null
@@ -1,133 +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.model.bundles;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-/**
- * At startup of each karaf bundle, each UI module creates an instance of this class via blueprint.
- * Initialize method gets called at loading of bundle.
- */
-
-public class OdluxBundle {
-
-    final static Logger LOG = LoggerFactory.getLogger(OdluxBundle.class);
-    private static final String LR = "\n";
-
-    private String bundleName;
-    private OdluxBundleLoader loader;
-    private int index;
-
-    /**
-     * @return the index
-     */
-    public int getIndex() {
-        return index;
-    }
-
-    /**
-     * @param index the index to set
-     */
-    public void setIndex(int index) {
-        this.index = index;
-    }
-
-    public OdluxBundleLoader getLoader() {
-        return loader;
-    }
-
-    public void setLoader(OdluxBundleLoader loader) {
-        this.loader = loader;
-    }
-
-    public void setBundleName(String bundleName) {
-        this.bundleName = bundleName;
-    }
-
-    public String getBundleName() {
-        return this.bundleName;
-    }
-
-    public OdluxBundle() {}
-
-    protected OdluxBundle(final OdluxBundleLoader loader, final String bundleName) {
-        this.loader = loader;
-        this.bundleName = bundleName;
-    }
-
-    public void initialize() {
-
-        LOG.info("Registering resources");
-        if (this.loader != null) {
-            if (this.bundleName == null)
-                LOG.error("bundle name is missing. Bundle can not be registered with odlux");
-            else {
-                LOG.info("Registering bunlde {}", this.bundleName);
-                this.loader.addBundle(this);
-            }
-        }
-    }
-
-    public void clean() {
-        LOG.info("Unregistering resources");
-
-        if (this.loader != null) {
-            this.loader.removeBundle(this);
-        }
-    }
-
-    public boolean hasResource(String filename) {
-        return this.getResource(filename) != null;
-    }
-
-    public String getResourceFileContent(String filename) {
-        return this.loadFileContent(this.getResource(filename));
-    }
-  
-    protected URL getResource(String filename) {
-        return ClassLoaderUtilExt.getResource(filename, this.getClass());
-    }
-
-    protected String loadFileContent(final URL url ) {
-        if (url == null)
-            return null;
-        LOG.debug("try to load res " + url.toString());
-        StringBuilder sb = new StringBuilder();
-        BufferedReader in;
-        try {
-            in = new BufferedReader(new InputStreamReader(url.openStream()));
-
-            String inputLine;
-            while ((inputLine = in.readLine()) != null) {
-                sb.append(inputLine + LR);
-            }
-            in.close();
-        } catch (IOException e) {
-            LOG.warn("could not load resfile " + url.toString() + ": " + e.getMessage());
-            return null;
-        }
-
-        return sb.toString();
-    }
-
-}
diff --git a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleLoader.java b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleLoader.java
deleted file mode 100644
index ce003c664..000000000
--- a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleLoader.java
+++ /dev/null
@@ -1,30 +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.model.bundles;
-
-public interface OdluxBundleLoader {
-
-    public void addBundle(OdluxBundle bundle);
-
-    public void removeBundle(OdluxBundle bundle);
-
-    public int getNumberOfBundles();
-
-	public String getResourceContent(String fn, OdluxBundleResourceAccess indexBundle);
-
-}
diff --git a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleResourceAccess.java b/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleResourceAccess.java
deleted file mode 100644
index d7ac3e9c4..000000000
--- a/sdnr/wt/odlux/core/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/model/bundles/OdluxBundleResourceAccess.java
+++ /dev/null
@@ -1,28 +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.model.bundles;
-
-import java.util.List;
-
-public interface OdluxBundleResourceAccess {
-
-    boolean hasResource(String fn);
-    String getResourceFileContent(String fn, List<String> bundleNames);
-    String getBundleName();
-
-}