Jump to: navigation, search

Difference between revisions of "Jetty/Starting/Porting to Jetty 7/Packages and Classes"

 
(19 intermediate revisions by one other user not shown)
Line 1: Line 1:
 
{{Jetty}}
 
{{Jetty}}
 +
 +
== Overview of changes ==
 +
<onlyinclude>
 +
{| class="jetty-table"
 +
|+ Quick guide to renamed packages and classes. (Covers most, but not all, cases)
 +
! Jetty 6
 +
! Matching in Jetty 7
 +
! Similar in Jetty 7
 +
|-
 +
| org.mortbay.(jetty).* || org.eclipse.jetty.* ||
 +
|-
 +
| packages under modules/util - org.mortbay.util.*, org.mortbay.log, org.mortbay.component, org.mortbay.thread, org.mortbay.resource
 +
| org.eclipse.jetty.util.*, org.eclipse.jetty.util.log, org.eclipse.jetty.util.component, etc
 +
|-
 +
| org.mortbay.jetty.security.UserRealm
 +
org.mortbay.jetty.security.HashUserRealm
 +
|
 +
| org.eclipse.jetty.security.LoginService
 +
org.eclipse.jetty.security.HashLoginService
 +
|-
 +
| org.mortbay.jetty.servlet.Context || org.eclipse.jetty.servlet.ServletContextHandler ||
 +
|-
 +
| org.mortbay.util.ajax.Continuation
 +
org.mortbay.util.ajax.ContinuationSupport
 +
| org.eclipse.jetty.continuation.Continuation
 +
org.eclipse.jetty.continuation.ContinuationSupport
 +
|
 +
|}
 +
 +
{| class="jetty-table"
 +
|+ Other refactoring changes to watch out for when moving to Jetty 7
 +
! Type of change
 +
! Jetty 6
 +
! Jetty 7
 +
|-
 +
| Maven plugin artifact id
 +
| maven-jetty-plugin
 +
| jetty-maven-plugin
 +
|-
 +
| Split up server JAR
 +
| jetty.jar
 +
| jetty-server.jar, jetty-deploy.jar, jetty-io.jar, jetty-security.jar, jetty-servlet.jar, jetty-servlets.jar, jetty-webapp.jar, jetty-xml.jar
 +
|-
 +
| Removed unused module
 +
| jetty-html.jar
 +
| ~
 +
|-
 +
| Renamed JAR
 +
| jetty-rewrite-handler.jar
 +
| jetty-rewrite.jar
 +
|-
 +
| Renamed JAR
 +
| jetty-management.jar
 +
| jetty-jmx.jar
 +
|-
 +
| New Continuation JAR
 +
| from jetty-util.jar
 +
| jetty-continuation.jar
 +
|-
 +
| Removed class
 +
| org.mortbay.jetty.plus.jaas.callback.DefaultCallbackHandler
 +
| Inner class in JAASLoginService
 +
|}
 +
 +
</onlyinclude>
 +
 +
== Jetty 6 to 7 Converter Tool ==
 +
 +
You do not need to go through your files, manually changing the package and class names. We have written a [[Jetty/Getting Started/Upgrade from Jetty 6 to Jetty 7|converter tool]] to do all that dirty work for you.
 +
 +
== Full List of Packages and Classes ==
 +
 +
For reference, a list of how the packages and class names have been changed. For those package names provided with no further comment, assume that all files from that package in Jetty 6 were moved to the corresponding package in Jetty 7. However, some packages were split up across different modules; for these we list the class names, or note briefly which files were moved.
  
 
{| class="jetty-table"
 
{| class="jetty-table"
Line 13: Line 86:
 
| org.eclipse.jetty.util  
 
| org.eclipse.jetty.util  
 
| org.mortbay.util  
 
| org.mortbay.util  
 +
| modules/util
 +
|-
 +
| org.eclipse.jetty.util.ajax
 +
| org.mortbay.util.ajax ('''''JSON''''')
 
| modules/util
 
| modules/util
 
|-
 
|-
Line 63: Line 140:
 
| org.eclipse.jetty.http
 
| org.eclipse.jetty.http
 
| org.mortbay.jetty
 
| org.mortbay.jetty
| modules/jetty (parser/generator)
+
(parser/generator)
 +
| modules/jetty
 
|}
 
|}
  
Line 74: Line 152:
 
| org.eclipse.jetty.server
 
| org.eclipse.jetty.server
 
| org.mortbay.jetty
 
| org.mortbay.jetty
 +
(most of the original server files)
 
| modules/jetty
 
| modules/jetty
 
|-
 
|-
Line 89: Line 168:
 
|-
 
|-
 
| org.eclipse.jetty.servlet.session
 
| org.eclipse.jetty.servlet.session
| org.mortbay.jetty.servlet (session-related)
+
| org.mortbay.jetty.servlet ('''''session-related''''')
 
| modules/jetty
 
| modules/jetty
 
|-
 
|-
 
| org.eclipse.jetty.server.ssl
 
| org.eclipse.jetty.server.ssl
| org.mortbay.jetty.security
+
| org.mortbay.jetty.security ('''''ssl''''')
 
| modules/jetty
 
| modules/jetty
 
|}
 
|}
  
{| class="jetty-table"  
+
{| class="jetty-table"
 
|+ Artifact: org.eclipse.jetty:jetty-servlet
 
|+ Artifact: org.eclipse.jetty:jetty-servlet
 
! New Package
 
! New Package
Line 104: Line 183:
 
|-
 
|-
 
| org.eclipse.jetty.servlet
 
| org.eclipse.jetty.servlet
| org.mortbay.jetty.servlet (servlets, handlers)
+
| org.mortbay.jetty.servlet ('''''servlet-handling''''')
 
| modules/jetty
 
| modules/jetty
 
|}
 
|}
Line 137: Line 216:
 
|-
 
|-
 
| org.eclipse.jetty.security
 
| org.eclipse.jetty.security
| org.mortbay.jetty.security
+
| org.mortbay.jetty.security ('''''misc''''')
 
| modules/jetty
 
| modules/jetty
 
|-
 
|-
 
| org.eclipse.jetty.security.authentication
 
| org.eclipse.jetty.security.authentication
| org.mortbay.jetty.security
+
| org.mortbay.jetty.security ('''''authentication''''')
 
| modules/jetty
 
| modules/jetty
 
|}
 
|}
Line 202: Line 281:
 
|}
 
|}
  
|+ Artifact: org.eclipse.jetty:start - jetty/start
+
{| class="jetty-table"
 +
|+ Artifact: org.eclipse.jetty:start
 
! New Package
 
! New Package
 
! Previous Package
 
! Previous Package
 
! Previous Artifact
 
! Previous Artifact
| org.eclipse.jetty.start | org.mortbay.start | server/jetty-start
+
|-
 +
| org.eclipse.jetty.start
 +
| org.mortbay.start
 +
| modules/start
 +
|}
  
|+ Artifact: org.eclipse.jetty:jetty-servlets - jetty/jetty-servlets
+
{| class="jetty-table"
 +
|+ Artifact: org.eclipse.jetty:jetty-servlets
 
! New Package
 
! New Package
 
! Previous Package
 
! Previous Package
 
! Previous Artifact
 
! 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
| org.eclipse.jetty.servlets.proxy | org.mortbay.proxy | extra/jetty-client |
+
| org.mortbay.servlet
 +
| modules/util
 +
modules/util5
 +
|-
 +
| org.eclipse.jetty.servlets
 +
| org.mortbay.servlet.jetty
 +
| modules/jetty
 +
|-
 +
| '''''org.eclipse.jetty.servlets.ProxyServlet'''''
 +
| org.mortbay.proxy.AsyncProxyServlet
 +
| extras/client
 +
|}
  
|+ Artifact: org.eclipse.jetty:jetty-jaas - jetty/jetty-jaas
+
{| class="jetty-table"
 +
|+ Artifact: org.eclipse.jetty:jetty-jndi
 
! New Package
 
! New Package
 
! Previous Package
 
! Previous Package
 
! Previous Artifact
 
! 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.jndi.local
| org.eclipse.jetty.jaas | org.mortbay.jetty.plus.jaas | plus/jetty-plus |
+
| org.mortbay.naming.local
 +
| modules/naming
 +
|-
 +
| org.eclipse.jetty.jndi.java
 +
| org.mortbay.naming.java
 +
| modules/naming
 +
|-
 +
| org.eclipse.jetty.jndi.factories
 +
| org.mortbay.naming.factories
 +
| modules/naming
 +
|-
 +
| org.eclipse.jetty.jndi
 +
| org.mortbay.naming
 +
| modules/naming
 +
|}
  
