Remove cast to DBResourceManager

Remove cast to DBResourceManager, which no longer works after
DbLibService is advertised via Aries Blueprint and which is no
longer needed after DbLibService interface exposes getConnection()
method.
Updated version number - seems like an older 0.1.1-SNAPSHOT without
DbLibService change is being used, so trying to see if bumping version will
help.

Change-Id: Ia411d1514bca396cc052f4f16eda6c79e0d13648
Issue-ID: CCSDK-86
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml
index 2be6c8d..4053efa 100755 (executable)
--- a/dblib/features/pom.xml
+++ b/dblib/features/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>dblib</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>dblib-features</artifactId>
        <name>DBLIB Adaptor - Features</name>

diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml
index 10845db..a2d7362 100755 (executable)
--- a/dblib/installer/pom.xml
+++ b/dblib/installer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dblib</artifactId>
         <groupId>org.onap.ccsdk.sli.core</groupId>
-        <version>0.1.1-SNAPSHOT</version>
+        <version>0.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>dblib-installer</artifactId>
     <name>DBLIB Adaptor - Karaf  Installer</name>

diff --git a/dblib/pom.xml b/dblib/pom.xml
index 9e15163..8e7afab 100755 (executable)
--- a/dblib/pom.xml
+++ b/dblib/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.onap.ccsdk.sli.core</groupId>
         <artifactId>ccsdk-sli-core</artifactId>
-        <version>0.1.1-SNAPSHOT</version>
+        <version>0.1.2-SNAPSHOT</version>
     </parent>
 
 
@@ -16,7 +16,7 @@
     <name>DBLIB Adaptor</name>
     <description>The DBLIB adaptor allows service logic to access persistent data in a local sql database</description>
 
-    <version>0.1.1-SNAPSHOT</version>
+    <version>0.1.2-SNAPSHOT</version>
 
     <build>
 

diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml
index 11e0ff7..07fc61a 100755 (executable)
--- a/dblib/provider/pom.xml
+++ b/dblib/provider/pom.xml
@@ -4,10 +4,10 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>dblib</artifactId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>dblib-provider</artifactId>
-       <version>0.1.1-SNAPSHOT</version>
+       <version>0.1.2-SNAPSHOT</version>
        <packaging>bundle</packaging>
        <name>DBLIB Adaptor - Provider</name>
        <url>http://maven.apache.org</url>

diff --git a/filters/features/pom.xml b/filters/features/pom.xml
index 0d71e91..95ccdfc 100755 (executable)
--- a/filters/features/pom.xml
+++ b/filters/features/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>filters</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>filters-features</artifactId>
        <name>Filters - Features</name>

diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml
index 1e839d9..e2eb430 100755 (executable)
--- a/filters/installer/pom.xml
+++ b/filters/installer/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>filters</artifactId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>filters-installer</artifactId>
        <name>Filters - Karaf  Installer</name>

diff --git a/filters/pom.xml b/filters/pom.xml
index 2e159c4..f79787e 100644 (file)
--- a/filters/pom.xml
+++ b/filters/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.ccsdk.sli.core</groupId>
         <artifactId>ccsdk-sli-core</artifactId>
-        <version>0.1.1-SNAPSHOT</version>
+        <version>0.1.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
     <name>Filters</name>
     <description>Servlet filter to implement ECOMP logging spec</description>
 
-    <version>0.1.1-SNAPSHOT</version>
+    <version>0.1.2-SNAPSHOT</version>
 
 
 

diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml
index 240966e..a590719 100755 (executable)
--- a/filters/provider/pom.xml
+++ b/filters/provider/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>filters</artifactId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>filters-provider</artifactId>
        <packaging>bundle</packaging>

diff --git a/pom.xml b/pom.xml
index 6b022cd..3bf8b1e 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
        <organization>
                <name>ONAP</name>
        </organization>
-       <version>0.1.1-SNAPSHOT</version>
+       <version>0.1.2-SNAPSHOT</version>
 
 
 </project>

diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index 52bfd53..f71ca35 100755 (executable)
--- a/sli/common/pom.xml
+++ b/sli/common/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>sli</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>sli-common</artifactId>
        <packaging>bundle</packaging>

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java
index 9216519..712c64a 100644 (file)
--- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java
+++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicDblibStore.java
@@ -145,7 +145,7 @@ public class SvcLogicDblibStore implements SvcLogicStore {
 
 
                try {
-                       dbConn = ((DBResourceManager) dbSvc).getConnection();
+                       dbConn = dbSvc.getConnection();
 
 
                        ArrayList<String> args = new ArrayList<String>();
@@ -276,7 +276,7 @@ public class SvcLogicDblibStore implements SvcLogicStore {
                Connection dbConn = null;
                PreparedStatement storeGraphStmt = null;
                try {
-                       dbConn = ((DBResourceManager) dbSvc).getConnection();
+                       dbConn = dbSvc.getConnection();
                        boolean oldAutoCommit = dbConn.getAutoCommit();
                        dbConn.setAutoCommit(false);
                        storeGraphStmt = dbConn

diff --git a/sli/features/pom.xml b/sli/features/pom.xml
index 975839f..dc7a95d 100755 (executable)
--- a/sli/features/pom.xml
+++ b/sli/features/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sli</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>sli-features</artifactId>
        <name>SLI - Features</name>

diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
index 0319f5b..0eec332 100755 (executable)
--- a/sli/installer/pom.xml
+++ b/sli/installer/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sli</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>sli-installer</artifactId>
        <name>SLI - Karaf  Installer</name>

diff --git a/sli/pom.xml b/sli/pom.xml
index b8ce1e3..7257e9e 100755 (executable)
--- a/sli/pom.xml
+++ b/sli/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>ccsdk-sli-core</artifactId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
@@ -59,7 +59,7 @@
        <organization>
                <name>ONAP</name>
        </organization>
-       <version>0.1.1-SNAPSHOT</version>
+       <version>0.1.2-SNAPSHOT</version>
 
 
 </project>

diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml
index 5ef47ef..f665c56 100755 (executable)
--- a/sli/provider/pom.xml
+++ b/sli/provider/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>sli</artifactId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>sli-provider</artifactId>
        <packaging>bundle</packaging>

diff --git a/sli/recording/pom.xml b/sli/recording/pom.xml
index 932e3cc..97c9918 100755 (executable)
--- a/sli/recording/pom.xml
+++ b/sli/recording/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sli</artifactId>
-    <version>0.1.1-SNAPSHOT</version>
+    <version>0.1.2-SNAPSHOT</version>
   </parent>
   <artifactId>sli-recording</artifactId>
   <packaging>bundle</packaging>

diff --git a/sliPluginUtils/features/pom.xml b/sliPluginUtils/features/pom.xml
index ce87536..41381b6 100755 (executable)
--- a/sliPluginUtils/features/pom.xml
+++ b/sliPluginUtils/features/pom.xml
@@ -8,7 +8,7 @@
        <parent>
                <artifactId>sliPluginUtils</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
 
        <name>SliPluginUtils Plugin - Features</name>

diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml
index a92c9cd..dd904e4 100755 (executable)
--- a/sliPluginUtils/installer/pom.xml
+++ b/sliPluginUtils/installer/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sliPluginUtils</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>sliPluginUtils-installer</artifactId>
        <name>SLI Plugin Utilities - Karaf  Installer</name>

diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml
index 5e084af..3d80b72 100755 (executable)
--- a/sliPluginUtils/pom.xml
+++ b/sliPluginUtils/pom.xml
@@ -3,7 +3,7 @@
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliPluginUtils</artifactId>
-       <version>0.1.1-SNAPSHOT</version>
+       <version>0.1.2-SNAPSHOT</version>
        <packaging>pom</packaging>
        <modelVersion>4.0.0</modelVersion>
 
@@ -11,7 +11,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>ccsdk-sli-core</artifactId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <name>Service Logic Interface Plugin Utilities</name>
        <description>A package of static utility functions to be used when developing SLI plugins</description>

diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml
index 430221f..ad950c0 100755 (executable)
--- a/sliPluginUtils/provider/pom.xml
+++ b/sliPluginUtils/provider/pom.xml
@@ -8,7 +8,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>sliPluginUtils</artifactId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
 
        <name>SliPluginUtils Plugin - Provider</name>

diff --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml
index 531315e..caa6a8b 100755 (executable)
--- a/sliapi/features/pom.xml
+++ b/sliapi/features/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sliapi</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>sliapi-features</artifactId>
 

diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml
index 2495205..dff580b 100755 (executable)
--- a/sliapi/installer/pom.xml
+++ b/sliapi/installer/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sliapi</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>sliapi-installer</artifactId>
        <packaging>pom</packaging>

diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml
index 8fed200..fc9b763 100755 (executable)
--- a/sliapi/model/pom.xml
+++ b/sliapi/model/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sliapi</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>sliapi-model</artifactId>
        <packaging>bundle</packaging>

diff --git a/sliapi/pom.xml b/sliapi/pom.xml
index 64f84b9..a58596a 100755 (executable)
--- a/sliapi/pom.xml
+++ b/sliapi/pom.xml
@@ -6,13 +6,13 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>ccsdk-sli-core</artifactId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
 
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliapi</artifactId>
-       <version>0.1.1-SNAPSHOT</version>
+       <version>0.1.2-SNAPSHOT</version>
 
        <properties>
                <feature-name>sliapi</feature-name>

diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml
index e679f36..7e0bd26 100755 (executable)
--- a/sliapi/provider/pom.xml
+++ b/sliapi/provider/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sliapi</artifactId>
                <groupId>org.onap.ccsdk.sli.core</groupId>
-               <version>0.1.1-SNAPSHOT</version>
+               <version>0.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>sliapi-provider</artifactId>
        <packaging>bundle</packaging>