View Source

Some of the information below is outdated, as modifications to the proposed structure were made in the course of the refactoring. For the most up-to-date information on the new package structure, as well as other changes, see the Jetty 7 Refactoring page. Note that this page describes the migration from codehaus Jetty 7 to Eclipse Jetty 7; the linked page describes migration from Jetty 6 to Eclipse Jetty 7.

Eclipse Maven Plan

key points for maven:

flat project structure, all artifacts lined up under jetty project, no project nesting planned initially
will retain the jetty-parent artifact which will be referenced as parent for jetty-contrib
jetty-contrib will remain at codehaus
potentially dropping jetty assembly at eclipse and instead managing that as a jetty distribution at codehaus as is done now, or roll that and hightide together into a more encompassing offering

SVN

jetty/jetty-parent-pom/trunk,tags,branches - o.e.jetty:jetty-parent used as parent for all jetty endeavors and linkage to jetty-contrib trunk development @ codehaus
jetty/jetty/trunk,tags,branches - jetty 7 trunk
jetty/jetty-sandbox/trunk,tags,branches - jetty sandbox - components can be developed here outside of the mainline jetty trunk and be voted/moved over into the jetty-trunk so that jetty-trunk remains specifically for active maintained jetty componentry
jetty/jetty-site/trunk,tags,branches - jetty website (we going to manage from eclipse?)

Under the jetty/trunk the module layout will look this:

pom.xml - o.e.jetty:jetty-project - contains <modules> linkage to all subprojects
jetty-server - o.e.jetty:jetty-server
jetty-util - o.e.jetty:jetty-util
... for all artifacts mentioned below in per-artifact guidelines
jetty-assembly - o.e.jetty:jetty-assembly - produces .zip, .bz2, .tgz artifacts for traditional jetty usage (see Jetty Assembly Section below)

Eclipse Packaging Plan

The following is the intending packaging restructure of jetty7 into the proposed eclipse project move.

Per Artifact Guidelines

maven artifact - proposed location in jetty svn at eclipse

org.eclipse.jetty:jetty-util - jetty/jetty-util

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.log	org.mortbay.log	server/jetty-util
org.eclipse.jetty.util	org.mortbay.util	server/jetty-util
org.eclipse.jetty.component	org.mortbay.component	server/jetty-util
org.eclipse.jetty.thread	org.mortbay.thread	server/jetty-util
org.eclipse.jetty.thread.concurrent	org.mortbay.thread.concurrent	extra/jetty-threadpool
org.eclipse.jetty.resource	org.mortbay.resource	server/jetty-util

org.eclipse.jetty:jetty-xml - jetty/jetty-xml

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.xml	org.mortbay.xml	server/jetty-xml

org.eclipse.jetty:jetty-io - jetty/jetty-io

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.io	org.mortbay.io	server/jetty
org.eclipse.jetty.bio	org.mortbay.io.bio	server/jetty
org.eclipse.jetty.nio	org.mortbay.io.nio	server/jetty
org.eclipse.jetty.http	org.mortbay.jetty	server/jetty (parser/generator)

org.eclipse.jetty:jetty-server - jetty/jetty-server

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.server	org.mortbay.jetty	server/jetty
org.eclipse.jetty.server.handler	org.mortbay.jetty.handler	server/jetty
org.eclipse.jetty.server.bio	org.mortbay.jetty.bio	server/jetty
org.eclipse.jetty.server.nio	org.mortbay.jetty.nio	server/jetty
org.eclipse.jetty.servlet	org.mortbay.jetty.servlet	server/jetty

org.eclipse.jetty:jetty-webapp - jetty/jetty-webapp

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.security	org.mortbay.jetty.security	server/jetty-security
org.eclipse.jetty.webapp	org.mortbay.jetty.webapp	server/jetty-webapp
org.eclipse.jetty.deployer	org.mortbay.jetty.deployer	server/jetty-deploy

org.eclipse.jetty:jetty-ssl - jetty/jetty-ssl

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.ssl	org.mortbay.jetty.ssl	server/jetty-ssl

