WIP: Updated adaptors to be based on 4.0.0-SNAPSHOT (Jax-rs2.0) #24

jadelkhoury · 2019-03-18T13:21:00Z

This branch is based on the latest changes in LyoDesigner 4.0.0-SNAPSHOT ( and hence Jax-rs2.0)

I think the master branch should still be based on the released 2.4.0, but we do need this branch as long as we have not released 4.0.0 - at the least.

This change is

jadelkhoury · 2019-03-18T13:24:36Z

@berezovskyi @jamsden
Can you please help me with the review of the pom.xml files at the least?

I would like the pom.xml files to be as neat and minimal as possible, since I can then use them as basis to update our instructions on Wiki on how to create servers/clients in general.
Notes:

There is a new dependencyManagement part, which might be a hack to make Swagger 1.5 work together with Jersey 2.27.) Is there a better way to do it?
I could not get the code to work on the latest Jersey 2.28. Only 2.27
Any thing else i missed?

The 2 adaptors work fine. THey also include client code.

adaptor-rm-webapp/pom.xml

berezovskyi · 2019-03-19T19:34:25Z

looks good overall, so I have approved. but please see the comments inside.

jadelkhoury · 2019-03-27T18:43:10Z

@berezovskyi Please have a look at my new patch to see if it is what you had in mind.

adaptor-rm-webapp/pom.xml

berezovskyi · 2019-03-28T07:58:32Z

None of those dependencies are shipped with Lyo releases, no need to CQ them.

-- /Andrew (from phone) 28 mars 2019 kl. 07:51 skrev Jad El-khoury <[email protected]<mailto:[email protected]>>: @jadelkhoury commented on this pull request.

________________________________ In adaptor-rm-webapp/pom.xml<#24 (comment)>:

@@ -88,11 +90,6 @@

<artifactId>jersey-container-servlet</artifactId> <version>${version.jersey}</version> </dependency> - <dependency> The earliest version of jersey-hk2 is 2.26. Code runs fine without it if we use 2.25. But now I realize we have a bigger problem. We will need CQs if we go for Jersey 2.25, since Jersey was migrated to Eclipse in 2.27. And that also made me think that we did NOT file a CQ for Swagger. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#24 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AAD83mvPZevmtPF2dCDoWKToWgsQ_fnrks5vbGZigaJpZM4b5wy9>.

jadelkhoury · 2019-03-28T13:28:27Z

We will not merge this branch into master until 4.0.0 is released.
Master is based on 2.4.0.

berezovskyi · 2019-03-28T14:20:37Z

Sounds good to me.

…

-- –Andrew. 2019-03-28 kl. 14:28 skrev Jad El-khoury <[email protected]<mailto:[email protected]>>: We will not merge this branch into master until 4.0.0 is released. Master is based on 2.4.0. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#24 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AAD83uC5Wn-GfjH_Hwk9FP_34sgznP2Rks5vbMN7gaJpZM4b5wy9>.

methods.

Signed-off-by: Andrew Berezovskyi <[email protected]>

berezovskyi · 2019-04-27T00:22:11Z

client needs to be updated.

berezovskyi · 2019-04-27T14:51:19Z

This branch has diverged from master and has merge conflicts. I have resolved most of them but there is a conflict in the AIRD file, which is super tricky:

berezovskyi · 2019-04-27T14:54:48Z

I have merged the AIRD from master in this case.

berezovskyi · 2019-04-27T14:56:53Z

Just ignore it, I was touching the wrong branch.

Signed-off-by: Andrew Berezovskyi <[email protected]>

berezovskyi · 2019-04-27T15:05:38Z

@jadelkhoury I have switched the code to use OSLC4J Client so that the build stops failing but this needs to be done in LyoD: dcb169a

jadelkhoury · 2019-04-30T18:57:59Z

I am concerned about all changes done on this branch since a401172

Changes to generated code should be avoided, since the main point of this project is to demonstrated generated code. We need to avoid manual changes (such as those done on the client).
Changes to the non-generated parts of the code should be captured in our instructions http://oslc.github.io/developing-oslc-applications/eclipse_lyo/setup-an-oslc-provider-consumer-application.html
I'd be very very careful when merging AIRD files. (that is avoid.) THere is no point merging from master either. Master is meant to be for code modelled/generated from 2.4.0. THis branch is from 4.0.0. Naturally, they are to diverse.

Signed-off-by: Andrew Berezovskyi <[email protected]>

Generating working code based on latest LyoDesigner 4.0-SNAPSHOT. Reintroducing package imports that were removed in previous commits.

berezovskyi · 2019-07-27T14:01:42Z

