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

Issue #1447 without osgi layer #1462

Merged

Conversation

claesrosell
Copy link
Contributor

No description provided.

@merks
Copy link
Contributor

merks commented Oct 27, 2023

That looks like a lot of work!

@claesrosell claesrosell changed the title Issue 1447 without osgi layer Issue #1447 without osgi layer Oct 28, 2023
@claesrosell
Copy link
Contributor Author

With this latest rebase against master I should be able to test the builds against Linux and Windows. Probably there will be runtime issues but hopefully not. It would be nice with at least one unit test for the webviewer.

@speckyspooky speckyspooky added this to the 4.14 milestone Oct 28, 2023
@speckyspooky speckyspooky added the Dependencies Pull requests that update a dependency file label Oct 28, 2023
@speckyspooky
Copy link
Contributor

I cross the fingers that your changes will be stable, according to Ed it seems to be more like a small change and needed time to get it running.
If it is stable we and after the merge to the master I can do my specific designer tests for the special image tests (backgraound & svg) and alos ome special Excel-file tests with the diagonals and so on.

@merks
Copy link
Contributor

merks commented Oct 28, 2023

Yes, I'm eagerly awaiting this being merged so that we can iron out any wrinkles that may remain.

@speckyspooky
Copy link
Contributor

It's a little bit like "christmas time"

The web.xml descriptor is modified during build by the JSP pre compiler.
We use the web-viewer.xml now instead
@claesrosell claesrosell marked this pull request as ready for review October 29, 2023 14:03
@claesrosell
Copy link
Contributor Author

claesrosell commented Oct 29, 2023

I have tested the "all in one" builds for Linux and Windows and the WebViewer works for them.

@wimjongman , this is a architectural change in some regard. Before we had two different solutions. One that used the OSGI default HTTP-service and one that started a dedicated server. The dedicated server was a mix of an OSGI web-bundle and programmatically configured WebAppContext. Only the second solution was used.

This commit replaces both solutions with a solution that is more "Jetty". To work in an OSGI environment some classloader configuration needs to be done + some stuff to for bundleresourse scheme to work.

Copy link
Contributor

@wimjongman wimjongman left a comment

Choose a reason for hiding this comment

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

Looks great. Thanks Claes!

@claesrosell claesrosell merged commit 797343d into eclipse-birt:master Oct 30, 2023
3 checks passed
@claesrosell claesrosell deleted the issue-1447-without-osgi-layer branch October 30, 2023 09:50
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rcp.configuration.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000"/>
<unit id="org.eclipse.search.core" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.30-I-builds"/>

Choose a reason for hiding this comment

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

@claesrosell i it possible to replace such short-living repositories with long-living, at least on releasing?
Now in BIRT release 4.14.0 stands short-living non-existent eclipse platform. After replacing with long-living eclipse platform repository project does not assemble. Version 4.14.0 cannot be modified, also with minor changes.
The same thing can acquire with future release 4.15.0 -- now in master stands also short-living repository

@merks
Copy link
Contributor

merks commented Feb 13, 2024

Are you doing your own builds against older tags/branches?

This file is generated and many of the locations are moving targets that might later cause build failure. This is the only one that is literally deleted though. So I suppose you are asking that all the locations refer to permanent stable locations before the final release commit?

@bvfalcon
Copy link

Are you doing your own builds against older tags/branches?
So I suppose you are asking that all the locations refer to permanent stable locations before the final release commit?

On both questions -- yes :)

Git-tags are very useful to create branches and usually are used for it -- fix bugs and customize something. May be this is the meaning of git-tags, I don't know. But in this case tag 4.14.0 contains link to non-existing eclipse platform repository (possible, night-build). The nearest release eclipse repository (4.30) does not contains some artifacts, which are used in BIRT config files (org.mortbay.jasper.apache-el as example). Therefore, it is impossible now to fix bugs in 4.14.0 and make a fork for it.

I think, it is very difficult to fix this problem for 4.14.0, but this problem can be prevented for future releases. May be with usage of maven-enforcer rules or something similar.

@merks
Copy link
Contributor

merks commented Feb 15, 2024

Generally anything you change and for which a new build will be done will be on the master branch. There are no maintenance releases from the project. Note that the bundle org.mortbay.jasper.apache-el you mention comes from Orbit, not from the Platform.

Effectively all of these are moving targets, that you're asking us to lock down for you so that you can do builds using those.

      <repository location="https://download.eclipse.org/cbi/updates/license"/>
      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
      <repository location="https://download.eclipse.org/oomph/simrel-orbit-legacy/milestone/latest"/>
      <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/latest"/>
      <repository location="https://download.eclipse.org/datatools/updates/milestone/latest"/>
      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
      <repository location="https://download.eclipse.org/tools/gef/classic/releases/latest"/>
      <repository location="https://download.eclipse.org/webtools/repository/latest"/>
      <repository location="https://download.eclipse.org/justj/epp/release/latest"/>
      <repository location="https://download.eclipse.org/justj/jres/17/updates/release/latest"/>
      <repository location="https://download.eclipse.org/eclipse/updates/4.31-I-builds"/

What you're asking for it a fair bit of overhead during the release process and then isn't something the project team itself uses. So yes it's possible to do, but it's yet more work for us (me)...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants