-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #32 from OpenLiberty/dev
Dev to Master
- Loading branch information
Showing
81 changed files
with
24,162 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
target/ | ||
.settings/ | ||
.project | ||
.classpath | ||
.factorypath | ||
MANIFEST.MF | ||
README.html | ||
.DS_Store | ||
ibm-web-ext.xml | ||
**/webapp/app/ | ||
**/.vscode | ||
**/node |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
language: java | ||
before_script: | ||
- unset _JAVA_OPTIONS | ||
- cd finish | ||
- chmod +x ../scripts/travisTest.sh | ||
script: ../scripts/travisTest.sh | ||
notifications: | ||
slack: | ||
template: | ||
- 'Build: <%{build_url}| %{build_number}> | Commit (<%{compare_url}|%{commit}>): | ||
%{commit_message}' | ||
- 'Repo@Branch: %{repository_slug}@%{branch}' | ||
- 'Author: %{author}' | ||
- 'Summary: %{result} in %{duration}' | ||
rooms: | ||
secure: cVlTnHxyBuaqBaiQfqsyJrSuIYHMA/3Dpdh/0jbL5bITo0MmB6wVcJUTIA/8Nnzgi+cI83n13fGhGBrgefbhRCE+tZAdBPeqYxFbZkVg4JJ909dG8BBwS3N3gFtAGhh7gcZwN5fdc+2cGP4kF18uaViWIitGdmHe5p5XnZBuV0JBL1aXRfZOGbxerpBBEuWjIF7O2b69EWkKTb3nyZlctrSgmZeJWG0xZw7Fahbr7en9hpaemEatCsoiNAIN82CH26kiC3lOVzfGq+WZNabMtnd+ZP3AHnKapmoNB32rMLs3v8A5Nx+IPdwBbM1X0o5kjLgXrGwZhwfRkJ+MxPG8qvbCQNFtsXXhOE/PAFZ4nTn3oyWHRQbKJtYS6gzKGmMTF9BqDpoHsUm0isD/km23ainTc2eQOMgqdGMdzKVFO+4ze6BKhIHWO1VeZBTYkuTDN8S5J7BfMOYC4XhpQHaPvkES56zY2N0fek/AdL/aP5kaa0FwfxC3X/QRNQPe0XMd9MNZNCcOAPn1ieRLq25Lq+osm8we531QjUEU/i6PtPt8wyUzvtHW+oY9ckS67F2kBQ4gLzOckm2ekbnX9SHpd/Ze0BYIaSvFVQrVgKZFM3RvWTD6opGxv3FyRF08bqYT1tcEUPNibUqQ0Cs1ldgPkbcjuIjtArWPcPGzA6AmRtY= | ||
on_success: never | ||
on_failure: always | ||
branches: | ||
only: | ||
- master | ||
- qa | ||
- dev |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,153 @@ | ||
<?xml version='1.0' encoding='utf-8'?> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> | ||
|
||
<parent> | ||
<groupId>net.wasdev.wlp.maven.parent</groupId> | ||
<artifactId>liberty-maven-app-parent</artifactId> | ||
<version>RELEASE</version> | ||
</parent> | ||
|
||
<groupId>io.openliberty.guides</groupId> | ||
<artifactId>io.openliberty.guides.consumingrest-ng</artifactId> | ||
<version>1.0-SNAPSHOT</version> | ||
<packaging>war</packaging> | ||
|
||
<properties> | ||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | ||
<maven.compiler.source>1.8</maven.compiler.source> | ||
<maven.compiler.target>1.8</maven.compiler.target> | ||
<app.name>LibertyProject</app.name> | ||
<testServerHttpPort>9080</testServerHttpPort> | ||
<testServerHttpsPort>9443</testServerHttpsPort> | ||
<package.file>${project.build.directory}/${app.name}.zip</package.file> | ||
<packaging.type>usr</packaging.type> | ||
</properties> | ||
|
||
<dependencyManagement> | ||
<dependencies> | ||
<dependency> | ||
<groupId>io.openliberty.features</groupId> | ||
<artifactId>features-bom</artifactId> | ||
<version>RELEASE</version> | ||
<type>pom</type> | ||
<scope>import</scope> | ||
</dependency> | ||
</dependencies> | ||
</dependencyManagement> | ||
|
||
<dependencies> | ||
<!-- Open Liberty features --> | ||
<dependency> | ||
<groupId>io.openliberty.features</groupId> | ||
<artifactId>jaxrs-2.1</artifactId> | ||
<type>esa</type> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>io.openliberty.features</groupId> | ||
<artifactId>jsonp-1.1</artifactId> | ||
<type>esa</type> | ||
<scope>provided</scope> | ||
</dependency> | ||
</dependencies> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-war-plugin</artifactId> | ||
<version>3.2.2</version> | ||
<configuration> | ||
<failOnMissingWebXml>false</failOnMissingWebXml> | ||
<packagingExcludes>pom.xml</packagingExcludes> | ||
</configuration> | ||
</plugin> | ||
<!-- Enable liberty-maven plugin --> | ||
<plugin> | ||
<groupId>net.wasdev.wlp.maven.plugins</groupId> | ||
<artifactId>liberty-maven-plugin</artifactId> | ||
<configuration> | ||
<assemblyArtifact> | ||
<groupId>io.openliberty</groupId> | ||
<artifactId>openliberty-runtime</artifactId> | ||
<version>RELEASE</version> | ||
<type>zip</type> | ||
</assemblyArtifact> | ||
<configFile>src/main/liberty/config/server.xml</configFile> | ||
<packageFile>${package.file}</packageFile> | ||
<include>${packaging.type}</include> | ||
<bootstrapProperties> | ||
<default.http.port>${testServerHttpPort}</default.http.port> | ||
<default.https.port>${testServerHttpsPort}</default.https.port> | ||
</bootstrapProperties> | ||
</configuration> | ||
<executions> | ||
<!-- Package server --> | ||
<execution> | ||
<id>package-server</id> | ||
<configuration> | ||
<outputDirectory>target/wlp-package</outputDirectory> | ||
</configuration> | ||
</execution> | ||
<!-- Install the app via loose config --> | ||
<execution> | ||
<id>install-apps</id> | ||
<configuration> | ||
<looseApplication>true</looseApplication> | ||
<stripVersion>true</stripVersion> | ||
<installAppPackages>project</installAppPackages> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
<plugin> | ||
<groupId>com.github.eirslett</groupId> | ||
<artifactId>frontend-maven-plugin</artifactId> | ||
<version>1.7.6</version> | ||
<configuration> | ||
<workingDirectory>src/main/frontend</workingDirectory> | ||
</configuration> | ||
|
||
<executions> | ||
|
||
<execution> | ||
<id>install node and npm</id> | ||
<goals> | ||
<goal>install-node-and-npm</goal> | ||
</goals> | ||
<configuration> | ||
<nodeVersion>v10.15.3</nodeVersion> | ||
<npmVersion>6.4.1</npmVersion> | ||
</configuration> | ||
</execution> | ||
|
||
<execution> | ||
<id>npm install</id> | ||
<goals> | ||
<goal>npm</goal> | ||
</goals> | ||
<!-- Optional configuration which provides for running any npm command --> | ||
<configuration> | ||
<arguments>install</arguments> | ||
</configuration> | ||
</execution> | ||
|
||
<execution> | ||
<id>npm run build</id> | ||
<goals> | ||
<goal>npm</goal> | ||
</goals> | ||
<configuration> | ||
<arguments>run build</arguments> | ||
</configuration> | ||
</execution> | ||
|
||
</executions> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# Editor configuration, see https://editorconfig.org | ||
root = true | ||
|
||
[*] | ||
charset = utf-8 | ||
indent_style = space | ||
indent_size = 2 | ||
insert_final_newline = true | ||
trim_trailing_whitespace = true | ||
|
||
[*.md] | ||
max_line_length = off | ||
trim_trailing_whitespace = false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
# See http://help.github.com/ignore-files/ for more about ignoring files. | ||
|
||
# compiled output | ||
/dist | ||
/tmp | ||
/out-tsc | ||
# Only exists if Bazel was run | ||
/bazel-out | ||
|
||
# dependencies | ||
/node_modules | ||
|
||
# profiling files | ||
chrome-profiler-events.json | ||
speed-measure-plugin.json | ||
|
||
# IDEs and editors | ||
/.idea | ||
.project | ||
.classpath | ||
.c9/ | ||
*.launch | ||
.settings/ | ||
*.sublime-workspace | ||
|
||
# IDE - VSCode | ||
.vscode/* | ||
!.vscode/settings.json | ||
!.vscode/tasks.json | ||
!.vscode/launch.json | ||
!.vscode/extensions.json | ||
.history/* | ||
|
||
# misc | ||
/.sass-cache | ||
/connect.lock | ||
/coverage | ||
/libpeerconnection.log | ||
npm-debug.log | ||
yarn-error.log | ||
testem.log | ||
/typings | ||
|
||
# System Files | ||
.DS_Store | ||
Thumbs.db |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Frontend | ||
|
||
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.8. | ||
|
||
## Development server | ||
|
||
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. | ||
|
||
## Code scaffolding | ||
|
||
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`. | ||
|
||
## Build | ||
|
||
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build. | ||
|
||
## Running unit tests | ||
|
||
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io). | ||
|
||
## Running end-to-end tests | ||
|
||
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/). | ||
|
||
## Further help | ||
|
||
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). |
Oops, something went wrong.