Do you want to drag this branch all the way till the 4.0 is released? Or shall we merge it soon?

jadelkhoury · 2019-07-27T20:43:14Z

Do you want to drag this branch all the way till the 4.0 is released? Or shall we merge it soon?

My thought is that we wait until 4.0 is released.

…ptor. (#45) * Introducing Creation Dialog and complete CRUD functions on the rm-adaptor. Also, modifying the way the rm-adpator resources are randomly generated. * Update of jsp pages.

opened by older versions of Lyo.

berezovskyi · 2020-03-06T09:09:26Z

Do you need any help resolving merge conflicts or with anything else in this PR?

jadelkhoury · 2020-03-06T09:32:13Z

Do you need any help resolving merge conflicts or with anything else in this PR?

Most likely. my thought is that we move this into master, once we release LyoDesigner 4.0.0, which I hope we can do soon.
So first step is to release 4.0.0.

Plus, now using WebServices for the CRUD methods.

berezovskyi · 2020-11-09T19:49:34Z

I suggest to keep this as a sample JAX-RS 1.1 implementation instead of merging this and then deprecating in favour of OSLC 2020 refimpl

jadelkhoury · 2020-11-09T21:17:03Z

@berezovskyi Your last comment doesn't make sense to me.
Please, let us discuss this repo before we make any chanfges to it.

berezovskyi · 2020-11-09T22:33:08Z

@jadelkhoury I based it on what you wrote actually in: oslc-op/refimpl#21 If we go that route, let's keep this repo as a valid 2.x Lyo sample code and follow your plan to make refimpl repo the Lyo 4.0 / JAX-RS 2.0 sample code.

jadelkhoury · 2020-11-09T22:39:45Z

It will take some time before we do oslc-op/refimpl#21. Until then, this repo is what I need to have.

If you want to do something on this repo, here's what I suggest (so we avoid all confusing once and for all):

We have two branches 2.4.0 & 4.0.0-SNAPSHOT. No master branch.
that is, either rename "master" into 2.4.0, or create a new branch from master to 2.4.0, and then kill the master branch.

berezovskyi · 2020-11-09T23:05:16Z

Ok, my plan is not to touch master (much) especially given that no 2.x lyo releases are planned to come.

I can rename master into main-2.x and this branch into main-4.x (maybe there will be updates to this repo when 4.1 comes out?)

We can then close this PR as there is no reason to merge it anywhere and I can make main-4.x to be the main branch on Github.

jadelkhoury · 2020-11-09T23:17:01Z

Yes to all in last proposal. thanks @berezovskyi

berezovskyi · 2020-11-09T23:45:00Z

@jadelkhoury done. please delete outdated branches from https://github.com/OSLC/lyo-adaptor-sample-modelling/branches/stale if possible

Updated adaptors to be based on 4.0.0-SNAPSHOT (Jax-rs2.0)

4decf27

jadelkhoury requested review from berezovskyi and jamsden March 18, 2019 13:21

berezovskyi approved these changes Mar 19, 2019

View reviewed changes

adaptor-rm-webapp/pom.xml Outdated Show resolved Hide resolved

Update Jersey version to match that supported by Swagger 1.5.

991d2e3

berezovskyi reviewed Mar 27, 2019

View reviewed changes

adaptor-rm-webapp/pom.xml Show resolved Hide resolved

jadelkhoury self-assigned this Mar 28, 2019

jadelkhoury and others added 2 commits April 8, 2019 22:53

update of the jsp pages to no longer rely on the removed toHtml() (#29)

7915472

methods.

Update logging

02b9702

Signed-off-by: Andrew Berezovskyi <[email protected]>

Fix client imports

a401172

berezovskyi mentioned this pull request Apr 27, 2019

Switch Travis config to OpenJDK #32

Merged

berezovskyi added 3 commits April 27, 2019 16:58

Merge branch 'master' into 4.0.0-snapshot

b9d9719

Update Jetty

39523d9

Signed-off-by: Andrew Berezovskyi <[email protected]>

Use new OSLC4J Client

dcb169a

Signed-off-by: Andrew Berezovskyi <[email protected]>

Merge branch 'master' into 4.0.0-snapshot

12b022a

jadelkhoury and others added 3 commits May 9, 2019 21:13

Update based on latest LyoDesigner 4.0.0-snapshot

0d8639a

Use latest Jetty server

f617777

Signed-off-by: Andrew Berezovskyi <[email protected]>

Update

ac4a0ba

Signed-off-by: Andrew Berezovskyi <[email protected]>

closes #35 - Testing adaptor uses old client

d0a8040

Generating working code based on latest LyoDesigner 4.0-SNAPSHOT. Reintroducing package imports that were removed in previous commits.

Introducing Creation Dialog and complete CRUD functions on the rm-ada…

0224acc

…ptor. (#45) * Introducing Creation Dialog and complete CRUD functions on the rm-adaptor. Also, modifying the way the rm-adpator resources are randomly generated. * Update of jsp pages.

berezovskyi changed the title ~~Updated adaptors to be based on 4.0.0-SNAPSHOT (Jax-rs2.0)~~ WIP: Updated adaptors to be based on 4.0.0-SNAPSHOT (Jax-rs2.0) Dec 8, 2019

jadelkhoury added 3 commits January 22, 2020 22:19

reverting a an earlier version of Sirius to make sure model can be

90f9692

opened by older versions of Lyo.

Generating code based on latest LyoDesigner templates.

75000dd

Updating adaptors to latest LyoGen

e8d4d64

jadelkhoury added 6 commits March 19, 2020 16:42

Updating based on latest edge version of Lyo Designer.

a50366d

Adding a sample client-only adaptor.

ad7f7a7

removing unecessary "throws exceptions" that are not actually called.

c417450

Update to latest version of Lyo Designer generation.

734aeb4

An update of both adaptors to be based on latest lyoDesigner.

c89a362

Plus, now using WebServices for the CRUD methods.

TRS support for adaptor-rm

573b99c

berezovskyi mentioned this pull request Nov 9, 2020

Bump junit from 3.8.1 to 4.13.1 in /adaptor-rm-webapp #58

Merged

berezovskyi closed this Nov 9, 2020

berezovskyi deleted the 4.0.0-snapshot branch November 9, 2020 23:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: Updated adaptors to be based on 4.0.0-SNAPSHOT (Jax-rs2.0) #24

WIP: Updated adaptors to be based on 4.0.0-SNAPSHOT (Jax-rs2.0) #24

jadelkhoury commented Mar 18, 2019 •

edited by berezovskyi

Loading

jadelkhoury commented Mar 18, 2019

berezovskyi commented Mar 19, 2019

jadelkhoury commented Mar 27, 2019

berezovskyi commented Mar 28, 2019 via email

jadelkhoury commented Mar 28, 2019

berezovskyi commented Mar 28, 2019 via email

berezovskyi commented Apr 27, 2019

berezovskyi commented Apr 27, 2019

berezovskyi commented Apr 27, 2019

berezovskyi commented Apr 27, 2019

berezovskyi commented Apr 27, 2019

jadelkhoury commented Apr 30, 2019

berezovskyi commented Jul 27, 2019

jadelkhoury commented Jul 27, 2019

berezovskyi commented Mar 6, 2020

jadelkhoury commented Mar 6, 2020

berezovskyi commented Nov 9, 2020

jadelkhoury commented Nov 9, 2020

berezovskyi commented Nov 9, 2020

jadelkhoury commented Nov 9, 2020

berezovskyi commented Nov 9, 2020 •

edited

Loading

jadelkhoury commented Nov 9, 2020

berezovskyi commented Nov 9, 2020

WIP: Updated adaptors to be based on 4.0.0-SNAPSHOT (Jax-rs2.0) #24

WIP: Updated adaptors to be based on 4.0.0-SNAPSHOT (Jax-rs2.0) #24

Conversation

jadelkhoury commented Mar 18, 2019 • edited by berezovskyi Loading

jadelkhoury commented Mar 18, 2019

berezovskyi commented Mar 19, 2019

jadelkhoury commented Mar 27, 2019

berezovskyi commented Mar 28, 2019 via email

jadelkhoury commented Mar 28, 2019

berezovskyi commented Mar 28, 2019 via email

berezovskyi commented Apr 27, 2019

berezovskyi commented Apr 27, 2019

berezovskyi commented Apr 27, 2019

berezovskyi commented Apr 27, 2019

berezovskyi commented Apr 27, 2019

jadelkhoury commented Apr 30, 2019

berezovskyi commented Jul 27, 2019

jadelkhoury commented Jul 27, 2019

berezovskyi commented Mar 6, 2020

jadelkhoury commented Mar 6, 2020

berezovskyi commented Nov 9, 2020

jadelkhoury commented Nov 9, 2020

berezovskyi commented Nov 9, 2020

jadelkhoury commented Nov 9, 2020

berezovskyi commented Nov 9, 2020 • edited Loading

jadelkhoury commented Nov 9, 2020

berezovskyi commented Nov 9, 2020

jadelkhoury commented Mar 18, 2019 •

edited by berezovskyi

Loading

berezovskyi commented Nov 9, 2020 •

edited

Loading