|+ Artifact: org.eclipse.jetty:jetty-jndi - jetty/jetty-jndi
+
{| class="jetty-table"
 +
|+ Artifact: org.eclipse.jetty:jetty-plus
 
! New Package
 
! New Package
 
! Previous Package
 
! Previous Package
 
! Previous Artifact
 
! 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.plus.jaas.spi
| org.eclipse.jetty.jndi.factories | org.mortbay.naming.factories | plus/jetty-jndi |
+
| org.mortbay.jetty.plus.jaas.spi
| org.eclipse.jetty.jndi | org.mortbay.naming | plus/jetty-jndi |
+
| modules/plus
 +
|-
 +
| org.eclipse.jetty.plus.jaas.callback
 +
| org.mortbay.jetty.plus.jaas.callback
 +
| modules/plus
 +
|-
 +
| org.eclipse.jetty.plus.jaas
 +
| org.mortbay.jetty.plus.jaas
 +
| modules/plus
 +
|-
 +
| org.eclipse.jetty.plus.webapp
 +
| org.mortbay.jetty.plus.webapp
 +
| modules/plus
 +
|-
 +
| org.eclipse.jetty.plus.servlet
 +
| org.mortbay.jetty.plus.servlet
 +
| modules/plus
 +
|-
 +
| org.eclipse.jetty.plus.jndi
 +
| org.mortbay.jetty.plus.naming
 +
| modules/plus
 +
|-
 +
| org.eclipse.jetty.plus.annotation
 +
| org.mortbay.jetty.plus.annotation
 +
| modules/plus
 +
|}
  
|+ Artifact: org.eclipse.jetty:jetty-plus - jetty/jetty-plus
+
{| class="jetty-table"
 +
|+ Artifact: org.eclipse.jetty:jetty-annotations
 
! New Package
 
! New Package
 
! Previous Package
 
! Previous Package
 
! Previous Artifact
 
! 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.annotations
| org.eclipse.jetty.plus.security | org.mortbay.jetty.plus.security | plus/jetty-plus |
+
| org.mortbay.jetty.annotations
| org.eclipse.jetty.plus.naming | org.mortbay.jetty.plus.naming | plus/jetty-plus |
+
| modules/annotations
| org.eclipse.jetty.annotation | org.mortbay.jetty.plus.annotation | plus/jetty-plus |
+
|}
  
|+ Artifact: org.eclipse.jetty:jetty-annotations - jetty/jetty-annotations
+
{| class="jetty-table"
 +
|+ Artifact: org.eclipse.jetty:test-jetty-servlet
 
! New Package
 
! New Package
 
! Previous Package
 
! Previous Package
 
! Previous Artifact
 
! Previous Artifact
| org.eclipse.jetty.annotations | org.mortbay.jetty.annotations | plus/jetty-annotations |
+
|-
 +
| org.eclipse.jetty.testing
 +
| org.mortbay.jetty.testing
 +
| extras/servlet-tester
 +
|}
  
|+ Artifact: org.eclipse.jetty:jetty-tester - jetty/jetty-tester
+
{| class="jetty-table"
 +
|+ Artifact: org.eclipse.jetty:jetty-continuation
 
! New Package
 
! New Package
 
! Previous Package
 
! Previous Package
 
! Previous Artifact
 
! Previous Artifact
| org.eclipse.jetty.testing | org.mortbay.jetty.testing | extra/jetty-servlet-tester |
+
|-
 +
| org.eclipse.jetty.continuation
 +
| org.mortbay.util.ajax ('''''continuation''''')
 +
| modules/util
 +
|}
  
|+ Artifact: org.eclipse.jetty:jetty-json - jetty/jetty-json
+
{| class="jetty-table"
 +
|+ Artifact: org.eclipse.jetty:jetty-html
 
! New Package
 
! New Package
 
! Previous Package
 
! Previous Package
 
! Previous Artifact
 
! Previous Artifact
| org.eclipse.jetty.json | org.mortbay.util.ajax | server/jetty-util |
+
|-
+
| ~
|+ Artifact: org.eclipse.jetty:jetty-html - jetty/jetty-html
+
| org.mortbay.html
! New Package
+
| modules/html
! Previous Package
+
|}
! Previous Artifact
+
| ~ | org.mortbay.html | extra/jetty-html |
+
  
|+ Artifact: org.eclipse.jetty:jetty-rewrite - jetty/jetty-rewrite
+
{| class="jetty-table"
 +
|+ Artifact: org.eclipse.jetty:jetty-rewrite
 
! New Package
 
! New Package
 
! Previous Package
 
! Previous Package
 
! Previous Artifact
 
! Previous Artifact
| org.eclipse.jetty.handler.rewrite | org.mortbay.jetty.handler.rewrite | extra/jetty-rewrite |
+
|-
 +
| org.eclipse.jetty.rewrite.handler
 +
| org.mortbay.jetty.handler.rewrite
 +
| contrib/jetty-rewrite-handler
 +
|}
 +
 
 +
