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.

Sign up for GitHub

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

Jump to bottom

Fix osgi service viewer issue, added copy actions on build.xml (only OSGi-Version) #1561

Merged
merged 5 commits into from
Feb 4, 2024
Merged

Fix osgi service viewer issue, added copy actions on build.xml (only OSGi-Version) #1561

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36d8754
changing of the copy actions to WEB-INF\lib-folder (#1560)
speckyspooky Feb 4, 2024
664dc66
remove the comments of the change
speckyspooky Feb 4, 2024
154ffad
Changed orbit to get soap 1.3.0 instead of 1.2.0
speckyspooky Feb 4, 2024
bbdc1a0
reset the change into orbit_bundles.map
speckyspooky Feb 4, 2024
b7a1926
Added to get the libraries of the soap directory to the lib-folder
speckyspooky Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions build/birt-packages/birt-runtime-osgi/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,11 @@
<include name="org.apache.axis_*.jar"/>
<include name="org.apache.commons.discovery_*.jar"/>
<include name="jakarta.inject.jakarta.inject-api_*.jar"/>
<include name="javax.xml.soap_*.jar"/>
</fileset>
<fileset dir="${REPOSITORY_DIR}/plugins">
<include name="javax.xml.soap_*.jar"/>
</fileset>
<fileset dir="${ENGINE_DIR}/platform/plugins/javax.xml.soap_*/lib">
<include name="saaj*.jar"/>
</fileset>
<!--
<fileset dir="${DESIGNER_DIR}/plugins">
<include name="org.apache.commons.logging_*.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion releng/maps/orbit_bundles.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugin@javax.xml,1.3.4=GET,http://download.eclipse.org/tools/orbit/downloads/dro

plugin@javax.xml.rpc,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/plugins/javax.xml.rpc_1.1.0.v201209140446.jar,unpack=true,usetimestamp=true

plugin@javax.xml.soap,1.2.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/plugins/javax.xml.soap_1.2.0.v201005080501.jar,unpack=true,usetimestamp=true
plugin@javax.xml.soap,1.3.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/plugins/javax.xml.soap_1.3.0.v201105210645.jar,unpack=true,usetimestamp=true
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI, I can find no reference to this file. I'm doubtful this is used in the build. I can find these in the workspace (in target folders produced by the Tycho build):

image

That's also what's in the target platform:

image

So it's not clear if this change has any impact at all. I doubt it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Of course I think I will haven't an effect. The problem is that we need the version 1.3.0 in the lib-folder or the saaj.jar.
But the first try with saaj.jar crashed, the next try crashed at this moment to.

How can we get 1.3.0 or saaj.jar to the lib-folder?

Habe you an idea?

Copy link
Contributor

Choose a reason for hiding this comment

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

I see it here:

image

It looks like it's already in the lib folder...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It should be but in the latest build it isn't there for the OSGi-version.
(The standard-runtime has all libraries in the lib-folder and that is why it is running.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Have you and idea why the run was cancelled there is no reason listed at the log file.

plugins/org.apache.axis_1.4.0.v201411182030.jar,unpack=true,usetimestamp=true

plugin@org.apache.batik.anim,1.14.0=GET,https://download.eclipse.org/tools/orbit/downloads/drops2/R20210602031627/repository/plugins/org.apache.batik.anim_1.14.0.v20210324-0332.jar,usetimestamp=true
Expand Down
Loading