Community
Participate
Working Groups
This function was added as a fix to OSGi bug 1617 in the OSGi web container git repo (git@git.springsource.org:osgi-web-container/osgi-web-container.git) under commit 995cabf8b306c2fe977deadfbe37cf4da7fbed58, but no integration test was added. Recently bug 329566 is being fixed which looks very unlikely to regress this function, but it would be good to include an integration test for future reference since we do not run the OSGi web applications compliance test suite, which belongs to the OSGi Alliance, against Gemini Web. Flagging this bug as "helpwanted" as it is unlikely to be implemented by the current committers any time soon and it is an easy introduction to integration testing on Gemini Web.
(In reply to comment #0) > Flagging this bug as "helpwanted" as it is unlikely to be implemented by the > current committers any time soon and it is an easy introduction to integration > testing on Gemini Web. Hi Glyn, I can prepare an integration test if you don't mind? 10x Violeta
That would be great. Thanks!
Created attachment 182968 [details] Integration test for supplying web.xml in a fragment Hi Glyn, I'm attaching a patch with an integration test that covers this scenario. Could you please comment on it? 10x Violeta
Thanks Violeta! Please would you confirm that you wrote 100% of the patch and that you have the right to contribute it to Eclipse.
I couldn't apply the patch. git apply gave the message: error: cannot apply binary patch to 'org.eclipse.gemini.web.test/src/test/resources/fragment-provides-web-xml.jar' without full index line error: org.eclipse.gemini.web.test/src/test/resources/fragment-provides-web-xml.jar: patch does not apply error: cannot apply binary patch to 'org.eclipse.gemini.web.test/src/test/resources/war-with-web-xml-from-fragment.war' without full index line error: org.eclipse.gemini.web.test/src/test/resources/war-with-web-xml-from-fragment.war: patch does not apply It seems the trouble is because new binary archives were added but were not captured by the patch. In fact, the policy in Gemini Web is to build the test archives from source on each build (see the build target build-test-apps). So please could you rework the patch to include the test archive source code so they will be built automatically. Thanks and apologies for not noticing this earlier.
Created attachment 183453 [details] Integration test for supplying web.xml in a fragment Hi Glyn, Here is the reworked patch. Hope this time everything is OK. I confirm that I wrote 100% of the patch and that I have the right to contribute it to Eclipse. Regards Violeta
Excellent! Thanks. Patch applied, tested, committed, and pushed.