Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to Master #32

Merged
merged 38 commits into from
Jun 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
f0889a3
Add draft
realModusOperandi Apr 25, 2019
e25a409
Merge pull request #1 from realModusOperandi/dev
evelinec Apr 25, 2019
13977ff
Update readme with feedback and clean up whitespace
realModusOperandi Apr 26, 2019
ef998e7
Merge pull request #6 from realModusOperandi/dev
evelinec May 1, 2019
0196e71
Fixed minor punctuation and hotspots
evelinec May 1, 2019
e86a300
Fixed another hotspot
evelinec May 1, 2019
df5258a
Address feedback
realModusOperandi May 9, 2019
09b1c3e
Merge pull request #8 from realModusOperandi/round-3
evelinec May 9, 2019
67e2d99
Minor fixes to hotspots
realModusOperandi May 9, 2019
53ac503
Merge pull request #9 from realModusOperandi/round-3
evelinec May 10, 2019
4e298ba
Round 4 of feedback
realModusOperandi May 13, 2019
3dbd4bb
Merge pull request #12 from realModusOperandi/round-4
evelinec May 13, 2019
18b6a97
Round 5 of feedback
realModusOperandi May 23, 2019
d85a4c9
Fix vulnerabilities in npm packages
realModusOperandi May 23, 2019
75012f9
Added dev branch so travis test can run
evelinec May 24, 2019
f6d1d03
Merge branch 'dev' into round-5
evelinec May 24, 2019
f738cb8
Merge pull request #14 from realModusOperandi/round-5
evelinec May 24, 2019
89eb6eb
Update README.adoc
gkwan-ibm May 28, 2019
88f1797
Merge pull request #15 from OpenLiberty/gkwan-ibm-patch-1
gkwan-ibm May 28, 2019
ae5b0cb
Updates to front matter and fixed typos
yeekangc Jun 6, 2019
21e4c86
Merge pull request #17 from OpenLiberty/yeekangc-patch-1
evelinec Jun 6, 2019
8286b0b
Updates from review of README
realModusOperandi Jun 10, 2019
2dc4593
Merge pull request #21 from realModusOperandi/round-6
evelinec Jun 11, 2019
89f96e7
Fixed 2 minor user review feedback
evelinec Jun 11, 2019
ce43a2d
Update statement about testing need
realModusOperandi Jun 11, 2019
402c1d7
Merge pull request #22 from realModusOperandi/round-7
evelinec Jun 11, 2019
9643681
Converted hotspot line numbers to tags
evelinec Jun 12, 2019
dd6dc9e
Merge branch 'dev' into hotspottags
evelinec Jun 12, 2019
de539ca
Added AnuglarJS guide as related guides
evelinec Jun 12, 2019
223d689
Merge branch 'hotspottags' of github.com:OpenLiberty/draft-guide-rest…
evelinec Jun 12, 2019
b7f759a
Merge pull request #23 from OpenLiberty/hotspottags
evelinec Jun 13, 2019
c5b37db
Addressed end-to-end test feedback
evelinec Jun 14, 2019
b86aed3
Merge branch 'dev' into hotspottags
evelinec Jun 14, 2019
6e2e2f9
Merge pull request #26 from OpenLiberty/hotspottags
evelinec Jun 14, 2019
2adf6db
Address ID review items
realModusOperandi Jun 17, 2019
061420c
review comments
realModusOperandi Jun 18, 2019
43c202e
Merge pull request #28 from realModusOperandi/round-7
evelinec Jun 19, 2019
50f4c05
Merge branch 'master' into dev
evelinec Jun 21, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .gitignore
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
23 changes: 23 additions & 0 deletions .travis.yml
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
601 changes: 601 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

354 changes: 354 additions & 0 deletions README.adoc

Large diffs are not rendered by default.

153 changes: 153 additions & 0 deletions finish/pom.xml
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>
13 changes: 13 additions & 0 deletions finish/src/main/frontend/.editorconfig
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
46 changes: 46 additions & 0 deletions finish/src/main/frontend/.gitignore
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
27 changes: 27 additions & 0 deletions finish/src/main/frontend/README.md
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).
Loading