summaryrefslogtreecommitdiffstats
path: root/vid-app-common/src/test/resources/WEB-INF
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2018-12-31 17:21:27 +0200
committerIttay Stern <ittay.stern@att.com>2019-01-09 20:19:55 +0200
commit6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 (patch)
tree3bd672dff83e3218232cd8665680416b7fc26a5d /vid-app-common/src/test/resources/WEB-INF
parent5ec29ff5e3864f1ba6ecac71f8bffbefa400cf27 (diff)
Merge from ECOMP's repository
Main Features -------------- - Async-Instantiation jobs mechanism major update; still WIP (package `org.onap.vid.job`) - New features in View/Edit: Activate fabric configuration; show related networks; soft delete - Support AAI service-tree traversal (`AAIServiceTree`) - In-memory cache for SDC models and certain A&AI queries (`CacheProviderWithLoadingCache`) - Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA models - Resolve Cloud-Owner values for MSO - Pass X-ONAP headers to MSO Infrastructure -------------- - Remove codehaus' jackson mapper; use soley fasterxml 2.9.7 - Surefire invokes both TestNG and JUnit tests - Support Kotlin source files - AaiController2 which handles errors in a "Spring manner" - Inline generated-sources and remove jsonschema2pojo Quality -------- - Cumulative bug fixes (A&AI API, UI timeouts, and many more) - Many Sonar issues cleaned-up - Some unused classes removed - Minor changes in vid-automation project, allowing some API verification to run Hard Merges ------------ - HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest) - Moved `package org.onap.vid.controllers` to `controller`, without plural -- just to keep semantic sync with ECOMP. Reference commit in ECOMP: 3d1141625 Issue-ID: VID-378 Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788 Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common/src/test/resources/WEB-INF')
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties39
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml25
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml34
3 files changed, 37 insertions, 61 deletions
diff --git a/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties b/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties
index 3d8e8155a..f35bf2d64 100644
--- a/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties
+++ b/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties
@@ -1,50 +1,27 @@
-# domain settings
-#domain_class_location = com.att.fusion.domain.
-
-# validator settings
-#default_error_message = Default error message
-
# login settings
-login_method_csp = csp
-login_method_web_junction = web_junction
login_method_backdoor = backdoor
+login_method_web_junction = login_method_web_junction
+login_method_csp = login_method_csp
login_method_attribute_name = login_method
+authentication_mechanism = BOTH
+role_function_list = role_funcion_list
#login message
login.error.hrid.empty = Login failed, please contact system administrator.
login.error.hrid.not-found = User not found, please contact system administrator.
login.error.user.inactive = Account is disabled, please contact system administrator.
-# CSP settings
-csp_cookie_name = attESSec
-csp_gate_keeper_data_key = MgmtSysCtr
-csp_gate_keeper_prod_key = PROD
-csp_login_url = https://www.e-access.att.com/empsvcs/hrpinmgt/pagLogin/?sysName=MgmtSysCtr&retURL=
-csp_logout_url = https://www.e-access.att.com/empsvcs/hrpinmgt/pagLogout/?retURL=
-
-authentication_mechanism = BOTH
-
-#csp_gate_keeper_prod_key = DEVL
-user_attribute_name = user
-#csp_login_url = https://www.e-access.att.com/empsvcs/hrpinmgt/pagLogin/?sysName=MgmtSysCtr&retURL=
-#csp_logout_url = https://webtest.csp.att.com/empsvcs/hrpinmgt/pagLogout/?retURL=
-
-# Web Junction settings
-#web_junction_user_id_header_name = iv-user
-
# User Session settings
-#user_attribute_name = user
+user_attribute_name = user
roles_attribute_name = roles
role_functions_attribute_name = role_functions
-role_function_list = role_function_list
#client_device_attribute_name = client_device
#client_device_emulation = false
-#client_device_type_to_emulate = com.att.fusion.web.clientdevice.mobile.IPhoneDevice
-# POST settings
+# Import-user LDAP settings
post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory
-post_provider_url = ldap://ldap.webphone.att.com:389
-post_security_principal = ou=people,o=att,c=us
+post_provider_url = ldap://ldap.mycompany.com:389
+post_security_principal = ou=people,o=mycompany,c=us
post_max_result_size = 499
# menu settings
diff --git a/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml b/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml
index c9e10a16b..caefb19c8 100644
--- a/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml
+++ b/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml
@@ -2,11 +2,6 @@
<!DOCTYPE tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
"http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-
-<!-- This tiles definitions file is fusion/defs/definitions.xml. It maps
- tokens used by SDK-core controllers to JSP file paths. To minimize upgrade
- effort, this file should not be changed by on-boarding applications. -->
-
<tiles-definitions>
<definition name="ebz_template" template="/WEB-INF/fusion/jsp/ebz_template.jsp">
@@ -93,11 +88,6 @@
value="/WEB-INF/fusion/jsp/collaborateList.jsp"></put-attribute>
</definition>
- <!-- <definition extends="ebz_template" name="notebook">
- <put-attribute name="body"
- value="/WEB-INF/fusion/jsp/notebook.jsp"></put-attribute>
- </definition> -->
-
<definition name="notebook"
template="app/fusion/notebook-integration/scripts/view-models/notebook.htm" />
@@ -138,18 +128,9 @@
</definition> -->
<definition name="collaboration"
template="/WEB-INF/fusion/jsp/webrtc/collaboration.jsp" />
- <definition name="user_profile_list"
- template="/app/fusion/scripts/DS2-view-models/ds2-profile/profile.html" />
- <definition name="admin"
- template="/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html" />
- <definition name="workflows"
- template="/app/fusion/scripts/view-models/workflows/workflow-landing.html" />
- <definition name="report_dashboard"
- template="/app/fusion/scripts/view-models/reportdashboard-page/src/report-dashboard.html" />
- <definition name="samplePage"
- template="/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html" />
- <definition name="ds2_sample" template="/app/fusionapp/scripts/DS2-view-models/sampleDS2.html" />
-
+ <definition name="user_profile_list" template="/app/fusion/scripts/view-models/admin-page/profile.html"/>
+ <definition name="admin" template="/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html" />
+ <definition name="workflows" template="/app/fusion/scripts/view-models/workflows/workflow-landing.html"/>
<definition extends="ebz_template" name="report_wizard">
<put-attribute name="body"
diff --git a/vid-app-common/src/test/resources/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml b/vid-app-common/src/test/resources/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
index 0f32e94fc..8f58185c1 100644
--- a/vid-app-common/src/test/resources/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
+++ b/vid-app-common/src/test/resources/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
@@ -1,12 +1,14 @@
<?xml version="1.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.
+ ============LICENSE_START==========================================
+ ONAP Portal SDK
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+
+ Unless otherwise specified, all software contained herein is licensed
+ under the Apache License, Version 2.0 (the “License”);
+ you may not use this software except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -16,7 +18,23 @@
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.
- ================================================================================
+
+ Unless otherwise specified, all documentation contained herein is licensed
+ under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ you may not use this documentation except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://creativecommons.org/licenses/by/4.0/
+
+ Unless required by applicable law or agreed to in writing, documentation
+ 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.
+
+ ============LICENSE_END============================================
+
+ ECOMP is a trademark and service mark of AT&T Intellectual Property.
-->
<!DOCTYPE hibernate-mapping PUBLIC