diff options
Diffstat (limited to 'ecomp-sdk')
12 files changed, 38 insertions, 34 deletions
diff --git a/ecomp-sdk/epsdk-analytics/pom.xml b/ecomp-sdk/epsdk-analytics/pom.xml index 4f612f90..3c22efc1 100644 --- a/ecomp-sdk/epsdk-analytics/pom.xml +++ b/ecomp-sdk/epsdk-analytics/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -68,7 +68,7 @@ <!-- sdk-core --> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-core</artifactId> <version>${project.version}</version> </dependency> diff --git a/ecomp-sdk/epsdk-app-common/pom.xml b/ecomp-sdk/epsdk-app-common/pom.xml index f315974a..66fd4e35 100644 --- a/ecomp-sdk/epsdk-app-common/pom.xml +++ b/ecomp-sdk/epsdk-app-common/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -156,17 +156,17 @@ <dependencies> <!-- SDK components --> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-core</artifactId> <version>${epsdk.version}</version> </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-analytics</artifactId> <version>${epsdk.version}</version> </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-workflow</artifactId> <version>${epsdk.version}</version> </dependency> diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml index 9cc00184..108cd4c9 100644 --- a/ecomp-sdk/epsdk-app-os/pom.xml +++ b/ecomp-sdk/epsdk-app-os/pom.xml @@ -4,7 +4,7 @@ <!-- This is the Maven project object model (POM) file for the open-source SDK web app. This is NOT the Portal - but it is developed and supported by the Portal team. --> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-app-os</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>war</packaging> @@ -118,7 +118,7 @@ </archive> <overlays> <overlay> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-app-overlay</artifactId> </overlay> </overlays> @@ -161,30 +161,30 @@ <dependencies> <!-- SDK overlay war --> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-app-overlay</artifactId> <version>${epsdk.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-app-common</artifactId> <version>${epsdk.version}</version> <type>jar</type> </dependency> <!-- SDK components --> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-core</artifactId> <version>${epsdk.version}</version> </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-analytics</artifactId> <version>${epsdk.version}</version> </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-workflow</artifactId> <version>${epsdk.version}</version> </dependency> diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties index 6d792748..8ce8cc95 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties @@ -1,7 +1,11 @@ # login settings login_method_backdoor = backdoor login_method_attribute_name = login_method + +# These properties will be removed after SingleSignOnController is cleaned authentication_mechanism = BOTH +login_method_csp = csp +login_method_web_junction = web_junction #login message login.error.hrid.empty = Login failed, please contact system administrator. diff --git a/ecomp-sdk/epsdk-app-overlay/pom.xml b/ecomp-sdk/epsdk-app-overlay/pom.xml index 29d1cc5b..14f59ae8 100644 --- a/ecomp-sdk/epsdk-app-overlay/pom.xml +++ b/ecomp-sdk/epsdk-app-overlay/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml index 9a88f73a..f15d80c2 100644 --- a/ecomp-sdk/epsdk-core/pom.xml +++ b/ecomp-sdk/epsdk-core/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -94,7 +94,7 @@ <!-- internal --> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-fw</artifactId> <version>${project.version}</version> <exclusions> diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/AccessConfiguration.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/AccessConfiguration.java index ee97bc93..8b83b389 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/AccessConfiguration.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/AccessConfiguration.java @@ -11,7 +11,7 @@ public class AccessConfiguration { /** * - * @returns RoleServiceImpl bean if LocalAccessCondition is true + * @return RoleServiceImpl bean if LocalAccessCondition is true */ @Bean @Conditional(LocalAccessCondition.class) @@ -22,7 +22,7 @@ public class AccessConfiguration { /** * - * @returns RoleServiceCentralizedAccess bean if CentralAccessCondition is true + * @return RoleServiceCentralizedAccess bean if CentralAccessCondition is true */ @Bean @Conditional(CentralAccessCondition.class) @@ -33,7 +33,7 @@ public class AccessConfiguration { /** * - * @returns LoginServiceImpl bean if LocalAccessCondition is true + * @return LoginServiceImpl bean if LocalAccessCondition is true */ @Bean @Conditional(LocalAccessCondition.class) @@ -44,7 +44,7 @@ public class AccessConfiguration { /** * - * @returns LoginServiceCentralizedImpl bean if CentralAccessCondition is true + * @return LoginServiceCentralizedImpl bean if CentralAccessCondition is true */ @Bean @Conditional(CentralAccessCondition.class) @@ -54,7 +54,7 @@ public class AccessConfiguration { /** * - * @returns UserProfileServiceImpl bean if LocalAccessCondition is true + * @return UserProfileServiceImpl bean if LocalAccessCondition is true */ @Bean @Conditional(LocalAccessCondition.class) @@ -65,7 +65,7 @@ public class AccessConfiguration { /** * - * @returns returns UserProfileServiceCentalizedImpl bean if CentralAccessCondition is true + * @return returns UserProfileServiceCentalizedImpl bean if CentralAccessCondition is true */ @Bean @Conditional(CentralAccessCondition.class) @@ -77,7 +77,7 @@ public class AccessConfiguration { /** * - * @returns returns ProfileServiceImpl bean if LocalAccessCondition is true + * @return returns ProfileServiceImpl bean if LocalAccessCondition is true */ @Bean @Conditional(LocalAccessCondition.class) @@ -88,7 +88,7 @@ public class AccessConfiguration { /** * - * @returns returns ProfileServiceCentralizedImpl bean if CentralAccessCondition is true + * @return returns ProfileServiceCentralizedImpl bean if CentralAccessCondition is true */ @Bean @@ -99,7 +99,7 @@ public class AccessConfiguration { /** * - * @returns returns UrlAccessCentalizedImpl bean if CentralAccessCondition is true + * @return returns UrlAccessCentalizedImpl bean if CentralAccessCondition is true */ @Bean @Conditional(CentralAccessCondition.class) @@ -110,7 +110,7 @@ public class AccessConfiguration { /** * - * @returns returns UrlAccessImpl bean if LocalAccessCondition is true + * @return returns UrlAccessImpl bean if LocalAccessCondition is true */ @Bean @Conditional(LocalAccessCondition.class) @@ -121,7 +121,7 @@ public class AccessConfiguration { /** * - * @returns returns RestApiRequestBuilder bean if CentralAccessCondition is true + * @return returns RestApiRequestBuilder bean if CentralAccessCondition is true */ @Bean @Conditional(CentralAccessCondition.class) diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/RoleService.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/RoleService.java index ba8d4477..a64d480b 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/RoleService.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/RoleService.java @@ -86,7 +86,7 @@ public interface RoleService { /** * * @param requestedLoginId - * @return + * @return List of active roles * @throws Exception * Method getActiveRoles gets the list of active roles of application * @@ -97,7 +97,7 @@ public interface RoleService { * * @param requestedLoginId * @param code function code - * @return + * @return RoleFunction of requested function code * @throws Exception * Method getRoleFunction returns RoleFunction of requested function code */ diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/UserService.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/UserService.java index 2cc28cc2..170361c3 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/UserService.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/UserService.java @@ -8,7 +8,7 @@ public interface UserService { /** * * @param id orgUserID - * @return + * @return User object * @throws Exception * Method getUser returns the User Object */ diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml index 42019604..4a3d9a5a 100644 --- a/ecomp-sdk/epsdk-fw/pom.xml +++ b/ecomp-sdk/epsdk-fw/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> diff --git a/ecomp-sdk/epsdk-workflow/pom.xml b/ecomp-sdk/epsdk-workflow/pom.xml index 8fe2372b..b43b387b 100644 --- a/ecomp-sdk/epsdk-workflow/pom.xml +++ b/ecomp-sdk/epsdk-workflow/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -20,7 +20,7 @@ <dependencies> <!-- sdk-core --> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-core</artifactId> <version>${project.version}</version> </dependency> diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml index e9e47798..092e2ba4 100644 --- a/ecomp-sdk/pom.xml +++ b/ecomp-sdk/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <!-- ECOMP Portal SDK Maven parent project --> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> |