diff options
Diffstat (limited to 'dcae_dmaapbc_webapp/dbca-os')
| -rw-r--r-- | dcae_dmaapbc_webapp/dbca-os/db-scripts/dbca-dml-mysql-1707-os.sql | 2 | ||||
| -rw-r--r-- | dcae_dmaapbc_webapp/dbca-os/pom.xml | 14 | ||||
| -rw-r--r-- | dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java) | 8 | ||||
| -rw-r--r-- | dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java) | 2 | ||||
| -rw-r--r-- | dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java) | 4 | ||||
| -rw-r--r-- | dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java) | 2 | ||||
| -rw-r--r-- | dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java) | 2 | ||||
| -rw-r--r-- | dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java) | 3 | ||||
| -rw-r--r-- | dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml | 2 |
9 files changed, 20 insertions, 19 deletions
diff --git a/dcae_dmaapbc_webapp/dbca-os/db-scripts/dbca-dml-mysql-1707-os.sql b/dcae_dmaapbc_webapp/dbca-os/db-scripts/dbca-dml-mysql-1707-os.sql index 5bd6014..0081c52 100644 --- a/dcae_dmaapbc_webapp/dbca-os/db-scripts/dbca-dml-mysql-1707-os.sql +++ b/dcae_dmaapbc_webapp/dbca-os/db-scripts/dbca-dml-mysql-1707-os.sql @@ -451,7 +451,7 @@ Insert into fn_user -- fn_app -- Use name "DMAAP-BC-APP" (originally "Default") -Insert into fn_app (APP_ID,APP_NAME,APP_IMAGE_URL,APP_DESCRIPTION,APP_NOTES,APP_URL,APP_ALTERNATE_URL,APP_REST_ENDPOINT,ML_APP_NAME,ML_APP_ADMIN_ID,MOTS_ID,APP_PASSWORD,OPEN,ENABLED,THUMBNAIL,APP_USERNAME,UEB_KEY,UEB_SECRET,UEB_TOPIC_NAME) VALUES (1,'DMAAP-BC-APP','assets/images/tmp/portal1.png','Some Default Description','Some Default Note','http://www.openecomp.org','http://www.openecomp.org',null,'ECPP','?','1','okYTaDrhzibcbGVq5mjkVQ==','N','N',null,'Default',null,null,'ECOMP-PORTAL-INBOX'); +Insert into fn_app (APP_ID,APP_NAME,APP_IMAGE_URL,APP_DESCRIPTION,APP_NOTES,APP_URL,APP_ALTERNATE_URL,APP_REST_ENDPOINT,ML_APP_NAME,ML_APP_ADMIN_ID,MOTS_ID,APP_PASSWORD,OPEN,ENABLED,THUMBNAIL,APP_USERNAME,UEB_KEY,UEB_SECRET,UEB_TOPIC_NAME) VALUES (1,'DMAAP-BC-APP','assets/images/tmp/portal1.png','Some Default Description','Some Default Note','http://www.onap.org','http://www.onap.org',null,'ECPP','?','1','okYTaDrhzibcbGVq5mjkVQ==','N','N',null,'Default',null,null,'ECOMP-PORTAL-INBOX'); -- fn_user_role Insert into fn_user_role (USER_ID,ROLE_ID,PRIORITY,APP_ID) values (1,1,null,1); diff --git a/dcae_dmaapbc_webapp/dbca-os/pom.xml b/dcae_dmaapbc_webapp/dbca-os/pom.xml index adeceac..472848b 100644 --- a/dcae_dmaapbc_webapp/dbca-os/pom.xml +++ b/dcae_dmaapbc_webapp/dbca-os/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.ui.dmaapbc</groupId> + <groupId>org.onap.ui.dmaapbc</groupId> <artifactId>dmaap-bc-app-os</artifactId> - <version>1.1.0</version> + <version>1.2.0-SNAPSHOT</version> <packaging>war</packaging> <name>DCAE DMaaP Bus Controller Webapp for ONAP</name> <description>DMaaP Bus Controller Web Application for open-source release</description> @@ -17,12 +17,12 @@ <springframework.version>4.2.0.RELEASE</springframework.version> <hibernate.version>4.3.11.Final</hibernate.version> <epsdk.version>1.1.0</epsdk.version> - <dbca.version>1.1.0-SNAPSHOT</dbca.version> + <dbca.version>1.2.0-SNAPSHOT</dbca.version> <sonar.exclusions>**.js</sonar.exclusions> <nexusproxy>https://nexus.onap.org</nexusproxy> <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath> <releaseNexusPath>/content/repositories/releases/</releaseNexusPath> - <sitePath>/content/sites/site/org/openecomp/ui/dmaapbc/${project.version}</sitePath> + <sitePath>/content/sites/site/org/onap/ui/dmaapbc/${project.version}</sitePath> </properties> <repositories> @@ -71,7 +71,7 @@ </archive> <overlays> <overlay> - <groupId>org.openecomp.ui.dmaapbc</groupId> + <groupId>org.onap.ui.dmaapbc</groupId> <artifactId>dmaap-bc-app-overlay</artifactId> <excludes> <exclude>META-INF/MANIFEST.MF</exclude> @@ -137,14 +137,14 @@ <dependencies> <!-- DMaaP webapp controllers --> <dependency> - <groupId>org.openecomp.ui.dmaapbc</groupId> + <groupId>org.onap.ui.dmaapbc</groupId> <artifactId>dmaap-bc-app-common</artifactId> <version>${dbca.version}</version> <type>jar</type> </dependency> <!-- DMaaP webapp overlay --> <dependency> - <groupId>org.openecomp.ui.dmaapbc</groupId> + <groupId>org.onap.ui.dmaapbc</groupId> <artifactId>dmaap-bc-app-overlay</artifactId> <version>${dbca.version}</version> <type>war</type> diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java index ddb4bc2..c827e84 100644 --- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java +++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java @@ -17,13 +17,13 @@ * limitations under the License. * ================================================================================ */ -package org.openecomp.portalapp.conf; +package org.onap.portalapp.conf; import java.util.ArrayList; import java.util.List; -import org.openecomp.portalapp.lm.FusionLicenseManagerImpl; -import org.openecomp.portalapp.login.LoginStrategyImpl; +import org.onap.portalapp.lm.FusionLicenseManagerImpl; +import org.onap.portalapp.login.LoginStrategyImpl; import org.openecomp.portalapp.scheduler.LogRegistry; import org.openecomp.portalsdk.core.auth.LoginStrategy; import org.openecomp.portalsdk.core.conf.AppConfig; @@ -55,7 +55,7 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry */ @Configuration @EnableWebMvc -@ComponentScan(basePackages = "org.openecomp", +@ComponentScan(basePackages = "org.openecomp, org.onap", // Exclude unused annotated classes with heavy dependencies. excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = { // EPSDK-Analytics diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java index 6d7c72d..347bb51 100644 --- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java +++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java @@ -17,7 +17,7 @@ * limitations under the License. * ================================================================================ */ -package org.openecomp.portalapp.conf; +package org.onap.portalapp.conf; import org.openecomp.portalsdk.core.conf.AppInitializer; diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java index ce77960..cbff8a9 100644 --- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java +++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java @@ -17,7 +17,7 @@ * limitations under the License. * ================================================================================ */ -package org.openecomp.portalapp.conf; +package org.onap.portalapp.conf; import org.springframework.context.annotation.Profile; import org.springframework.core.io.ClassPathResource; @@ -54,7 +54,7 @@ public class HibernateMappingLocations implements HibernateMappingLocatable { */ @Override public String[] getPackagesToScan() { - return new String[] { "org.openecomp" }; + return new String[] { "org.onap", "org.openecomp" }; } } diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java index abbf926..49a6070 100644 --- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java +++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java @@ -18,7 +18,7 @@ * ================================================================================ */ -package org.openecomp.portalapp.lm; +package org.onap.portalapp.lm; import java.util.Date; import java.util.List; diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java index 270e69f..1dd7abc 100644 --- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java +++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java @@ -18,7 +18,7 @@ * ================================================================================ */ -package org.openecomp.portalapp.login; +package org.onap.portalapp.login; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java index 2b9b60e..cbc6af2 100644 --- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java +++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java @@ -17,10 +17,11 @@ * limitations under the License. * ================================================================================ */ -package org.openecomp.portalapp.service; +package org.onap.portalapp.service; import java.util.Set; +import org.openecomp.portalapp.service.IAdminAuthExtension; import org.openecomp.portalsdk.core.domain.Role; import org.openecomp.portalsdk.core.domain.User; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml b/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml index 869b349..4766277 100644 --- a/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml +++ b/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml @@ -80,7 +80,7 @@ <encoder> <pattern>${applicationLoggerPattern}</pattern> </encoder> - <filter class="org.openecomp.fusionapp.util.CustomLoggingFilter" /> + <filter class="org.onap.fusionapp.util.CustomLoggingFilter" /> </appender> <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender"> |