summaryrefslogtreecommitdiffstats
path: root/filters
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-07-27 16:32:20 -0400
committerDan Timoney <dtimoney@att.com>2017-08-01 10:42:39 -0400
commit32f16144e17d2df0831f14d9e65a83756a6ef844 (patch)
tree4f7c5f04c3e4216b1821648cc67b17720b34a8a8 /filters
parentc95543bf425024f5bd4a127422251b72e408ce2b (diff)
Refactor dblib
Changed openecomp references in dblib, filters and sli to onap. Note: these must be committed together to get a clean compile. Issue: CCSDK-11 Change-Id: Ibe0f64fb20f3ae9cdda2f7ea969ca722bbde0d15 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'filters')
-rw-r--r--filters/features/src/main/resources/features.xml5
-rw-r--r--filters/installer/src/assembly/assemble_installer_zip.xml5
-rw-r--r--filters/installer/src/assembly/assemble_mvnrepo_zip.xml5
-rw-r--r--filters/installer/src/main/resources/scripts/install-feature.sh5
-rwxr-xr-xfilters/provider/pom.xml13
-rw-r--r--filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/Activator.java (renamed from filters/provider/src/main/java/org/openecomp/sdnc/filters/Activator.java)7
-rw-r--r--filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/LogFilter.java (renamed from filters/provider/src/main/java/org/openecomp/sdnc/filters/LogFilter.java)7
-rw-r--r--filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseDbLoggingFilter.java (renamed from filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseDbLoggingFilter.java)10
-rw-r--r--filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseLoggingFilter.java (renamed from filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseLoggingFilter.java)7
9 files changed, 26 insertions, 38 deletions
diff --git a/filters/features/src/main/resources/features.xml b/filters/features/src/main/resources/features.xml
index d0cadff25..6837553d5 100644
--- a/filters/features/src/main/resources/features.xml
+++ b/filters/features/src/main/resources/features.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
- openECOMP : SDN-C
+ ONAP : CCSDK
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights
- reserved.
+ Copyright (C) 2017 ONAP
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/filters/installer/src/assembly/assemble_installer_zip.xml b/filters/installer/src/assembly/assemble_installer_zip.xml
index 3a5c5f654..4fa3a8ae5 100644
--- a/filters/installer/src/assembly/assemble_installer_zip.xml
+++ b/filters/installer/src/assembly/assemble_installer_zip.xml
@@ -1,9 +1,8 @@
<!--
============LICENSE_START=======================================================
- openECOMP : SDN-C
+ ONAP : CCSDK
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights
- reserved.
+ Copyright (C) 2017 ONAP
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/filters/installer/src/assembly/assemble_mvnrepo_zip.xml b/filters/installer/src/assembly/assemble_mvnrepo_zip.xml
index a9fca4d04..0e669ca5f 100644
--- a/filters/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/filters/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -1,9 +1,8 @@
<!--
============LICENSE_START=======================================================
- openECOMP : SDN-C
+ ONAP : CCSDK
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights
- reserved.
+ Copyright (C) 2017 ONAP
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/filters/installer/src/main/resources/scripts/install-feature.sh b/filters/installer/src/main/resources/scripts/install-feature.sh
index 93236c5be..c58b57985 100644
--- a/filters/installer/src/main/resources/scripts/install-feature.sh
+++ b/filters/installer/src/main/resources/scripts/install-feature.sh
@@ -2,10 +2,9 @@
###
# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
+# ONAP : CCSDK
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights
-# reserved.
+# Copyright (C) 2017 ONAP
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml
index 83982c7d2..cfbb7b594 100755
--- a/filters/provider/pom.xml
+++ b/filters/provider/pom.xml
@@ -72,16 +72,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.openecomp.sdnc.filters</Bundle-SymbolicName>
- <Bundle-Activator>org.openecomp.sdnc.filters.Activator</Bundle-Activator>
- <Export-Package>org.openecomp.sdnc.filters</Export-Package>
- <DynamicImport-Package>org.openecomp.sdnc.filters</DynamicImport-Package>
+ <Bundle-SymbolicName>org.onap.ccsdk.sli.core.filters</Bundle-SymbolicName>
+ <Bundle-Activator>org.onap.ccsdk.sli.core.filters.Activator</Bundle-Activator>
+ <Export-Package>org.onap.ccsdk.sli.core.filters</Export-Package>
+ <DynamicImport-Package>org.onap.ccsdk.sli.core.filters</DynamicImport-Package>
<Import-Package>javax.servlet.*,java.io.*,org.osgi.framework.*,org.slf4j.*,org.apache.commons.codec.binary.*</Import-Package>
- <!--
- <Import-Package>org.openecomp.sdnc.filters.filters.*,javax.servlet.*,java.io.*,org.osgi.framework.*,org.slf4j.*</Import-Package>
- <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis</Embed-Dependency>
- <Import-Package>*</Import-Package>
- -->
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
diff --git a/filters/provider/src/main/java/org/openecomp/sdnc/filters/Activator.java b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/Activator.java
index d21b30992..c97142f1b 100644
--- a/filters/provider/src/main/java/org/openecomp/sdnc/filters/Activator.java
+++ b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/Activator.java
@@ -1,9 +1,8 @@
/*-
* ============LICENSE_START=======================================================
- * openECOMP : SDN-C
+ * ONAP : CCSDK
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * reserved.
+ * Copyright (C) 2017 ONAP
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.filters;
+package org.onap.ccsdk.sli.core.filters;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/filters/provider/src/main/java/org/openecomp/sdnc/filters/LogFilter.java b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/LogFilter.java
index 809cfb287..9df74c35a 100644
--- a/filters/provider/src/main/java/org/openecomp/sdnc/filters/LogFilter.java
+++ b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/LogFilter.java
@@ -1,9 +1,8 @@
/*-
* ============LICENSE_START=======================================================
- * openECOMP : SDN-C
+ * ONAP : CCSDK
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * reserved.
+ * Copyright (C) 2017 ONAP
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.filters;
+package org.onap.ccsdk.sli.core.filters;
import java.io.IOException;
import java.util.UUID;
diff --git a/filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseDbLoggingFilter.java b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseDbLoggingFilter.java
index 183301be5..b187d9573 100644
--- a/filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseDbLoggingFilter.java
+++ b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseDbLoggingFilter.java
@@ -1,9 +1,8 @@
/*-
* ============LICENSE_START=======================================================
- * openECOMP : SDN-C
+ * ONAP : CCSDK
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * reserved.
+ * Copyright (C) 2017 ONAP
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.filters;
+package org.onap.ccsdk.sli.core.filters;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -42,9 +41,10 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
+
+import org.onap.ccsdk.sli.core.sli.MessageWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.openecomp.sdnc.sli.MessageWriter;
public class RequestResponseDbLoggingFilter implements Filter {
diff --git a/filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseLoggingFilter.java b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseLoggingFilter.java
index b15932f09..e4b0b7d1f 100644
--- a/filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseLoggingFilter.java
+++ b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/RequestResponseLoggingFilter.java
@@ -1,9 +1,8 @@
/*-
* ============LICENSE_START=======================================================
- * openECOMP : SDN-C
+ * ONAP : CCSDK
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * reserved.
+ * Copyright (C) 2017 ONAP
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +18,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.filters;
+package org.onap.ccsdk.sli.core.filters;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;