diff options
Diffstat (limited to 'ecomp-sdk/epsdk-app-os')
3 files changed, 194 insertions, 2 deletions
diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md index 675919bb..1c59c836 100644 --- a/ecomp-sdk/epsdk-app-os/README.md +++ b/ecomp-sdk/epsdk-app-os/README.md @@ -12,6 +12,9 @@ like Apache Tomcat. Eclipse users must install the M2E-WTP connector, see https://www.eclipse.org/m2e-wtp/ ## Release Notes +Version 2.5.0 +- PORTAL-356 Bootstrapping hybrid applications (Angular and AngularJS) + Version 2.3.0 - PORTAL 254 ECOMP AAF jar - PORTAL-281 Portal SDK AAF jar throws null pointer exception diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml index 21f75af3..7ccc1776 100644 --- a/ecomp-sdk/epsdk-app-os/pom.xml +++ b/ecomp-sdk/epsdk-app-os/pom.xml @@ -42,6 +42,17 @@ <plugins> <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>3.0.0</version> + <configuration> + <filesets> + <fileset> + <directory>${basedir}/ngapp/app/dist</directory> + </fileset> + </filesets> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <!-- parent specifies the <version>2.19.1</version> --> @@ -120,13 +131,120 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.5</version> + <executions> + <execution> + <id>copy-angularjs-step1</id> + <phase>process-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/ngapp</outputDirectory> + <resources> + <resource> + <directory>../epsdk-app-overlay/src/main/webapp/ngapp</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>com.github.eirslett</groupId> + <artifactId>frontend-maven-plugin</artifactId> + <version>1.6</version> + + <configuration> + <nodeVersion>v8.11.3</nodeVersion> + <npmVersion>5.6.0</npmVersion> + <workingDirectory>${basedir}/ngapp</workingDirectory> + </configuration> + <executions> + <execution> + <id>install node and npm</id> + <phase>compile</phase> + <goals> + <goal>install-node-and-npm</goal> + </goals> + </execution> - <!-- add version number to manifest --> + <execution> + <id>npm install</id> + <phase>compile</phase> + <goals> + <goal>npm</goal> + </goals> + </execution> + + <execution> + <id>npm run build</id> + <phase>compile</phase> + <goals> + <goal>npm</goal> + </goals> + + <configuration> + <arguments>run build</arguments> + </configuration> + </execution> + + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.5</version> + <executions> + + <execution> + <id>copy-angular-final-step2</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/target/epsdk-app-os/app</outputDirectory> + <resources> + <resource> + <directory>${basedir}/ngapp/dist</directory> + </resource> + </resources> + </configuration> + </execution> + + </executions> + </plugin> + + <!-- + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.5</version> + <executions> + <execution> + <id>auto-clean-ng</id> + <phase>prepare-package</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory>${basedir}/target/epsdk-app-os/ngapp</directory> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> + --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.0.2</version> + <version>3.2.2</version> <configuration> <archive> <manifest> @@ -143,6 +261,7 @@ <artifactId>epsdk-app-overlay</artifactId> </overlay> </overlays> + <packagingExcludes>**/ngapp</packagingExcludes> </configuration> </plugin> diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngsamplePage.html b/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngsamplePage.html new file mode 100644 index 00000000..b774579a --- /dev/null +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngsamplePage.html @@ -0,0 +1,70 @@ +<!DOCTYPE html> +<!-- Single-page application for EPSDK-App demonstration pages using DS2 look and feel --> +<html> +<head> + <meta charset="ISO-8859-1"> + <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" /> + <title>Sample Page NG</title> + + <!-- B2b Library --> + <link rel="stylesheet" type="text/css" href="app/fusion/external/b2b/css/b2b-angular/b2b-angular.css"> + + <!-- icons in open source --> + <link rel="stylesheet" type="text/css" href="app/fusion/external/ds2/css/digital-ng-library/ionicons.css"> + <link rel="stylesheet" type="text/css" href="app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css"> + + <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css"> + + <!-- Common scripts --> + + <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script> + <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script> + <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script> + <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script> + <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script> + <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script> + <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script> + <script src="app/fusion/external/jquery/dist/jquery.min.js"></script> + <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script> + <script src="app/fusion/external/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> + <script src="app/fusion/external/angular-gridster/dist/angular-gridster.min.js"></script> + <script src="app/fusion/scripts/DS2-services/ds2-modal/modalService.js"></script> + <script src="app/fusion/external/ds2/js/appDS2.js"></script> + + <script src="app/fusion/scripts/DS2-services/userInfoServiceDS2.js"></script> + <script src="app/fusion/scripts/DS2-services/headerServiceDS2.js"></script> + <script src="app/fusion/scripts/DS2-services/leftMenuServiceDS2.js"></script> + <script src="app/fusion/scripts/DS2-services/manifestService.js"></script> + <script src="app/fusion/scripts/DS2-directives/footer.js"></script> + <script src="app/fusion/scripts/DS2-directives/ds2Header.js"></script> + <script src="app/fusion/scripts/DS2-directives/ds2LeftMenu.js"></script> + <script src="app/fusion/scripts/DS2-directives/b2b-leftnav-ext.js"></script> + <script src="app/fusion/external/utils/js/browserCheck.js"></script> + + <!-- Page-specific items --> + <script src="app/fusion/scripts/DS2-services/adminService.js"></script> + <script src="app/fusion/scripts/DS2-services/adminMenuService.js"></script> + + <script src="app/fusion/scripts/DS2-controllers/samplePage-route.js"></script> + <script src="app/fusion/scripts/DS2-controllers/collaborateList-route.js"></script> + <script src="app/fusion/scripts/DS2-controllers/collaborate-list-controller.js"></script> + <script src="app/fusion/scripts/DS2-services/ds2-sample-page/droolsService.js"></script> + <script src="app/fusion/scripts/DS2-controllers/ds2-sample/drools-controller.js"></script> + <script src="app/fusion/scripts/DS2-controllers/ds2-sample/notebook-controller.js"></script> + <script src="app/fusion/scripts/DS2-controllers/ds2-sample/notebookFrameController.js"></script> + <script src="app/fusion/scripts/DS2-controllers/ds2-sample/nbook-framecontroller.js"></script> + +</head> + <body class="appBody"> + <app-root></app-root> + <div ds2-Header class="header-container" ></div> + <div ds2-menu id="menuContainer" class="menu-container" ></div> + <div ng-view id="rightContentProfile" class="content-container"></div> + <div ds2-Footer class="footer-container"></div> + + <script type="text/javascript" src="app/ngapp/runtime.js"></script> + <script type="text/javascript" src="app/ngapp/polyfills.js"></script> + <script type="text/javascript" src="app/ngapp/main.js"></script> + + </body> +</html> |