Skip to content

Commit 2810dd3

Browse files
evelinecevelinec
authored
Merge pull request #32 from OpenLiberty/dev
Dev to Master
2 parents c038e4a + 50f4c05 commit 2810dd3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+24162
-0
lines changed

‎.gitignore‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
target/
2+
.settings/
3+
.project
4+
.classpath
5+
.factorypath
6+
MANIFEST.MF
7+
README.html
8+
.DS_Store
9+
ibm-web-ext.xml
10+
**/webapp/app/
11+
**/.vscode
12+
**/node

‎.travis.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
language: java
2+
before_script:
3+
- unset _JAVA_OPTIONS
4+
- cd finish
5+
- chmod +x ../scripts/travisTest.sh
6+
script: ../scripts/travisTest.sh
7+
notifications:
8+
slack:
9+
template:
10+
- 'Build: <%{build_url}| %{build_number}> | Commit (<%{compare_url}|%{commit}>):
11+
%{commit_message}'
12+
- 'Repo@Branch: %{repository_slug}@%{branch}'
13+
- 'Author: %{author}'
14+
- 'Summary: %{result} in %{duration}'
15+
rooms:
16+
secure: cVlTnHxyBuaqBaiQfqsyJrSuIYHMA/3Dpdh/0jbL5bITo0MmB6wVcJUTIA/8Nnzgi+cI83n13fGhGBrgefbhRCE+tZAdBPeqYxFbZkVg4JJ909dG8BBwS3N3gFtAGhh7gcZwN5fdc+2cGP4kF18uaViWIitGdmHe5p5XnZBuV0JBL1aXRfZOGbxerpBBEuWjIF7O2b69EWkKTb3nyZlctrSgmZeJWG0xZw7Fahbr7en9hpaemEatCsoiNAIN82CH26kiC3lOVzfGq+WZNabMtnd+ZP3AHnKapmoNB32rMLs3v8A5Nx+IPdwBbM1X0o5kjLgXrGwZhwfRkJ+MxPG8qvbCQNFtsXXhOE/PAFZ4nTn3oyWHRQbKJtYS6gzKGmMTF9BqDpoHsUm0isD/km23ainTc2eQOMgqdGMdzKVFO+4ze6BKhIHWO1VeZBTYkuTDN8S5J7BfMOYC4XhpQHaPvkES56zY2N0fek/AdL/aP5kaa0FwfxC3X/QRNQPe0XMd9MNZNCcOAPn1ieRLq25Lq+osm8we531QjUEU/i6PtPt8wyUzvtHW+oY9ckS67F2kBQ4gLzOckm2ekbnX9SHpd/Ze0BYIaSvFVQrVgKZFM3RvWTD6opGxv3FyRF08bqYT1tcEUPNibUqQ0Cs1ldgPkbcjuIjtArWPcPGzA6AmRtY=
17+
on_success: never
18+
on_failure: always
19+
branches:
20+
only:
21+
- master
22+
- qa
23+
- dev

‎LICENSE‎

Lines changed: 601 additions & 0 deletions
Large diffs are not rendered by default.

‎README.adoc‎

Lines changed: 354 additions & 0 deletions
Large diffs are not rendered by default.

