-
Notifications
You must be signed in to change notification settings - Fork 1
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
base: WS
Are you sure you want to change the base?
Conversation
… in order to bring Generator and GeneratorWS in master, will then continue Rest in this current branch (PM2-Post-Soap-Fixes)
…s dialog when running from web service
REST Wrapper for the Generator Java Client to make REST request to the generator Javascript client to make REST requests to the generator
@Mchapuis -- the conflicts listed can be resolved online here on GitHub by editing them out; err on the side of inclusion. |
I fixed the conflicts. I still need to update the README for this service tomorrow. |
@Mchapuis -- are we still waiting for the README here? |
This reverts commit e379f82.
e379f82
to
c315abe
Compare
1- I reverted the merge from ws in case this was creating issues ( I was seeing changes in my branch ) |
** I just realized that I am creating a new commit when I resolve conflicts. I can see a new commit called |
There was a problem hiding this 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?
The full documentation has been pushed to bitbucket. I hope this will answer your questions. |
This is the original branch for the REST service. This branch is only for PM2 part 3.