diff options
-rw-r--r-- | sql-resource/features/src/main/resources/features.xml | 2 | ||||
-rwxr-xr-x | sql-resource/provider/pom.xml | 6 | ||||
-rw-r--r-- | sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResource.java (renamed from sql-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/sql/SqlResource.java) | 4 | ||||
-rw-r--r-- | sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceActivator.java (renamed from sql-resource/provider/src/main/java/org/openecomp/sdnc/sli/resource/sql/SqlResourceActivator.java) | 2 | ||||
-rw-r--r-- | sql-resource/provider/src/main/resources/svclogic.properties | 24 | ||||
-rw-r--r-- | sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceTest.java (renamed from sql-resource/provider/src/test/java/org/openecomp/sdnc/sli/resource/sql/SqlResourceTest.java) | 2 | ||||
-rw-r--r-- | sql-resource/provider/src/test/resources/svclogic.properties | 24 |
7 files changed, 32 insertions, 32 deletions
diff --git a/sql-resource/features/src/main/resources/features.xml b/sql-resource/features/src/main/resources/features.xml index fe742bf7f..320c1902b 100644 --- a/sql-resource/features/src/main/resources/features.xml +++ b/sql-resource/features/src/main/resources/features.xml @@ -33,7 +33,7 @@ <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> <feature version="${sdnctl.sli.version}">sdnc-sli</feature> <feature version="${sdnctl.dblib.version}">sdnc-dblib</feature> - <bundle>mvn:org.openecomp.sdnc.adaptors/sql-resource-provider/${project.version}</bundle> + <bundle>mvn:org.onap.ccsdk.sli.adaptors/sql-resource-provider/${project.version}</bundle> </feature> </features> diff --git a/sql-resource/provider/pom.xml b/sql-resource/provider/pom.xml index a9a634948..841561b6d 100755 --- a/sql-resource/provider/pom.xml +++ b/sql-resource/provider/pom.xml @@ -87,9 +87,9 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-SymbolicName>org.openecomp.sdnc.sli.resource.sql</Bundle-SymbolicName> - <Bundle-Activator>org.openecomp.sdnc.sli.resource.sql.SqlResourceActivator</Bundle-Activator> - <Export-Package>org.openecomp.sdnc.sli.resource.sql</Export-Package> + <Bundle-SymbolicName>org.onap.ccsdk.sli.adaptors.resource.sql</Bundle-SymbolicName> + <Bundle-Activator>org.onap.ccsdk.sli.adaptors.resource.sql.SqlResourceActivator</Bundle-Activator> + <Export-Package>org.onap.ccsdk.sli.adaptors.resource.sql</Export-Package> <Import-Package>*</Import-Package> <DynamicImport-Package>*</DynamicImport-Package> </instructions> 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 index 46802b573..14e303471 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 index 42c4876d1..4e68c1c22 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 edd1a8502..b7e8928e7 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 index d8ccaf3a7..2d48ff3f4 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 82f5697a9..69c8e2487 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 |