<noinclude>
 +
[[Category: Jetty Porting]]
 +
[[Category: Jetty Starting]]
 +
</noinclude>

Latest revision as of 19:23, 25 April 2012



Overview of changes

Quick guide to renamed packages and classes. (Covers most, but not all, cases)
Jetty 6 Matching in Jetty 7 Similar in Jetty 7
org.mortbay.(jetty).* org.eclipse.jetty.*
packages under modules/util - org.mortbay.util.*, org.mortbay.log, org.mortbay.component, org.mortbay.thread, org.mortbay.resource org.eclipse.jetty.util.*, org.eclipse.jetty.util.log, org.eclipse.jetty.util.component, etc
org.mortbay.jetty.security.UserRealm

org.mortbay.jetty.security.HashUserRealm

org.eclipse.jetty.security.LoginService

org.eclipse.jetty.security.HashLoginService

org.mortbay.jetty.servlet.Context org.eclipse.jetty.servlet.ServletContextHandler
org.mortbay.util.ajax.Continuation

org.mortbay.util.ajax.ContinuationSupport

org.eclipse.jetty.continuation.Continuation

org.eclipse.jetty.continuation.ContinuationSupport

Other refactoring changes to watch out for when moving to Jetty 7
Type of change Jetty 6 Jetty 7
Maven plugin artifact id maven-jetty-plugin jetty-maven-plugin
Split up server JAR jetty.jar jetty-server.jar, jetty-deploy.jar, jetty-io.jar, jetty-security.jar, jetty-servlet.jar, jetty-servlets.jar, jetty-webapp.jar, jetty-xml.jar
Removed unused module jetty-html.jar ~
Renamed JAR jetty-rewrite-handler.jar jetty-rewrite.jar
Renamed JAR jetty-management.jar jetty-jmx.jar
New Continuation JAR from jetty-util.jar jetty-continuation.jar
Removed class org.mortbay.jetty.plus.jaas.callback.DefaultCallbackHandler Inner class in JAASLoginService


Jetty 6 to 7 Converter Tool

You do not need to go through your files, manually changing the package and class names. We have written a converter tool to do all that dirty work for you.

Full List of Packages and Classes

For reference, a list of how the packages and class names have been changed. For those package names provided with no further comment, assume that all files from that package in Jetty 6 were moved to the corresponding package in Jetty 7. However, some packages were split up across different modules; for these we list the class names, or note briefly which files were moved.

Artifact: org.eclipse.jetty:jetty-util
New Package Previous Package Previous Artifact
org.eclipse.jetty.util.log org.mortbay.log modules/util
org.eclipse.jetty.util org.mortbay.util modules/util
org.eclipse.jetty.util.ajax org.mortbay.util.ajax (JSON) modules/util
org.eclipse.jetty.util.component org.mortbay.component modules/util
org.eclipse.jetty.util.thread org.mortbay.thread modules/util
org.eclipse.jetty.util.thread org.mortbay.thread.concurrent extras/threadpool
org.eclipse.jetty.util.resource org.mortbay.resource modules/jetty
Artifact: org.eclipse.jetty:jetty-xml
New Package Previous Package Previous Artifact
org.eclipse.jetty.xml org.mortbay.xml modules/jetty
Artifact: org.eclipse.jetty:jetty-io
New Package Previous Package Previous Artifact
org.eclipse.jetty.io org.mortbay.io modules/jetty
org.eclipse.jetty.io.bio org.mortbay.io.bio modules/jetty
org.eclipse.jetty.io.nio org.mortbay.io.nio modules/jetty
org.eclipse.jetty.http org.mortbay.jetty

(parser/generator)

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

(most of the original server files)

modules/jetty
org.eclipse.jetty.server.handler org.mortbay.jetty.handler modules/jetty
org.eclipse.jetty.server.bio org.mortbay.jetty.bio modules/jetty
org.eclipse.jetty.server.nio org.mortbay.jetty.nio modules/jetty
org.eclipse.jetty.servlet.session org.mortbay.jetty.servlet (session-related) modules/jetty
org.eclipse.jetty.server.ssl org.mortbay.jetty.security (ssl) modules/jetty
Artifact: org.eclipse.jetty:jetty-servlet
New Package Previous Package Previous Artifact
org.eclipse.jetty.servlet org.mortbay.jetty.servlet (servlet-handling) modules/jetty
Artifact: org.eclipse.jetty:jetty-webapp
New Package Previous Package Previous Artifact
org.eclipse.jetty.webapp org.mortbay.jetty.webapp modules/jetty
Artifact: org.eclipse.jetty:jetty-deploy
New Package Previous Package Previous Artifact
org.eclipse.jetty.deploy org.mortbay.jetty.deployer modules/jetty
Artifact: org.eclipse.jetty:jetty-security
New Package Previous Package Previous Artifact
org.eclipse.jetty.security org.mortbay.jetty.security (misc) modules/jetty
org.eclipse.jetty.security.authentication org.mortbay.jetty.security (authentication) modules/jetty
Artifact: org.eclipse.jetty:jetty-client
New Package Previous Package Previous Artifact
org.eclipse.jetty.client org.mortbay.jetty.client extras/client
org.eclipse.jetty.client.webdav org.mortbay.jetty.client.webdav extras/client
org.eclipse.jetty.client.security org.mortbay.jetty.client.security extras/client
Artifact: org.eclipse.jetty:jetty-ajp
New Package Previous Package Previous Artifact
org.eclipse.jetty.ajp org.mortbay.jetty.ajp extras/ajp
Artifact: org.eclipse.jetty:jetty-jmx
New Package Previous Package Previous Artifact
org.eclipse.jetty.jmx org.mortbay.management modules/management
org.eclipse.jetty.webapp.jmx org.mortbay.jetty.webapp.management modules/management
org.eclipse.jetty.servlet.jmx org.mortbay.jetty.servlet.management modules/management
org.eclipse.jetty.server.jmx org.mortbay.jetty.management modules/management
org.eclipse.jetty.handler.jmx org.mortbay.jetty.handler.management modules/management
Artifact: org.eclipse.jetty:start
New Package Previous Package Previous Artifact
org.eclipse.jetty.start org.mortbay.start modules/start
Artifact: org.eclipse.jetty:jetty-servlets
New Package Previous Package Previous Artifact
org.eclipse.jetty.servlets org.mortbay.servlet modules/util

modules/util5

org.eclipse.jetty.servlets org.mortbay.servlet.jetty modules/jetty
org.eclipse.jetty.servlets.ProxyServlet org.mortbay.proxy.AsyncProxyServlet extras/client
Artifact: org.eclipse.jetty:jetty-jndi
New Package Previous Package Previous Artifact
org.eclipse.jetty.jndi.local org.mortbay.naming.local modules/naming
org.eclipse.jetty.jndi.java org.mortbay.naming.java modules/naming
org.eclipse.jetty.jndi.factories org.mortbay.naming.factories modules/naming
org.eclipse.jetty.jndi org.mortbay.naming modules/naming
Artifact: org.eclipse.jetty:jetty-plus
New Package Previous Package Previous Artifact
org.eclipse.jetty.plus.jaas.spi org.mortbay.jetty.plus.jaas.spi modules/plus
org.eclipse.jetty.plus.jaas.callback org.mortbay.jetty.plus.jaas.callback modules/plus
org.eclipse.jetty.plus.jaas org.mortbay.jetty.plus.jaas modules/plus
org.eclipse.jetty.plus.webapp org.mortbay.jetty.plus.webapp modules/plus
org.eclipse.jetty.plus.servlet org.mortbay.jetty.plus.servlet modules/plus
org.eclipse.jetty.plus.jndi org.mortbay.jetty.plus.naming modules/plus
org.eclipse.jetty.plus.annotation org.mortbay.jetty.plus.annotation modules/plus
Artifact: org.eclipse.jetty:jetty-annotations
New Package Previous Package Previous Artifact
org.eclipse.jetty.annotations org.mortbay.jetty.annotations modules/annotations
Artifact: org.eclipse.jetty:test-jetty-servlet
New Package Previous Package Previous Artifact
org.eclipse.jetty.testing org.mortbay.jetty.testing extras/servlet-tester
Artifact: org.eclipse.jetty:jetty-continuation
New Package Previous Package Previous Artifact
org.eclipse.jetty.continuation org.mortbay.util.ajax (continuation) modules/util
Artifact: org.eclipse.jetty:jetty-html
New Package Previous Package Previous Artifact
~ org.mortbay.html modules/html
Artifact: org.eclipse.jetty:jetty-rewrite
New Package Previous Package Previous Artifact
org.eclipse.jetty.rewrite.handler org.mortbay.jetty.handler.rewrite contrib/jetty-rewrite-handler