Skip to content

Commit 31451ef

Browse files
author
Michael Wunderlich
committed
Merge branch 'master' into sql
Conflicts: public/index.html
2 parents 5ac1231 + 9d237d5 commit 31451ef

13 files changed

Lines changed: 61 additions & 27 deletions

‎README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ Scorekeep is a RESTful web API implemented in Java that uses Spring to provide a
33

44
The project shows the use of Spring, Angular, nginx, the AWS SDK for Java, DynamoDB, Gradle, CORS, and Elastic Beanstalk features that let you run both components on the same EC2 instance, create required DynamoDB tables as part of the Elastic Beanstalk environment, and build the API from source on-instance during deployment.
55

6+
**Branches**
7+
- [`cognito`](https://github.com/awslabs/eb-java-scorekeep/tree/cognito) - Support login and store users in a Cognito user pool.
8+
- [`lambda`](https://github.com/awslabs/eb-java-scorekeep/tree/lambda) - Call a Lambda function to generate random names.
9+
- [`sql`](https://github.com/awslabs/eb-java-scorekeep/tree/sql) - Use JDBC to store game histories in an attached PostgreSQL database instance.
10+
- [`xray`](https://github.com/awslabs/eb-java-scorekeep/tree/xray) - Use the AWS X-Ray SDK to instrument incoming requests, SDK clients, SQL queries, HTTP clients, and sections of code.
11+
- [`xray-gettingstarted`](https://github.com/awslabs/eb-java-scorekeep/tree/xray-gettingstarted) - Use the AWS X-Ray to instrument incoming requests and SDK clients (no additional configuration required).
12+
613
Use the procedures in the following sections to run the project on AWS Elastic Beanstalk and configure it for local testing and development.
714

815
## Create an AWS Elastic Beanstalk environment

public/app/gameCollection.js renamed to public/app/game-collection.js

File renamed without changes.

public/app/gameController.js renamed to public/app/game-controller.js

File renamed without changes.

public/app/gamesController.js renamed to public/app/games-controller.js

File renamed without changes.

public/app/mainController.js renamed to public/app/main-controller.js

File renamed without changes.

public/app/sessionCollection.js renamed to public/app/session-collection.js

File renamed without changes.

public/app/sessionController.js renamed to public/app/session-controller.js

File renamed without changes.

public/app/sessionsController.js renamed to public/app/sessions-controller.js

File renamed without changes.

public/app/userCollection.js renamed to public/app/user-collection.js

File renamed without changes.

public/app/userController.js renamed to public/app/user-controller.js

File renamed without changes.

0 commit comments

Comments
 (0)