org.eclipse.jetty:jetty-client - jetty/jetty-client

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.client	org.mortbay.jetty.client	extra/jetty-client
org.eclipse.jetty.client.webdav	org.mortbay.jetty.client.webdav	extra/jetty-client
org.eclipse.jetty.client.security	org.mortbay.jetty.client.security	extra/jetty-client

org.eclipse.jetty:jetty-ajp - jetty/jetty-ajp

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.server.ajp	org.mortbay.jetty.ajp	extra/jetty-ajp

org.eclipse.jetty:jetty-jmx - jetty/jetty-xml

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.jmx	org.mortbay.management	plus/jetty-jmx
org.eclipse.jetty.jmx.webapp	org.mortbay.jetty.webapp.management	plus/jetty-jmx
org.eclipse.jetty.jmx.servlet	org.mortbay.jetty.servlet.management	plus/jetty-jmx
org.eclipse.jetty.jmx.server	org.mortbay.jetty.management	plus/jetty-jmx

org.eclipse.jetty.jmx.handler

org.mortbay.jetty.handler.management

plus/jetty-jmx

org.eclipse.jetty:start - jetty/start

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.start	org.mortbay.start	server/jetty-start

org.eclipse.jetty:jetty-servlets - jetty/jetty-servlets

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.servlets	org.mortbay.servlet	extra/jetty-servlet
org.eclipse.jetty.servlets.jetty	org.mortbay.servlet.jetty	extra/jetty-servlet
org.eclipse.jetty.servlets.proxy	org.mortbay.proxy	extra/jetty-client

org.eclipse.jetty:jetty-jaas - jetty/jetty-jaas

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.jaas.spi	org.mortbay.jetty.plus.jaas.spi	plus/jetty-plus
org.eclipse.jetty.jaas.callback	org.mortbay.jetty.plus.jaas.callback	plus/jetty-plus
org.eclipse.jetty.jaas	org.mortbay.jetty.plus.jaas	plus/jetty-plus

org.eclipse.jetty:jetty-jndi - jetty/jetty-jndi

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.jndi.local	org.mortbay.naming.local	plus/jetty-jndi
org.eclipse.jetty.jndi.java	org.mortbay.naming.java	plus/jetty-jndi
org.eclipse.jetty.jndi.factories	org.mortbay.naming.factories	plus/jetty-jndi
org.eclipse.jetty.jndi	org.mortbay.naming	plus/jetty-jndi

org.eclipse.jetty:jetty-plus - jetty/jetty-plus

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.plus.webapp	org.mortbay.jetty.plus.webapp	plus/jetty-plus
org.eclipse.jetty.plus.servlet	org.mortbay.jetty.plus.servlet	plus/jetty-plus
org.eclipse.jetty.plus.security	org.mortbay.jetty.plus.security	plus/jetty-plus
org.eclipse.jetty.plus.naming	org.mortbay.jetty.plus.naming	plus/jetty-plus
org.eclipse.jetty.annotation	org.mortbay.jetty.plus.annotation	plus/jetty-plus

org.eclipse.jetty:jetty-annotations - jetty/jetty-annotations

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.annotations	org.mortbay.jetty.annotations	plus/jetty-annotations

org.eclipse.jetty:jetty-tester - jetty/jetty-tester

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.testing	org.mortbay.jetty.testing	extra/jetty-servlet-tester

org.eclipse.jetty:jetty-json - jetty/jetty-json

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.json	org.mortbay.util.ajax	server/jetty-util

org.eclipse.jetty:jetty-html - jetty/jetty-html

New Package	Previous Package	Previous Artifact
~	org.mortbay.html	extra/jetty-html

org.eclipse.jetty:jetty-rewrite - jetty/jetty-rewrite

New Package	Previous Package	Previous Artifact
org.eclipse.jetty.handler.rewrite	org.mortbay.jetty.handler.rewrite	extra/jetty-rewrite

Jetty Assembly Plan

Jetty will be built entirely in self contained components with no contextual antrun scripting to move files around. In order for jetty to build the assembly correctly each component may be wired to generate an 'install-component' classified artifact that can be pulled down with the jetty-assembly build that will allow us to generate an install bundle very much akin to our existing jetty download bundle.

We can leverage the maven-dependency-plugin and the maven-assembly-plugin to build out this jetty-assembly artifact similar to the mechanic in place for the current jetty-site.