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

PM2 - REST service - second PR #9

Open
wants to merge 8 commits into
base: WS
Choose a base branch
from

Conversation

Mchapuis
Copy link

@Mchapuis Mchapuis commented Apr 3, 2018

This is the original branch for the REST service. This branch is only for PM2 part 3.

Jonathan added 5 commits March 19, 2018 21:29
… in order to bring Generator and GeneratorWS in master, will then continue Rest in this current branch (PM2-Post-Soap-Fixes)
REST Wrapper for the Generator
Java Client to make REST request to the generator
Javascript client to make REST requests to the generator
@jashanj0tsingh
Copy link

@Mchapuis Thank you for the second PR, however we are still at square one. You will need to resolve the conflicts at some point before I can merge them after review. @smokhov

@smokhov
Copy link
Member

smokhov commented Apr 4, 2018

@Mchapuis -- the conflicts listed can be resolved online here on GitHub by editing them out; err on the side of inclusion.

@Mchapuis
Copy link
Author

Mchapuis commented Apr 4, 2018

I fixed the conflicts. I still need to update the README for this service tomorrow.

@smokhov
Copy link
Member

smokhov commented Apr 9, 2018

@Mchapuis -- are we still waiting for the README here?

@Mchapuis Mchapuis force-pushed the PM2-Post-Soap-Fixes branch from e379f82 to c315abe Compare April 9, 2018 18:30
@Mchapuis
Copy link
Author

Mchapuis commented Apr 9, 2018

1- I reverted the merge from ws in case this was creating issues ( I was seeing changes in my branch )
2- I fixed the conflicts with the base branch ( similar fixes than last time )
3- Updated the README for REST

@Mchapuis
Copy link
Author

Mchapuis commented Apr 9, 2018

** I just realized that I am creating a new commit when I resolve conflicts. I can see a new commit called Merge branch WS into PM2- Post-Soap-Fixes .**

Copy link

@jashanj0tsingh jashanj0tsingh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am still unable to deploy this pull request locally. It will help if the README can be more elaborate. I tried to locally test this pull request, builds fine but won't deploy. Can you share some specs like the GlassFish version, port numbers and some similar steps/hacks that you have on yourlocal machines which can help resolve this issue?

@Mchapuis
Copy link
Author

The full documentation has been pushed to bitbucket. I hope this will answer your questions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants