Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 248793

Summary: [plan] Update to the latest Jetty release
Product: [Eclipse Project] Equinox Reporter: Jeff McAffer <jeffmcaffer>
Component: Server-SideAssignee: Kim Moir <kim.moir>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P4 CC: caniszczyk, cgold, gunnar, jeffmcaffer, kim.moir, simon_kaegi, tjwatson
Version: 3.5Keywords: plan
Target Milestone: 3.5 M4   
Hardware: PC   
OS: Windows Vista   
Whiteboard:
Bug Depends on: 257761    
Bug Blocks:    
Attachments:
Description Flags
patch
none
patch
none
patch none

Description Jeff McAffer CLA 2008-09-26 17:48:33 EDT
Equinox currently hosts both a Jetty 5.1 and Jetty 6.1 based version of the Http Service. For this release we intend to include the latest version of Jetty. In addition to being smaller, faster, and most importantly better supported, more recent versions add support for the latest servlet versions and improved support for communication patterns common to AJAX applications.
Comment 1 Simon Kaegi CLA 2008-10-25 14:01:13 EDT
Adding Chris as he wil be impacted by this. Tentatively marking for M4.
Comment 2 Simon Kaegi CLA 2008-12-02 10:52:03 EST
Adding Kim as she's the one who can help here...

Looking at the help feature we need to do the following changes:

Orbit:
1) Change the version of javax.servlet we're using from 2.4 to 2.5
2) Remove org.mortbay.jetty 5.1.14 and replace it with:
  org.mortbay.jetty.server, org.mortbay.jetty.util 6.1.7

Equinox:
1) Change the version of org.eclipse.equinox.http.jetty from 1.1 to 2.0

---
All of the new versions of the components are already being built so it should just be a matter of changing the references in the feature (hopefully).
Comment 3 Thomas Watson CLA 2008-12-02 11:12:12 EST
Are we OK with bumping versions in such a way to indicate API breakage?

Orbit:
1) Change the version of javax.servlet we're using from 2.4 to 2.5
2) Remove org.mortbay.jetty 5.1.14 and replace it with:
  org.mortbay.jetty.server, org.mortbay.jetty.util 6.1.7

Equinox:
1) Change the version of org.eclipse.equinox.http.jetty from 1.1 to 2.0

All of these version changes indicate API breakages.
Comment 4 Simon Kaegi CLA 2008-12-02 12:03:25 EST
We'll need to put out a note on the mailing list but I'm not expecting any problems.

Servlet API:
--
2.5 is backwards compatable with Servlet 2.4. In addition we've been in a situation where we've needed to support 2.5 already since WTP adds it into the mix.

Jetty:
--
Anyone explicitly depending on the older Jetty bundles will no longer be able to rely on the platform packaging them however if need be they can add them into their own features as these bundles are not singeltons.

org.eclipse.equinox.http.jetty:
--
Just the bundle-version is being bumped. We are not bumping the versions on any of the exported packages as this new version is API consistent. I'll be sure to add a note as potentially anyone using require-bundle with a version range instead of importing packages would need to bump. All uses by Eclipse teams I'm aware either use Import-Package or do not restrict versions.
Comment 5 Kim Moir CLA 2008-12-02 14:19:43 EST
Simon, 

Right now we have javax.servlet 2.4 and 2.5.0 in the build.  2.4 is in the help feature.  2.5 and 2.4 are on the equinox dl page.  So I assume we will remove 2.4 completely and only include 2.5 in the build?
Comment 6 Simon Kaegi CLA 2008-12-02 14:28:29 EST
We no longer need Servlet 2.4 in the platform but we still need to use it for the equinox build for old http.jetty bundle as well as the legacy org.eclipse.equinox.http bundle.
Comment 7 Kim Moir CLA 2008-12-02 15:43:40 EST
Created attachment 119315 [details]
patch

Please review the patch, I'll release it once we are finished with the i-build this week.
Comment 8 Simon Kaegi CLA 2008-12-02 16:14:41 EST
Is that the right patch?
It looks like something to do with derby or ...
Comment 9 Kim Moir CLA 2008-12-02 16:19:02 EST
Created attachment 119320 [details]
patch

sorry I attached the wrong patch.
Comment 10 Simon Kaegi CLA 2008-12-03 13:17:51 EST
Looks good.
I don't think we need changes in the map files since this is already getting built. Correct?
Comment 11 Kim Moir CLA 2008-12-04 16:46:27 EST
right, no changes to the map.  It was mentioned in the arch call that a note was going out to the community about this change.  Is this bug still a M4 target?
Comment 12 Kim Moir CLA 2008-12-04 17:00:39 EST
Simon has indicated that this is still a m4 target, will run a test build.
Comment 13 Kim Moir CLA 2008-12-05 15:10:47 EST
I had to revert this change.  Andrew and I discovered a bug in pde build where the source bundles are note created in unique directories at runtime.  So the source bundles for the new org.eclipse.equinox.jetty_2.0.0 is not created and the director cannot provision the bundle and create any of the zips in the build. see bug 257761
Comment 14 Kim Moir CLA 2008-12-05 17:19:01 EST
I released the new pde build to the builder and will run another test build tomorrow.  Simon, I'll add the url of the test build to this bug once it's ready. Please verify once it is available so that I can tag for the I-build on Sunday night.
Comment 16 Simon Kaegi CLA 2008-12-06 14:38:50 EST
Thanks Kim. I've verified and it's all good. I'll re-assign to you to mark fixed when you commit your changes.
Comment 17 Kim Moir CLA 2008-12-06 16:06:48 EST
tagged help feature for i-build.
Comment 18 Kim Moir CLA 2008-12-10 11:06:27 EST
Created attachment 120064 [details]
patch

The sdk feature was generating the source bundle for the old jetty bundle.  This has been released and tagged for the next build.
Comment 19 Kim Moir CLA 2008-12-10 19:28:09 EST
verified that the source bundles now appear correctly in the I20081210-1300 build
-bash-3.00$ unzip -l eclipse-SDK-I20081210-1300-win32.zip | grep jetty
    13394  12-10-08 18:11   eclipse/plugins/org.eclipse.equinox.http.jetty.source_2.0.0.v20080425.jar
   123205  12-10-08 18:12   eclipse/plugins/org.mortbay.jetty.util.source_6.1.7.v200806031612.jar
   372249  12-10-08 18:12   eclipse/plugins/org.mortbay.jetty.server.source_6.1.7.v200806031612.jar
   165415  12-10-08 18:12   eclipse/plugins/org.mortbay.jetty.util_6.1.7.v200806031612.jar
    18643  12-10-08 18:11   eclipse/plugins/org.eclipse.equinox.http.jetty_2.0.0.v20080425.jar
   513795  12-10-08 18:12   eclipse/plugins/org.mortbay.jetty.server_6.1.7.v200806031612.jar