diff options
10 files changed, 99 insertions, 22 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index 6bb4ffd7a..f052b8565 100755 --- a/epsdk-app-onap/pom.xml +++ b/epsdk-app-onap/pom.xml @@ -142,6 +142,12 @@ <container.classpath>classpath:</container.classpath> </systemPropertyVariables> <useSystemClassLoader>false</useSystemClassLoader> + <properties> + <property> + <name>usedefaultlisteners</name> + <value>false</value> + </property> + </properties> </configuration> </plugin> @@ -149,7 +155,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.0.2</version> + <version>3.2.0</version> <configuration> <archive> <manifest> @@ -169,6 +175,10 @@ <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-app-overlay</artifactId> </overlay> + <overlay> + <groupId>org.onap.vid</groupId> + <artifactId>vid-webpack-master</artifactId> + </overlay> </overlays> </configuration> </plugin> @@ -280,6 +290,12 @@ <type>jar</type> <classifier>classes</classifier> </dependency> + <dependency> + <groupId>org.onap.vid</groupId> + <artifactId>vid-webpack-master</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> <!-- SDK components --> <dependency> <groupId>org.onap.portal.sdk</groupId> @@ -323,6 +339,11 @@ <artifactId>jackson-databind</artifactId> <version>${jackson.version}</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-kotlin</artifactId> + <version>${jackson.version}</version> + </dependency> <!-- jackson-dataformat-* are to override elasticsearch-2.2.0 deps hell --> <!-- (elasticsearch is an epsdk-app-common-2.4.0 dep) --> <dependency> @@ -439,5 +460,11 @@ <version>${springframework.version}</version> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2.3</version> + </dependency> + </dependencies> </project> diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml b/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml index 0355fb28b..6007fdc22 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
-
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<display-name>ecomp-sdk-app-os</display-name>
<!-- The app can function on a HA cluster -->
@@ -13,6 +12,7 @@ <session-timeout>30</session-timeout>
<tracking-mode>COOKIE</tracking-mode>
</session-config>
+
<filter>
<filter-name>SecurityXssFilter</filter-name>
<filter-class>org.onap.portalapp.filter.SecurityXssFilter</filter-class>
@@ -22,4 +22,53 @@ <url-pattern>/*</url-pattern>
</filter-mapping>
+ <!--
+ `vid-webpack-master` servlet and it's servlet mapping below, serves
+ Angular's index.html for any requests like the following, letting
+ the JavaScript router do its magic:
+ * /vid/app/ui/
+ * /vid/app/ui/servicePlanning
+ * /vid/app/ui/browseSdc
+ -->
+ <servlet>
+ <servlet-name>vid-webpack-master</servlet-name>
+ <jsp-file>/app/ui/index.html</jsp-file>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>vid-webpack-master</servlet-name>
+ <url-pattern>/app/ui/</url-pattern>
+ </servlet-mapping>
+
+ <!--
+ All the files under the paths below are served as static files, using
+ tomcat's `default` servlet. This overrides the `vid-webpack-master`
+ url-pattern.
+ The filter `charset-to-utf8-filter` adds "charset=UTF-8" to these files
+ content type, as the default content-type is platform-dependant (which
+ is not ok for Windows stations).
+ -->
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/app/ui/*</url-pattern>
+ </servlet-mapping>
+
+ <filter>
+ <filter-name>charset-to-utf8-filter</filter-name>
+ <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+ <init-param>
+ <param-name>encoding</param-name>
+ <param-value>UTF-8</param-value>
+ </init-param>
+ <init-param>
+ <param-name>forceEncoding</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>charset-to-utf8-filter</filter-name>
+ <url-pattern>/app/ui/*</url-pattern>
+ </filter-mapping>
+
</web-app>
\ No newline at end of file diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index 1749039d6..b2c5c9dce 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -46,7 +46,7 @@ <sitePath>content/sites/site/org/onap/vid/${project.version}</sitePath> <aspectj.version>1.8.9</aspectj.version> - <kotlin.version>1.3.11</kotlin.version> + <kotlin.version>1.3.30</kotlin.version> <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget> <eirslett.version>1.6</eirslett.version> @@ -56,6 +56,9 @@ <!-- override using -Drelease_version=foo -Dpatch_version=bar --> <release_version>${env.RELEASE_VERSION}</release_version> <patch_version/> + + <reportportal.argline>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar -Drp.enable=true -Drp.mode=DEFAULT -Drp.tags="CICD;BE_UNIT;BUILD_${env.BUILD_NUMBER}"</reportportal.argline> + </properties> @@ -298,6 +301,10 @@ <name>junit</name> <value>false</value> </property> + <property> + <name>usedefaultlisteners</name> + <value>false</value> + </property> </properties> <threadCount>1</threadCount> </configuration> @@ -802,7 +809,7 @@ <dependency> <groupId>net.javacrumbs.json-unit</groupId> <artifactId>json-unit</artifactId> - <version>1.23.0</version> + <version>2.2.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/VidController.java b/vid-app-common/src/main/java/org/onap/vid/controller/VidController.java index 9d557a096..15bc5ed7c 100644 --- a/vid-app-common/src/main/java/org/onap/vid/controller/VidController.java +++ b/vid-app-common/src/main/java/org/onap/vid/controller/VidController.java @@ -66,7 +66,7 @@ public class VidController extends RestrictedBaseController { */ @RequestMapping(value = {"/rest/models/services"}, method = RequestMethod.GET) public SecureServices getServices(HttpServletRequest request) { - LOG.info("Start API for browse ASDC was called"); + LOG.info("Start API for browse SDC was called"); SecureServices secureServices = new SecureServices(); List<Role> roles = roleProvider.getUserRoles(request); secureServices.setServices(aaiService.getServicesByDistributionStatus()); diff --git a/vid-automation/src/main/java/vid/automation/test/Constants.java b/vid-automation/src/main/java/vid/automation/test/Constants.java index e3eeaca54..6605fe2e6 100644 --- a/vid-automation/src/main/java/vid/automation/test/Constants.java +++ b/vid-automation/src/main/java/vid/automation/test/Constants.java @@ -73,7 +73,7 @@ public class Constants { public static final int numOfButtons = 7; public static final String buttonClass = "att-accordion__group"; public static final String SEARCH_EXISTING_SERVICE = "Search for Existing Service Instances"; - public static final String BROWSE_ASDC_SERVICE_MODELS = "Browse ASDC Service Models"; + public static final String BROWSE_SDC_SERVICE_MODELS = "Browse SDC Service Models"; public static final String CREATE_NEW_SERVICE = "Create New Service Instance"; public static final String VNF_CHANGES = "VNF Changes"; public static final String TEST_ENVIRONMENTS = "Test Environments"; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java b/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java index dc3de78dd..96c823948 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java @@ -12,7 +12,7 @@ public class SideMenu { static final Logger logger = LoggerFactory.getLogger(SideMenu.class); public static void navigateToBrowseASDCPage() { - navigateToPage(Constants.SideMenu.BROWSE_ASDC_SERVICE_MODELS); + navigateToPage(Constants.SideMenu.BROWSE_SDC_SERVICE_MODELS); } public static void navigateToSearchExistingPage() { diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml index 59f886826..4e966754c 100644 --- a/vid-ext-services-simulator/pom.xml +++ b/vid-ext-services-simulator/pom.xml @@ -12,7 +12,6 @@ <properties> <encoding>UTF-8</encoding> - <epsdk.version>1.3.0</epsdk.version> <springframework.version>5.1.6.RELEASE</springframework.version> <hibernate.version>5.3.4.Final</hibernate.version> <jackson.version>2.9.8</jackson.version> @@ -42,7 +41,6 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <epsdk.version>1.1.0-SNAPSHOT</epsdk.version> <nexusproxy>https://nexus.onap.org</nexusproxy> <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath> <releaseNexusPath>content/repositories/releases/</releaseNexusPath> diff --git a/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts index ecd91022b..13c4464cd 100644 --- a/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts @@ -251,7 +251,7 @@ describe('A la carte', function () { } function checkServiceNameInputIdMandatory() { - cy.get('span').contains('Browse ASDC Service Models').click({force: true}) + cy.get('span').contains('Browse SDC Service Models').click({force: true}) .getElementByDataTestsId('deploy-' + SERVICE_ID).click({force: true}) .wait(1000).getElementByDataTestsId(CONFIRM_BUTTON).click({force: true}) .get('.error').contains(INSTANCE_NAME_MANDATORY_MESSAGE) diff --git a/vid-webpack-master/cypress/integration/iFrames/browse-sdc.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/browse-sdc.e2e.ts index 1e80ee77e..e787aa76c 100644 --- a/vid-webpack-master/cypress/integration/iFrames/browse-sdc.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/browse-sdc.e2e.ts @@ -53,7 +53,7 @@ describe('Browse SDC', function () { 'MACRO_FOR_NEW_FLOW'); }); - cy.get('span').contains('Browse ASDC Service Models').click({force: true}); + cy.get('span').contains('Browse SDC Service Models').click({force: true}); cy.wait("@list_services").then(() => { cy.getElementByDataTestsId('deploy-' + MACRO_WITH_NETWORK_ID).click({force: true}) .getElementByDataTestsId(CANCEL_BUTTON).click({force: true}); @@ -87,7 +87,7 @@ describe('Browse SDC', function () { 'MACRO_WITH_CONFIGURATION'); }); - cy.get('span').contains('Browse ASDC Service Models').click({force: true}); + cy.get('span').contains('Browse SDC Service Models').click({force: true}); cy.wait("@list_services").then(() => { cy.getElementByDataTestsId('deploy-' + VERY_OLD_SERVICE_UUID).click({force: true}) .getElementByDataTestsId('create-modal-title').contains("Create Service Instance -- a la carte"); diff --git a/vid-webpack-master/src/WEB-INF/web.xml b/vid-webpack-master/src/WEB-INF/web.xml index a4152daaa..c449b34e8 100644 --- a/vid-webpack-master/src/WEB-INF/web.xml +++ b/vid-webpack-master/src/WEB-INF/web.xml @@ -20,10 +20,9 @@ <servlet-mapping> <servlet-name>vid-webpack-master</servlet-name> - <url-pattern>/app/ui/*</url-pattern> + <url-pattern>/app/ui/</url-pattern> </servlet-mapping> - <!-- All the files under the paths below are served as static files, using tomcat's `default` servlet. This overrides the `vid-webpack-master` @@ -34,10 +33,7 @@ --> <servlet-mapping> <servlet-name>default</servlet-name> - <url-pattern>/app/ui/css/*</url-pattern> - <url-pattern>/app/ui/fonts/*</url-pattern> - <url-pattern>/app/ui/img/*</url-pattern> - <url-pattern>/app/ui/js/*</url-pattern> + <url-pattern>/app/ui/*</url-pattern> </servlet-mapping> <filter> |