aboutsummaryrefslogtreecommitdiffstats
path: root/dcae_dmaapbc_webapp/dbca-os
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2018-03-23 00:11:53 -0400
committerdglFromAtt <dgl@research.att.com>2018-03-23 00:12:03 -0400
commit5cb24dbf4169e7638b8af649c01183e279cc4cf5 (patch)
tree49f1ab47c23c4a4d13050be0f6aa985e49c58710 /dcae_dmaapbc_webapp/dbca-os
parent8955d49382c04907a82995018b896281d0f5130f (diff)
Use new ONAP artifact w/o flexslider dependency
This has additional changes for using ONAP artifact in dbca-common subdir. Change-Id: I1b0b50dc8d884500d2e0ba1ba8d21373834f9486 Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-341
Diffstat (limited to 'dcae_dmaapbc_webapp/dbca-os')
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/pom.xml2
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java1
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java2
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java2
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java81
5 files changed, 3 insertions, 85 deletions
diff --git a/dcae_dmaapbc_webapp/dbca-os/pom.xml b/dcae_dmaapbc_webapp/dbca-os/pom.xml
index f96259d..6eb3e46 100644
--- a/dcae_dmaapbc_webapp/dbca-os/pom.xml
+++ b/dcae_dmaapbc_webapp/dbca-os/pom.xml
@@ -16,7 +16,7 @@
<skiptests>true</skiptests>
<springframework.version>4.2.0.RELEASE</springframework.version>
<hibernate.version>4.3.11.Final</hibernate.version>
- <epsdk.version>2.2.0-SNAPSHOT</epsdk.version>
+ <epsdk.version>2.2.0-SNAPSHOT</epsdk.version>
<dbca.version>1.2.0-SNAPSHOT</dbca.version>
<sonar.exclusions>**.js</sonar.exclusions>
<nexusproxy>https://nexus.onap.org</nexusproxy>
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index 9dbae28..aa96ac3 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -22,7 +22,6 @@ package org.onap.portalapp.conf;
import java.util.ArrayList;
import java.util.List;
-import org.onap.portalapp.lm.FusionLicenseManagerImpl;
import org.onap.portalapp.login.LoginStrategyImpl;
import org.onap.portalapp.scheduler.LogRegistry;
import org.onap.portalsdk.core.auth.LoginStrategy;
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
index 347bb51..ff9d385 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
@@ -19,7 +19,7 @@
*/
package org.onap.portalapp.conf;
-import org.openecomp.portalsdk.core.conf.AppInitializer;
+import org.onap.portalsdk.core.conf.AppInitializer;
public class ExternalAppInitializer extends AppInitializer {
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
index cbff8a9..0192de3 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
@@ -24,7 +24,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Component;
-import org.openecomp.portalsdk.core.conf.HibernateMappingLocatable;
+import org.onap.portalsdk.core.conf.HibernateMappingLocatable;
@Component
@Profile("src")
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
deleted file mode 100644
index 49a6070..0000000
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * ================================================================================
- * ECOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-
-package org.onap.portalapp.lm;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.openecomp.portalsdk.core.lm.FusionLicenseManager;
-
-/**
- * Empty implementation to satisfy an interface.
- */
-public class FusionLicenseManagerImpl implements FusionLicenseManager {
-
- public FusionLicenseManagerImpl() {
- }
-
- /**
- * An implementation of the KeyStoreParam interface that returns the
- * information required to work with the keystore containing the private key
- */
- public void initKeyStoreParam() {
- }
-
- public void initCipherParam() {
- }
-
- public void initLicenseParam() {
- }
-
- public void doInitWork() {
- }
-
- public int installLicense() {
- return OPENSOURCE_LICENSE;
- }
-
- public synchronized int verifyLicense(ServletContext context) {
- return OPENSOURCE_LICENSE;
- }
-
- public void generateLicense(Map<String, String> clientInfoMap, List<String> ipAddressList) throws Exception {
- }
-
- public static String nvls(String s) {
- return null;
- }
-
- public String nvl(String s) {
- return null;
- }
-
- public Date getExpiredDate() {
- return null;
- }
-
- public void setExpiredDate(Date expiredDate) {
- }
-
-}