svn commit: r674682 - in /geronimo/sandbox/djencks/jetty7: geronimo-jetty7-builder/src/test/resources/deployables/war4/WEB-INF/ geronimo-jetty7-builder/src/test/resources/services/ geronimo-jetty7/src/main/java/org/apache/geronimo/jetty6/ geronimo-jett...

[dj...@apache.org]

Author: djencks
Date: Mon Jul  7 17:07:56 2008
New Revision: 674682

URL: http://svn.apache.org/viewvc?rev=674682&view=rev
Log:
basic package change in first module

Added:
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/
      - copied from r674670, geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty6/
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/
      - copied from r674670, geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty6/
Removed:
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty6/
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty6/
Modified:
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/resources/deployables/war4/WEB-INF/web.xml
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/resources/services/local.xml
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/AbstractPreHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/Host.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJAASJettyRealm.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJettyServletHolder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JAASJettyPrincipal.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JAASJettyRealm.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainer.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyDefaultServletHolder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyEJBWebServiceContext.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterHolder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyJspServletHolder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyManagerImpl.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyPOJOWebServiceHolder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettySecureConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServer.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletHolder.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/Messages.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/NonAuthenticator.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandlerFactory.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ServletNameSource.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/SessionHandlerFactory.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/AJP13Connector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSelectChannelSSLListener.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSocketSSLListener.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPBlockingConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSelectChannelConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSocketConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSelectChannelConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSocketConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyThreadPool.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/AbstractImmutableHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ComponentContextHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/LifecycleCommand.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ThreadClassloaderHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyLogManager.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyLogManagerImpl.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyRequestLog.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/NCSARequestLog.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ApplicationTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ClassLoaderTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ContainerTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/GBeanInfoTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/app/MockWebServiceContainer.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/connector/ConnectorGBeanTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/connector/HTTPConnectorTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/resources/services/local.xml
    geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/src/main/plan/plan.xml
    geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml
    geronimo/sandbox/djencks/jetty7/jetty7/src/main/plan/plan.xml

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/resources/deployables/war4/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/resources/deployables/war4/WEB-INF/web.xml?rev=674682&r1=674681&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/resources/deployables/war4/WEB-INF/web.xml (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/resources/deployables/war4/WEB-INF/web.xml Mon Jul  7 17:07:56 2008
@@ -19,7 +19,7 @@
     <display-name>war4</display-name>
     <filter>
         <filter-name>Filter1</filter-name>
-        <filter-class>org.apache.geronimo.jetty6.app.Filter1</filter-class>
+        <filter-class>org.apache.geronimo.jetty7.app.Filter1</filter-class>
         <init-param>
             <param-name>attribute1</param-name>
             <param-value>value1</param-value>
@@ -27,7 +27,7 @@
     </filter>
     <filter>
         <filter-name>Filter2</filter-name>
-        <filter-class>org.apache.geronimo.jetty6.app.Filter2</filter-class>
+        <filter-class>org.apache.geronimo.jetty7.app.Filter2</filter-class>
         <init-param>
             <param-name>attribute1</param-name>
             <param-value>value2</param-value>
@@ -43,11 +43,11 @@
     </filter-mapping>
     <servlet>
         <servlet-name>Servlet1</servlet-name>
-        <servlet-class>org.apache.geronimo.jetty6.app.Servlet1</servlet-class>
+        <servlet-class>org.apache.geronimo.jetty7.app.Servlet1</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>Servlet2</servlet-name>
-        <servlet-class>org.apache.geronimo.jetty6.app.Servlet2</servlet-class>
+        <servlet-class>org.apache.geronimo.jetty7.app.Servlet2</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>Servlet1</servlet-name>

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/resources/services/local.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/resources/services/local.xml?rev=674682&r1=674681&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/resources/services/local.xml (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/resources/services/local.xml Mon Jul  7 17:07:56 2008
@@ -15,10 +15,10 @@
   limitations under the License.
 -->
 <gbeans>
-    <gbean class="org.apache.geronimo.jetty6.JettyContainerImpl" objectName="geronimo.web:type=WebContainer,container=Jetty">
+    <gbean class="org.apache.geronimo.jetty7.JettyContainerImpl" objectName="geronimo.web:type=WebContainer,container=Jetty">
     </gbean>
 
-    <gbean class="org.apache.geronimo.jetty6.connector.HTTPSocketConnector" objectName="geronimo.web:type=WebConnector,container=Jetty,port=8080">
+    <gbean class="org.apache.geronimo.jetty7.connector.HTTPSocketConnector" objectName="geronimo.web:type=WebConnector,container=Jetty,port=8080">
         <default attribute="Port">5678</default>
         <endpoint name="JettyContainer">
             <pattern><gbean-name>geronimo.web:type=WebContainer,container=Jetty</gbean-name></pattern>

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/AbstractPreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/AbstractPreHandler.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/AbstractPreHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/AbstractPreHandler.java Mon Jul  7 17:07:56 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.Server;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/Host.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/Host.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/Host.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/Host.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InjectionServletHandler.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -24,7 +24,6 @@
 import javax.ejb.EJB;
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.servlet.Servlet;
 
 import org.mortbay.jetty.servlet.ServletHandler;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJAASJettyRealm.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJAASJettyRealm.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJAASJettyRealm.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJAASJettyRealm.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.security.AccessControlContext;
 import java.security.AccessControlException;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJettyServletHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJettyServletHolder.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJettyServletHolder.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/InternalJettyServletHolder.java Mon Jul  7 17:07:56 2008
@@ -16,7 +16,7 @@
  */
 
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.io.IOException;
 
@@ -26,8 +26,8 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.UnavailableException;
 
-import org.apache.geronimo.jetty6.handler.AbstractImmutableHandler;
-import org.apache.geronimo.jetty6.handler.LifecycleCommand;
+import org.apache.geronimo.jetty7.handler.AbstractImmutableHandler;
+import org.apache.geronimo.jetty7.handler.LifecycleCommand;
 import org.apache.geronimo.security.Callers;
 import org.apache.geronimo.security.ContextManager;
 import org.mortbay.jetty.servlet.ServletHolder;
@@ -92,7 +92,7 @@
      * Provide the thread's current JettyServletHolder
      *
      * @return the thread's current JettyServletHolder
-     * @see org.apache.geronimo.jetty6.JAASJettyRealm#isUserInRole(java.security.Principal,java.lang.String)
+     * @see org.apache.geronimo.jetty7.JAASJettyRealm#isUserInRole(java.security.Principal,java.lang.String)
      */
     static String getCurrentServletName() {
         return currentServletName.get();

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JAASJettyPrincipal.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JAASJettyPrincipal.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JAASJettyPrincipal.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JAASJettyPrincipal.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.security.Principal;
 import javax.security.auth.Subject;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JAASJettyRealm.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JAASJettyRealm.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JAASJettyRealm.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JAASJettyRealm.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.security.Principal;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainer.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainer.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainer.java Mon Jul  7 17:07:56 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.io.File;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java Mon Jul  7 17:07:56 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.io.File;
 import java.util.HashMap;
@@ -37,7 +37,6 @@
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.RequestLog;
 import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.ContextHandler;
 import org.mortbay.jetty.handler.ContextHandlerCollection;
 import org.mortbay.jetty.handler.DefaultHandler;
 import org.mortbay.jetty.handler.HandlerCollection;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyDefaultServletHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyDefaultServletHolder.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyDefaultServletHolder.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyDefaultServletHolder.java Mon Jul  7 17:07:56 2008
@@ -15,18 +15,14 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.util.Map;
 import java.util.Set;
 
-import javax.security.auth.Subject;
-
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.security.deploy.SubjectInfo;
-import org.mortbay.jetty.servlet.ServletHolder;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyEJBWebServiceContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyEJBWebServiceContext.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyEJBWebServiceContext.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyEJBWebServiceContext.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterHolder.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterHolder.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterHolder.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.util.Map;
 
@@ -22,7 +22,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.jetty6.handler.LifecycleCommand;
+import org.apache.geronimo.jetty7.handler.LifecycleCommand;
 import org.mortbay.jetty.servlet.FilterHolder;
 
 /**

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyFilterMapping.java Mon Jul  7 17:07:56 2008
@@ -14,10 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.util.Collection;
-import java.util.Arrays;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyJspServletHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyJspServletHolder.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyJspServletHolder.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyJspServletHolder.java Mon Jul  7 17:07:56 2008
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.util.Map;
 import java.util.Set;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyManagerImpl.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyManagerImpl.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyManagerImpl.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,14 +34,14 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.jetty6.connector.AJP13Connector;
-import org.apache.geronimo.jetty6.connector.HTTPBlockingConnector;
-import org.apache.geronimo.jetty6.connector.HTTPSSelectChannelConnector;
-import org.apache.geronimo.jetty6.connector.HTTPSSocketConnector;
-import org.apache.geronimo.jetty6.connector.HTTPSelectChannelConnector;
-import org.apache.geronimo.jetty6.connector.HTTPSocketConnector;
-import org.apache.geronimo.jetty6.connector.JettyConnector;
-import org.apache.geronimo.jetty6.requestlog.JettyLogManager;
+import org.apache.geronimo.jetty7.connector.AJP13Connector;
+import org.apache.geronimo.jetty7.connector.HTTPBlockingConnector;
+import org.apache.geronimo.jetty7.connector.HTTPSSelectChannelConnector;
+import org.apache.geronimo.jetty7.connector.HTTPSSocketConnector;
+import org.apache.geronimo.jetty7.connector.HTTPSelectChannelConnector;
+import org.apache.geronimo.jetty7.connector.HTTPSocketConnector;
+import org.apache.geronimo.jetty7.connector.JettyConnector;
+import org.apache.geronimo.jetty7.requestlog.JettyLogManager;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
@@ -53,7 +53,6 @@
 import org.apache.geronimo.management.geronimo.WebAccessLog;
 import org.apache.geronimo.management.geronimo.WebContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
-import org.apache.geronimo.management.geronimo.WebManager.ConnectorAttribute;
 
 /**
  * Jetty implementation of WebManager.  Knows how to manipulate

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyPOJOWebServiceHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyPOJOWebServiceHolder.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyPOJOWebServiceHolder.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyPOJOWebServiceHolder.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.io.IOException;
 import java.util.Map;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettySecureConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettySecureConnector.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettySecureConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettySecureConnector.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import org.apache.geronimo.management.geronimo.SecureConnector;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServer.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServer.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServer.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.security.UserRealm;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletHolder.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletHolder.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletHolder.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.util.Map;
 import java.util.Set;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java Mon Jul  7 17:07:56 2008
@@ -14,20 +14,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.util.Set;
-import java.util.Map;
-import java.lang.reflect.InvocationTargetException;
 
-import javax.naming.Context;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginException;
 
 import org.mortbay.jetty.servlet.ServletHandler;
 import org.mortbay.jetty.servlet.ServletHolder;
-import org.apache.geronimo.jetty6.handler.AbstractImmutableHandler;
-import org.apache.geronimo.security.deploy.SubjectInfo;
+import org.apache.geronimo.jetty7.handler.AbstractImmutableHandler;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebAppContext.java Mon Jul  7 17:07:56 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -45,14 +45,14 @@
 import org.apache.geronimo.j2ee.annotation.LifecycleMethod;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
-import org.apache.geronimo.jetty6.handler.AbstractImmutableHandler;
-import org.apache.geronimo.jetty6.handler.ComponentContextHandler;
-import org.apache.geronimo.jetty6.handler.InstanceContextHandler;
-import org.apache.geronimo.jetty6.handler.JettySecurityHandler;
-import org.apache.geronimo.jetty6.handler.LifecycleCommand;
-import org.apache.geronimo.jetty6.handler.ThreadClassloaderHandler;
-import org.apache.geronimo.jetty6.handler.TwistyWebAppContext;
-import org.apache.geronimo.jetty6.handler.UserTransactionHandler;
+import org.apache.geronimo.jetty7.handler.AbstractImmutableHandler;
+import org.apache.geronimo.jetty7.handler.ComponentContextHandler;
+import org.apache.geronimo.jetty7.handler.InstanceContextHandler;
+import org.apache.geronimo.jetty7.handler.JettySecurityHandler;
+import org.apache.geronimo.jetty7.handler.LifecycleCommand;
+import org.apache.geronimo.jetty7.handler.ThreadClassloaderHandler;
+import org.apache.geronimo.jetty7.handler.TwistyWebAppContext;
+import org.apache.geronimo.jetty7.handler.UserTransactionHandler;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.ObjectNameUtil;
 import org.apache.geronimo.management.J2EEApplication;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebConnector.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyWebConnector.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import org.apache.geronimo.management.geronimo.WebConnector;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/Messages.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/Messages.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/Messages.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/NonAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/NonAuthenticator.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/NonAuthenticator.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/NonAuthenticator.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import org.mortbay.jetty.security.Authenticator;
 import org.mortbay.jetty.security.UserRealm;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandler.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandler.java Mon Jul  7 17:07:56 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import org.mortbay.jetty.Handler;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandlerFactory.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandlerFactory.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/PreHandlerFactory.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 
 /**

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ServletNameSource.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ServletNameSource.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ServletNameSource.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ServletNameSource.java Mon Jul  7 17:07:56 2008
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/SessionHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/SessionHandlerFactory.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/SessionHandlerFactory.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/SessionHandlerFactory.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import org.mortbay.jetty.servlet.SessionHandler;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/AJP13Connector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/AJP13Connector.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/AJP13Connector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/AJP13Connector.java Mon Jul  7 17:07:56 2008
@@ -15,11 +15,11 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.jetty6.JettyContainer;
+import org.apache.geronimo.jetty7.JettyContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;
 import org.mortbay.jetty.ajp.Ajp13SocketConnector;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSelectChannelSSLListener.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSelectChannelSSLListener.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSelectChannelSSLListener.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSelectChannelSSLListener.java Mon Jul  7 17:07:56 2008
@@ -18,17 +18,8 @@
  */
 
 
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.NoSuchProviderException;
-import java.security.KeyManagementException;
-import java.security.cert.CertificateException;
-import java.io.IOException;
-
-import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLContext;
 
 import org.mortbay.jetty.security.SslSocketConnector;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSocketSSLListener.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSocketSSLListener.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSocketSSLListener.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/GeronimoSocketSSLListener.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
 import org.mortbay.jetty.security.SslSocketConnector;
 import org.apache.geronimo.management.geronimo.KeystoreManager;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPBlockingConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPBlockingConnector.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPBlockingConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPBlockingConnector.java Mon Jul  7 17:07:56 2008
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
-import org.apache.geronimo.jetty6.JettyContainer;
+import org.apache.geronimo.jetty7.JettyContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSelectChannelConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSelectChannelConnector.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSelectChannelConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSelectChannelConnector.java Mon Jul  7 17:07:56 2008
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
 import javax.net.ssl.KeyManagerFactory;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.jetty6.JettyContainer;
-import org.apache.geronimo.jetty6.JettySecureConnector;
+import org.apache.geronimo.jetty7.JettyContainer;
+import org.apache.geronimo.jetty7.JettySecureConnector;
 import org.apache.geronimo.management.geronimo.KeystoreManager;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSocketConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSocketConnector.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSocketConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSSocketConnector.java Mon Jul  7 17:07:56 2008
@@ -15,14 +15,14 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
 import javax.net.ssl.KeyManagerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.jetty6.JettyContainer;
-import org.apache.geronimo.jetty6.JettySecureConnector;
+import org.apache.geronimo.jetty7.JettyContainer;
+import org.apache.geronimo.jetty7.JettySecureConnector;
 import org.apache.geronimo.management.geronimo.KeystoreManager;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSelectChannelConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSelectChannelConnector.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSelectChannelConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSelectChannelConnector.java Mon Jul  7 17:07:56 2008
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.jetty6.JettyContainer;
+import org.apache.geronimo.jetty7.JettyContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;
 import org.mortbay.jetty.nio.SelectChannelConnector;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSocketConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSocketConnector.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSocketConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/HTTPSocketConnector.java Mon Jul  7 17:07:56 2008
@@ -15,11 +15,11 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.jetty6.JettyContainer;
+import org.apache.geronimo.jetty7.JettyContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;
 import org.mortbay.jetty.bio.SocketConnector;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java Mon Jul  7 17:07:56 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -27,8 +27,8 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.jetty6.JettyContainer;
-import org.apache.geronimo.jetty6.JettyWebConnector;
+import org.apache.geronimo.jetty7.JettyContainer;
+import org.apache.geronimo.jetty7.JettyWebConnector;
 import org.apache.geronimo.management.LazyStatisticsProvider;
 import org.apache.geronimo.management.geronimo.stats.JettyWebConnectorStatsImpl;
 import org.apache.geronimo.system.threads.ThreadPool;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyThreadPool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyThreadPool.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyThreadPool.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyThreadPool.java Mon Jul  7 17:07:56 2008
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/AbstractImmutableHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/AbstractImmutableHandler.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/AbstractImmutableHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/AbstractImmutableHandler.java Mon Jul  7 17:07:56 2008
@@ -16,13 +16,11 @@
  */
 
 
-package org.apache.geronimo.jetty6.handler;
+package org.apache.geronimo.jetty7.handler;
 
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.HandlerContainer;
 import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.AbstractHandler;
-import org.mortbay.jetty.handler.AbstractHandlerContainer;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ComponentContextHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ComponentContextHandler.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ComponentContextHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ComponentContextHandler.java Mon Jul  7 17:07:56 2008
@@ -16,7 +16,7 @@
  */
 
 
-package org.apache.geronimo.jetty6.handler;
+package org.apache.geronimo.jetty7.handler;
 
 import java.io.IOException;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InstanceContextHandler.java Mon Jul  7 17:07:56 2008
@@ -16,7 +16,7 @@
  */
 
 
-package org.apache.geronimo.jetty6.handler;
+package org.apache.geronimo.jetty7.handler;
 
 import java.io.IOException;
 import java.util.Set;
@@ -31,7 +31,6 @@
 import org.apache.geronimo.connector.outbound.connectiontracking.SharedConnectorInstanceContext;
 import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
 import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.AbstractHandler;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/JettySecurityHandler.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6.handler;
+package org.apache.geronimo.jetty7.handler;
 
 import java.io.IOException;
 import java.security.AccessControlContext;
@@ -30,9 +30,9 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.geronimo.common.GeronimoSecurityException;
-import org.apache.geronimo.jetty6.JAASJettyPrincipal;
-import org.apache.geronimo.jetty6.JAASJettyRealm;
-import org.apache.geronimo.jetty6.JettyContainer;
+import org.apache.geronimo.jetty7.JAASJettyPrincipal;
+import org.apache.geronimo.jetty7.JAASJettyRealm;
+import org.apache.geronimo.jetty7.JettyContainer;
 import org.apache.geronimo.security.Callers;
 import org.apache.geronimo.security.ContextManager;
 import org.mortbay.jetty.HttpException;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/LifecycleCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/LifecycleCommand.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/LifecycleCommand.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/LifecycleCommand.java Mon Jul  7 17:07:56 2008
@@ -16,9 +16,7 @@
  */
 
 
-package org.apache.geronimo.jetty6.handler;
-
-import org.mortbay.jetty.servlet.ServletHolder;
+package org.apache.geronimo.jetty7.handler;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ThreadClassloaderHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ThreadClassloaderHandler.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ThreadClassloaderHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/ThreadClassloaderHandler.java Mon Jul  7 17:07:56 2008
@@ -16,7 +16,7 @@
  */
 
 
-package org.apache.geronimo.jetty6.handler;
+package org.apache.geronimo.jetty7.handler;
 
 import java.io.IOException;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/TwistyWebAppContext.java Mon Jul  7 17:07:56 2008
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.geronimo.jetty6.handler;
+package org.apache.geronimo.jetty7.handler;
 
 import java.io.IOException;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/UserTransactionHandler.java Mon Jul  7 17:07:56 2008
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.geronimo.jetty6.handler;
+package org.apache.geronimo.jetty7.handler;
 
 import java.io.IOException;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyLogManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyLogManager.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyLogManager.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyLogManager.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6.requestlog;
+package org.apache.geronimo.jetty7.requestlog;
 
 import org.apache.geronimo.management.geronimo.WebAccessLog;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyLogManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyLogManagerImpl.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyLogManagerImpl.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyLogManagerImpl.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6.requestlog;
+package org.apache.geronimo.jetty7.requestlog;
 
 import java.io.File;
 import java.io.FilenameFilter;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyRequestLog.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyRequestLog.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyRequestLog.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/JettyRequestLog.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6.requestlog;
+package org.apache.geronimo.jetty7.requestlog;
 
 /**
  * Interface for the NCSARequestLog GBean

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/NCSARequestLog.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/NCSARequestLog.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/NCSARequestLog.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/requestlog/NCSARequestLog.java Mon Jul  7 17:07:56 2008
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6.requestlog;
+package org.apache.geronimo.jetty7.requestlog;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.jetty6.JettyContainer;
+import org.apache.geronimo.jetty7.JettyContainer;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.mortbay.jetty.RequestLog;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.io.File;
 import java.net.URL;
@@ -28,7 +28,7 @@
 
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
 import org.apache.geronimo.connector.outbound.connectiontracking.GeronimoTransactionListener;
-import org.apache.geronimo.jetty6.connector.HTTPSocketConnector;
+import org.apache.geronimo.jetty7.connector.HTTPSocketConnector;
 import org.apache.geronimo.security.SecurityServiceImpl;
 import org.apache.geronimo.security.deploy.PrincipalInfo;
 import org.apache.geronimo.security.deploy.SubjectInfo;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ApplicationTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ApplicationTest.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ApplicationTest.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ApplicationTest.java Mon Jul  7 17:07:56 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ClassLoaderTest.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ClassLoaderTest.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ClassLoaderTest.java Mon Jul  7 17:07:56 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.io.File;
 import java.net.URL;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ContainerTest.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ContainerTest.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/ContainerTest.java Mon Jul  7 17:07:56 2008
@@ -15,14 +15,14 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-import org.apache.geronimo.jetty6.app.MockWebServiceContainer;
+import org.apache.geronimo.jetty7.app.MockWebServiceContainer;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/GBeanInfoTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/GBeanInfoTest.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/GBeanInfoTest.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/GBeanInfoTest.java Mon Jul  7 17:07:56 2008
@@ -16,10 +16,9 @@
  */
 
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import junit.framework.TestCase;
-import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/SecurityTest.java Mon Jul  7 17:07:56 2008
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/StatTest.java Mon Jul  7 17:07:56 2008
@@ -14,10 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6;
+package org.apache.geronimo.jetty7;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/app/MockWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/app/MockWebServiceContainer.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/app/MockWebServiceContainer.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/app/MockWebServiceContainer.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6.app;
+package org.apache.geronimo.jetty7.app;
 
 import org.apache.geronimo.webservices.WebServiceContainer;
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/connector/ConnectorGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/connector/ConnectorGBeanTest.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/connector/ConnectorGBeanTest.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/connector/ConnectorGBeanTest.java Mon Jul  7 17:07:56 2008
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import junit.framework.TestCase;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/connector/HTTPConnectorTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/connector/HTTPConnectorTest.java?rev=674682&r1=674670&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/connector/HTTPConnectorTest.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/connector/HTTPConnectorTest.java Mon Jul  7 17:07:56 2008
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jetty6.connector;
+package org.apache.geronimo.jetty7.connector;
 
 import java.net.UnknownHostException;
 import java.net.InetSocketAddress;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/resources/services/local.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/resources/services/local.xml?rev=674682&r1=674681&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/resources/services/local.xml (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/test/resources/services/local.xml Mon Jul  7 17:07:56 2008
@@ -15,10 +15,10 @@
   limitations under the License.
 -->
 <gbeans>
-    <gbean class="org.apache.geronimo.jetty6.JettyContainerImpl" objectName="geronimo.web:type=WebContainer,container=Jetty">
+    <gbean class="org.apache.geronimo.jetty7.JettyContainerImpl" objectName="geronimo.web:type=WebContainer,container=Jetty">
     </gbean>
 
-    <gbean class="org.apache.geronimo.jetty6.connector.HTTPSocketConnector" objectName="geronimo.web:type=WebConnector,container=Jetty,port=8080">
+    <gbean class="org.apache.geronimo.jetty7.connector.HTTPSocketConnector" objectName="geronimo.web:type=WebConnector,container=Jetty,port=8080">
         <default attribute="Port">5678</default>
         <endpoint name="JettyContainer">
             <pattern><gbean-name>geronimo.web:type=WebContainer,container=Jetty</gbean-name></pattern>

Modified: geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/src/main/plan/plan.xml?rev=674682&r1=674681&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7-clustering-builder-wadi/src/main/plan/plan.xml Mon Jul  7 17:07:56 2008
@@ -20,7 +20,7 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
-    <gbean name="JettyClusteringBuilder" class="org.apache.geronimo.jetty6.cluster.wadi.builder.WADIJettyClusteringBuilder">
+    <gbean name="JettyClusteringBuilder" class="org.apache.geronimo.jetty7.cluster.wadi.builder.WADIJettyClusteringBuilder">
         <attribute name="defaultSweepInterval">10</attribute>
         <attribute name="defaultNumPartitions">24</attribute>
         <attribute name="defaultBackingStrategyFactoryName">?name=DefaultBackingStrategyFactory</attribute>

Modified: geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml?rev=674682&r1=674681&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7-deployer/src/main/plan/plan.xml Mon Jul  7 17:07:56 2008
@@ -20,7 +20,7 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
-    <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty6.deployment.JettyModuleBuilder">
+    <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty7.deployment.JettyModuleBuilder">
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
         <attribute name="jettyContainerObjectName">?name=JettyWebContainer</attribute>
@@ -146,7 +146,7 @@
         </xml-attribute>
     </gbean>
 
-    <gbean name="StaticContent" class="org.apache.geronimo.jetty6.JettyDefaultServletHolder">
+    <gbean name="StaticContent" class="org.apache.geronimo.jetty7.JettyDefaultServletHolder">
         <attribute name="servletName">default</attribute>
         <attribute name="servletClass">org.mortbay.jetty.servlet.DefaultServlet</attribute>
         <attribute name="loadOnStartup">0</attribute>
@@ -161,7 +161,7 @@
         <attribute name="servletMappings">/</attribute>
     </gbean>
 
-    <gbean name="JSPServlet" class="org.apache.geronimo.jetty6.JettyJspServletHolder">
+    <gbean name="JSPServlet" class="org.apache.geronimo.jetty7.JettyJspServletHolder">
         <attribute name="servletName">jsp</attribute>
         <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
         <attribute name="loadOnStartup">0</attribute>
@@ -175,7 +175,7 @@
         <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
     </gbean>
 
-    <gbean name="POJOTemplate" class="org.apache.geronimo.jetty6.JettyPOJOWebServiceHolder">
+    <gbean name="POJOTemplate" class="org.apache.geronimo.jetty7.JettyPOJOWebServiceHolder">
         <attribute name="servletName">dummy</attribute>
     </gbean>
 

Modified: geronimo/sandbox/djencks/jetty7/jetty7/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7/src/main/plan/plan.xml?rev=674682&r1=674681&r2=674682&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7/src/main/plan/plan.xml Mon Jul  7 17:07:56 2008
@@ -24,9 +24,9 @@
          plan and thinks they might belong in the console plan.  Aaron thinks
          they definitely don't belong in the console plan, but could go into
          a management layer plan. -->
-    <gbean name="JettyWebManager" class="org.apache.geronimo.jetty6.JettyManagerImpl"/>
+    <gbean name="JettyWebManager" class="org.apache.geronimo.jetty7.JettyManagerImpl"/>
 
-    <gbean name="JettyAccessLogManager" class="org.apache.geronimo.jetty6.requestlog.JettyLogManagerImpl">
+    <gbean name="JettyAccessLogManager" class="org.apache.geronimo.jetty7.requestlog.JettyLogManagerImpl">
         <references name="LogGBeans">
             <pattern>
                 <!-- This is lame and should be replaced by an interface reference -->
@@ -39,7 +39,7 @@
     </gbean>
 
     <!-- default WAR container using Jetty -->
-    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty6.JettyContainerImpl">
+    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty7.JettyContainerImpl">
         <attribute name="jettyHome">var/jetty</attribute>
         <reference name="WebManager">
             <name>JettyWebManager</name>
@@ -49,7 +49,7 @@
         </reference>
     </gbean>
 
-    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty6.requestlog.NCSARequestLog">
+    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty7.requestlog.NCSARequestLog">
         <reference name="JettyContainer">
             <name>JettyWebContainer</name>
         </reference>
@@ -61,7 +61,7 @@
         <attribute name="logTimeZone">GMT</attribute>
     </gbean>
 
-    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty6.connector.HTTPSelectChannelConnector">
+    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty7.connector.HTTPSelectChannelConnector">
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanHTTPPort}</attribute>
         <attribute name="headerBufferSizeBytes">8192</attribute>
@@ -74,7 +74,7 @@
         <attribute name="maxThreads">50</attribute>
     </gbean>
 
-    <gbean name="JettyAJP13Connector" class="org.apache.geronimo.jetty6.connector.AJP13Connector">
+    <gbean name="JettyAJP13Connector" class="org.apache.geronimo.jetty7.connector.AJP13Connector">
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanAJPPort}</attribute>
         <reference name="JettyContainer">
@@ -110,7 +110,7 @@
         </gbean>
     -->
     <!-- USE THIS ONE -->
-    <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty6.connector.HTTPSSelectChannelConnector">
+    <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty7.connector.HTTPSSelectChannelConnector">
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanHTTPSPort}</attribute>
         <attribute name="headerBufferSizeBytes">8192</attribute>