‎finish/pom.xml‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
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">
4+
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>net.wasdev.wlp.maven.parent</groupId>
9+
<artifactId>liberty-maven-app-parent</artifactId>
10+
<version>RELEASE</version>
11+
</parent>
12+
13+
<groupId>io.openliberty.guides</groupId>
14+
<artifactId>io.openliberty.guides.consumingrest-ng</artifactId>
15+
<version>1.0-SNAPSHOT</version>
16+
<packaging>war</packaging>
17+
18+
<properties>
19+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
21+
<maven.compiler.source>1.8</maven.compiler.source>
22+
<maven.compiler.target>1.8</maven.compiler.target>
23+
<app.name>LibertyProject</app.name>
24+
<testServerHttpPort>9080</testServerHttpPort>
25+
<testServerHttpsPort>9443</testServerHttpsPort>
26+
<package.file>${project.build.directory}/${app.name}.zip</package.file>
27+
<packaging.type>usr</packaging.type>
28+
</properties>
29+
30+
<dependencyManagement>
31+
<dependencies>
32+
<dependency>
33+
<groupId>io.openliberty.features</groupId>
34+
<artifactId>features-bom</artifactId>
35+
<version>RELEASE</version>
36+
<type>pom</type>
37+
<scope>import</scope>
38+
</dependency>
39+
</dependencies>
40+
</dependencyManagement>
41+
42+
<dependencies>
43+
<!-- Open Liberty features -->
44+
<dependency>
45+
<groupId>io.openliberty.features</groupId>
46+
<artifactId>jaxrs-2.1</artifactId>
47+
<type>esa</type>
48+
<scope>provided</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>io.openliberty.features</groupId>
52+
<artifactId>jsonp-1.1</artifactId>
53+
<type>esa</type>
54+
<scope>provided</scope>
55+
</dependency>
56+
</dependencies>
57+
58+
<build>
59+
<plugins>
60+
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
62+
<artifactId>maven-war-plugin</artifactId>
63+
<version>3.2.2</version>
64+
<configuration>
65+
<failOnMissingWebXml>false</failOnMissingWebXml>
66+
<packagingExcludes>pom.xml</packagingExcludes>
67+
</configuration>
68+
</plugin>
69+
<!-- Enable liberty-maven plugin -->
70+
<plugin>
71+
<groupId>net.wasdev.wlp.maven.plugins</groupId>
72+
<artifactId>liberty-maven-plugin</artifactId>
73+
<configuration>
74+
<assemblyArtifact>
75+
<groupId>io.openliberty</groupId>
76+
<artifactId>openliberty-runtime</artifactId>
77+
<version>RELEASE</version>
78+
<type>zip</type>
79+
</assemblyArtifact>
80+
<configFile>src/main/liberty/config/server.xml</configFile>
81+
<packageFile>${package.file}</packageFile>
82+
<include>${packaging.type}</include>
83+
<bootstrapProperties>
84+
<default.http.port>${testServerHttpPort}</default.http.port>
85+
<default.https.port>${testServerHttpsPort}</default.https.port>
86+
</bootstrapProperties>
87+
</configuration>
88+
<executions>
89+
<!-- Package server -->
90+
<execution>
91+
<id>package-server</id>
92+
<configuration>
93+
<outputDirectory>target/wlp-package</outputDirectory>
94+
</configuration>
95+
</execution>
96+
<!-- Install the app via loose config -->
97+
<execution>
98+
<id>install-apps</id>
99+
<configuration>
100+
<looseApplication>true</looseApplication>
101+
<stripVersion>true</stripVersion>
102+
<installAppPackages>project</installAppPackages>
103+
</configuration>
104+
</execution>
105+
</executions>
106+
</plugin>
107+
<plugin>
108+
<groupId>com.github.eirslett</groupId>
109+
<artifactId>frontend-maven-plugin</artifactId>
110+
<version>1.7.6</version>
111+
<configuration>
112+
<workingDirectory>src/main/frontend</workingDirectory>
113+
</configuration>
114+
115+
<executions>
116+
117+
<execution>
118+
<id>install node and npm</id>
119+
<goals>
120+
<goal>install-node-and-npm</goal>
121+
</goals>
122+
<configuration>
123+
<nodeVersion>v10.15.3</nodeVersion>
124+
<npmVersion>6.4.1</npmVersion>
125+
</configuration>
126+
</execution>
127+
128+
<execution>
129+
<id>npm install</id>
130+
<goals>
131+
<goal>npm</goal>
132+
</goals>
133+
<!-- Optional configuration which provides for running any npm command -->
134+
<configuration>
135+
<arguments>install</arguments>
136+
</configuration>
137+
</execution>
138+
139+
<execution>
140+
<id>npm run build</id>
141+
<goals>
142+
<goal>npm</goal>
143+
</goals>
144+
<configuration>
145+
<arguments>run build</arguments>
146+
</configuration>
147+
</execution>
148+
149+
</executions>
150+
</plugin>
151+
</plugins>
152+
</build>
153+
</project>

‎finish/src/main/frontend/.editorconfig‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Editor configuration, see https://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
max_line_length = off
13+
trim_trailing_whitespace = false

‎finish/src/main/frontend/.gitignore‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# See http://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# compiled output
4+
/dist
5+
/tmp
6+
/out-tsc
7+
# Only exists if Bazel was run
8+
/bazel-out
9+
10+
# dependencies
11+
/node_modules
12+
13+
# profiling files
14+
chrome-profiler-events.json
15+
speed-measure-plugin.json
16+
17+
# IDEs and editors
18+
/.idea
19+
.project
20+
.classpath
21+
.c9/
22+
*.launch
23+
.settings/
24+
*.sublime-workspace
25+
26+
# IDE - VSCode
27+
.vscode/*
28+
!.vscode/settings.json
29+
!.vscode/tasks.json
30+
!.vscode/launch.json
31+
!.vscode/extensions.json
32+
.history/*
33+
34+
# misc
35+
/.sass-cache
36+
/connect.lock
37+
/coverage
38+
/libpeerconnection.log
39+
npm-debug.log
40+
yarn-error.log
41+
testem.log
42+
/typings
43+
44+
# System Files
45+
.DS_Store
46+
Thumbs.db

‎finish/src/main/frontend/README.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Frontend
2+
3+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.8.
4+
5+
## Development server
6+
7+
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.
8+
9+
## Code scaffolding
10+
11+
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`.
12+
13+
## Build
14+
15+
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.
16+
17+
## Running unit tests
18+
19+
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
20+
21+
## Running end-to-end tests
22+
23+
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
24+
25+
## Further help
26+
27+
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).

0 commit comments

Comments
 (0)