From 6e4e672bcd7e170bd92ea7dac9cb928c0aa2425c Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Thu, 17 Aug 2017 13:14:25 -0700 Subject: [PATCH] Update sli-adaptor/sql-resource package names Update package names from org.openecomp.sdnc.adaptors.* -> onap.ccsdk.sli.adaptors.* Update groupIds from org.openecomp.sdnc.adaptors -> onap.ccsdk.sli.adaptors Issue-Id: CCSDK-19 Change-Id: Ie588e46c0c9035ec343437f58bd329f7d6c220ce Signed-off-by: Marcus G K Williams --- .../features/src/main/resources/features.xml | 2 +- sql-resource/provider/pom.xml | 6 +++--- .../sli/adaptors}/resource/sql/SqlResource.java | 4 ++-- .../resource/sql/SqlResourceActivator.java | 2 +- .../src/main/resources/svclogic.properties | 24 +++++++++++----------- .../adaptors}/resource/sql/SqlResourceTest.java | 2 +- .../src/test/resources/svclogic.properties | 24 +++++++++++----------- 7 files changed, 32 insertions(+), 32 deletions(-) rename sql-resource/provider/src/main/java/org/{openecomp/sdnc/sli => onap/ccsdk/sli/adaptors}/resource/sql/SqlResource.java (98%) rename sql-resource/provider/src/main/java/org/{openecomp/sdnc/sli => onap/ccsdk/sli/adaptors}/resource/sql/SqlResourceActivator.java (98%) rename sql-resource/provider/src/test/java/org/{openecomp/sdnc/sli => onap/ccsdk/sli/adaptors}/resource/sql/SqlResourceTest.java (99%) diff --git a/sql-resource/features/src/main/resources/features.xml b/sql-resource/features/src/main/resources/features.xml index fe742bf7..320c1902 100644 --- a/sql-resource/features/src/main/resources/features.xml +++ b/sql-resource/features/src/main/resources/features.xml @@ -33,7 +33,7 @@ odl-mdsal-broker sdnc-sli sdnc-dblib - mvn:org.openecomp.sdnc.adaptors/sql-resource-provider/${project.version} + mvn:org.onap.ccsdk.sli.adaptors/sql-resource-provider/${project.version} diff --git a/sql-resource/provider/pom.xml b/sql-resource/provider/pom.xml index a9a63494..841561b6 100755 --- a/sql-resource/provider/pom.xml +++ b/sql-resource/provider/pom.xml @@ -87,9 +87,9 @@ true - org.openecomp.sdnc.sli.resource.sql - org.openecomp.sdnc.sli.resource.sql.SqlResourceActivator - org.openecomp.sdnc.sli.resource.sql + org.onap.ccsdk.sli.adaptors.resource.sql + org.onap.ccsdk.sli.adaptors.resource.sql.SqlResourceActivator + org.onap.ccsdk.sli.adaptors.resource.sql * * diff --git a/sql-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/sql/SqlResource.java b/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResource.java similarity index 98% rename from sql-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/sql/SqlResource.java rename to sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResource.java index 46802b57..14e30347 100644 --- a/sql-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/sql/SqlResource.java +++ b/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResource.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.resource.sql; +package org.onap.ccsdk.sli.adaptors.resource.sql; import java.sql.Connection; import java.sql.PreparedStatement; @@ -51,7 +51,7 @@ public class SqlResource implements SvcLogicResource, SvcLogicJavaPlugin { private static final Logger LOG = LoggerFactory.getLogger(SqlResource.class); - private static final String DBLIB_SERVICE = "org.openecomp.sdnc.sli.resource.dblib.DBResourceManager"; + private static final String DBLIB_SERVICE = "org.onap.ccsdk.sli.adaptors.resource.dblib.DBResourceManager"; private static String CRYPT_KEY = ""; diff --git a/sql-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/sql/SqlResourceActivator.java b/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceActivator.java similarity index 98% rename from sql-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/sql/SqlResourceActivator.java rename to sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceActivator.java index 42c4876d..4e68c1c2 100644 --- a/sql-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/sql/SqlResourceActivator.java +++ b/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceActivator.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.resource.sql; +package org.onap.ccsdk.sli.adaptors.resource.sql; import java.io.File; import java.io.FileInputStream; diff --git a/sql-resource/provider/src/main/resources/svclogic.properties b/sql-resource/provider/src/main/resources/svclogic.properties index edd1a850..b7e8928e 100644 --- a/sql-resource/provider/src/main/resources/svclogic.properties +++ b/sql-resource/provider/src/main/resources/svclogic.properties @@ -19,16 +19,16 @@ # ============LICENSE_END========================================================= ### -org.openecomp.sdnc.sli.dbtype=jdbc -org.openecomp.sdnc.sli.jdbc.hosts=sdnctldb01,sdnctldb02 -org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://DBHOST:3306/sdnctl -org.openecomp.sdnc.sli.jdbc.database=sdnctl -org.openecomp.sdnc.sli.jdbc.user=sdnctl -org.openecomp.sdnc.sli.jdbc.password=gamma -org.openecomp.sdnc.sli.jdbc.connection.name=sdnctldb01 +org.onap.ccsdk.sli.adaptors.dbtype=jdbc +org.onap.ccsdk.sli.adaptors.jdbc.hosts=sdnctldb01,sdnctldb02 +org.onap.ccsdk.sli.adaptors.jdbc.url=jdbc:mysql://DBHOST:3306/sdnctl +org.onap.ccsdk.sli.adaptors.jdbc.database=sdnctl +org.onap.ccsdk.sli.adaptors.jdbc.user=sdnctl +org.onap.ccsdk.sli.adaptors.jdbc.password=gamma +org.onap.ccsdk.sli.adaptors.jdbc.connection.name=sdnctldb01 -org.openecomp.sdnc.sli.jdbc.connection.timeout=50 -org.openecomp.sdnc.sli.jdbc.request.timeout=100 -org.openecomp.sdnc.sli.jdbc.limit.init=10 -org.openecomp.sdnc.sli.jdbc.limit.min=10 -org.openecomp.sdnc.sli.jdbc.limit.max=20 +org.onap.ccsdk.sli.adaptors.jdbc.connection.timeout=50 +org.onap.ccsdk.sli.adaptors.jdbc.request.timeout=100 +org.onap.ccsdk.sli.adaptors.jdbc.limit.init=10 +org.onap.ccsdk.sli.adaptors.jdbc.limit.min=10 +org.onap.ccsdk.sli.adaptors.jdbc.limit.max=20 diff --git a/sql-resource/provider/src/test/java/org/openecomp/sdnc/sli/resource/sql/SqlResourceTest.java b/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceTest.java similarity index 99% rename from sql-resource/provider/src/test/java/org/openecomp/sdnc/sli/resource/sql/SqlResourceTest.java rename to sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceTest.java index d8ccaf3a..2d48ff3f 100644 --- a/sql-resource/provider/src/test/java/org/openecomp/sdnc/sli/resource/sql/SqlResourceTest.java +++ b/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceTest.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.resource.sql; +package org.onap.ccsdk.sli.adaptors.resource.sql; import java.io.BufferedReader; import java.io.InputStream; diff --git a/sql-resource/provider/src/test/resources/svclogic.properties b/sql-resource/provider/src/test/resources/svclogic.properties index 82f5697a..69c8e248 100644 --- a/sql-resource/provider/src/test/resources/svclogic.properties +++ b/sql-resource/provider/src/test/resources/svclogic.properties @@ -19,16 +19,16 @@ # ============LICENSE_END========================================================= ### -org.openecomp.sdnc.sli.dbtype=jdbc -org.openecomp.sdnc.sli.jdbc.hosts=localhost -org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://DBHOST:3306/sdnctl -org.openecomp.sdnc.sli.jdbc.database=sdnctl -org.openecomp.sdnc.sli.jdbc.user=sdnctl -org.openecomp.sdnc.sli.jdbc.password=gamma -org.openecomp.sdnc.sli.jdbc.connection.name=sdnctldb01 +org.onap.ccsdk.sli.adaptors.dbtype=jdbc +org.onap.ccsdk.sli.adaptors.jdbc.hosts=localhost +org.onap.ccsdk.sli.adaptors.jdbc.url=jdbc:mysql://DBHOST:3306/sdnctl +org.onap.ccsdk.sli.adaptors.jdbc.database=sdnctl +org.onap.ccsdk.sli.adaptors.jdbc.user=sdnctl +org.onap.ccsdk.sli.adaptors.jdbc.password=gamma +org.onap.ccsdk.sli.adaptors.jdbc.connection.name=sdnctldb01 -org.openecomp.sdnc.sli.jdbc.connection.timeout=50 -org.openecomp.sdnc.sli.jdbc.request.timeout=100 -org.openecomp.sdnc.sli.jdbc.limit.init=10 -org.openecomp.sdnc.sli.jdbc.limit.min=10 -org.openecomp.sdnc.sli.jdbc.limit.max=20 +org.onap.ccsdk.sli.adaptors.jdbc.connection.timeout=50 +org.onap.ccsdk.sli.adaptors.jdbc.request.timeout=100 +org.onap.ccsdk.sli.adaptors.jdbc.limit.init=10 +org.onap.ccsdk.sli.adaptors.jdbc.limit.min=10 +org.onap.ccsdk.sli.adaptors.jdbc.limit.max=20 -- 2.16.6