| commit | 082f306bcb026bf49b1067f55d59522c01e991cd | [log] [tgz] |
|---|---|---|
| author | Marcus G K Williams <marcus.williams@intel.com> | Thu Sep 07 13:26:31 2017 -0700 |
| committer | Marcus G K Williams <marcus.williams@intel.com> | Thu Sep 07 14:41:40 2017 -0700 |
| tree | 049e160047f1c467a32637092c0341a5182b47f3 | |
| parent | 76706005ee07da01fc3e00ed44ada720e29855b1 [diff] |
Fix dblib DBResourceManager instantiation Fix APPC Build, failing upstream and locally due to change in CCSDK that changes dblib to use service injection via Aries Blueprint. The change causing this in CCSDK is https://gerrit.onap.org/r/#/c/7931/ Issue-Id: APPC-196 Change-Id: I9bcfb6d87b7527fd07cb76a242b272a5bc0ad07c Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java index 5881e7f..c834081 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java
@@ -65,7 +65,7 @@ File file = new File("/opt/app/bvc/properties/dblib.properties"); URL propURL = file.toURI().toURL(); props.load(propURL.openStream()); - jdbcDataSource = DBResourceManager.create(props); + jdbcDataSource = new DBResourceManager(props); return jdbcDataSource; }
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java index 0174d47..1999793 100644 --- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java +++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java
@@ -65,7 +65,7 @@ File file = new File("/opt/app/bvc/properties/dblib.properties"); URL propURL = file.toURI().toURL(); props.load(propURL.openStream()); - jdbcDataSource = DBResourceManager.create(props); + jdbcDataSource = new DBResourceManager(props); return jdbcDataSource; }
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java index 46bb240..0220770 100644 --- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java +++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java
@@ -93,7 +93,7 @@ } if (dblibSvc == null) { try { - dblibSvc = DBResourceManager.create(System.getProperties()); + dblibSvc = new DBResourceManager(System.getProperties()); } catch (Exception e) { Log.error("Caught exception trying to create db service", e); }