geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r759104 - in /geronimo/sandbox/djencks/jetty7: ./ geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/ geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ geronimo-jetty7/ geronimo-jetty...
Date Fri, 27 Mar 2009 11:22:03 GMT
Author: djencks
Date: Fri Mar 27 11:21:58 2009
New Revision: 759104

URL: http://svn.apache.org/viewvc?rev=759104&view=rev
Log:
update for new jetty location at eclipse.  Also includes updates for some prooposed framework changes

Modified:
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/AbstractClusteredPreHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandlerFactory.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.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/InjectionServletHandler.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/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/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/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/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/PreHandler.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/GeronimoRunAsToken.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentity.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.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/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/NCSARequestLog.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthConfigGBean.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthenticationGBean.java
    geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.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/jetty7/pom.xml
    geronimo/sandbox/djencks/jetty7/pom.xml

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java Fri Mar 27 11:21:58 2009
@@ -19,12 +19,12 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import java.util.Arrays;
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean;
@@ -53,7 +53,7 @@
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.EditableKernelConfigurationManager;
+import org.apache.geronimo.kernel.config.KernelConfigurationManager;
 import org.apache.geronimo.kernel.config.LifecycleException;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
 import org.apache.geronimo.kernel.management.State;
@@ -65,7 +65,7 @@
 import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.ImportType;
-import org.apache.geronimo.kernel.repository.Repository;
+import org.apache.geronimo.kernel.repository.ListableRepository;
 import org.apache.geronimo.security.SecurityServiceImpl;
 import org.apache.geronimo.security.deployment.GeronimoSecurityBuilderImpl;
 import org.apache.geronimo.security.jacc.mappingprovider.GeronimoPolicy;
@@ -156,13 +156,14 @@
             File path = new File(BASEDIR, "src/test/resources/deployables/" + appName);
             UnpackedJarFile jarFile = new UnpackedJarFile(path);
             Module module = builder.createModule(null, jarFile, kernel.getNaming(), new ModuleIDBuilder());
-            Repository repository = null;
+            ListableRepository repository = null;
 
             moduleName = module.getModuleName();
             EARContext earContext = createEARContext(outputPath, defaultEnvironment, repository, configStore, moduleName);
             module.setEarContext(earContext);
             module.setRootEarContext(earContext);
             builder.initContext(earContext, module, cl);
+            earContext.initializeConfiguration();
             builder.addGBeans(earContext, module, cl, Collections.EMPTY_SET);
             ConfigurationData configurationData = earContext.getConfigurationData();
             earContext.close();
@@ -171,14 +172,15 @@
             configurationId = configurationData.getId();
             configurationManager.loadConfiguration(configurationData);
             configuration = configurationManager.getConfiguration(configurationId);
+            ((MockConfigStore)configStore).installFake(configurationId, outputPath);
             configurationManager.startConfiguration(configurationId);
         }
     }
 
-    private EARContext createEARContext(File outputPath, Environment environment, Repository repository, ConfigurationStore configStore, AbstractName moduleName) throws DeploymentException {
+    private EARContext createEARContext(File outputPath, Environment environment, ListableRepository repository, ConfigurationStore configStore, AbstractName moduleName) throws DeploymentException {
         Set repositories = repository == null ? Collections.EMPTY_SET : Collections.singleton(repository);
         ArtifactManager artifactManager = new DefaultArtifactManager();
-        ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, repositories, null);
+        ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, repository);
         return new EARContext(outputPath,
                 null,
                 environment,
@@ -232,10 +234,10 @@
 
         GBeanData artifactManagerData = bootstrap.addGBean("ArtifactManager", DefaultArtifactManager.GBEAN_INFO);
 
-        GBeanData artifactResolverData = bootstrap.addGBean("ArtifactResolver", DefaultArtifactResolver.GBEAN_INFO);
+        GBeanData artifactResolverData = bootstrap.addGBean("ArtifactResolver", DefaultArtifactResolver.class);
         artifactResolverData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
 
-        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", EditableKernelConfigurationManager.GBEAN_INFO);
+        GBeanData configurationManagerData = bootstrap.addGBean("ConfigurationManager", KernelConfigurationManager.GBEAN_INFO);
         configurationManagerData.setReferencePattern("ArtifactManager", artifactManagerData.getAbstractName());
         configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolverData.getAbstractName());
         configurationManagerData.setReferencePattern("Stores", configStoreName);
@@ -271,7 +273,7 @@
 
         ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, getClass().getClassLoader());
 
-        configurationManager = ConfigurationUtil.getEditableConfigurationManager(kernel);
+        configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
         configStore = (ConfigurationStore) kernel.getGBean(configStoreName);
         configStore.install(bootstrap);
 

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/AbstractClusteredPreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/AbstractClusteredPreHandler.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/AbstractClusteredPreHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/AbstractClusteredPreHandler.java Fri Mar 27 11:21:58 2009
@@ -25,7 +25,7 @@
 import org.apache.geronimo.clustering.ClusteredInvocation;
 import org.apache.geronimo.clustering.ClusteredInvocationException;
 import org.apache.geronimo.jetty7.AbstractPreHandler;
-import org.mortbay.jetty.io.HttpException;
+import org.eclipse.jetty.io.HttpException;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java Fri Mar 27 11:21:58 2009
@@ -24,7 +24,7 @@
 
 import org.apache.geronimo.jetty7.AbstractPreHandler;
 import org.apache.geronimo.jetty7.PreHandler;
-import org.mortbay.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.server.session.SessionHandler;
 
 /**
  *

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandlerFactory.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandlerFactory.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandlerFactory.java Fri Mar 27 11:21:58 2009
@@ -20,7 +20,7 @@
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.jetty7.PreHandler;
 import org.apache.geronimo.jetty7.SessionHandlerFactory;
-import org.mortbay.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.server.session.SessionHandler;
 
 /**
  *

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java Fri Mar 27 11:21:58 2009
@@ -25,8 +25,8 @@
 import org.apache.geronimo.clustering.SessionAlreadyExistException;
 import org.apache.geronimo.clustering.SessionListener;
 import org.apache.geronimo.clustering.SessionManager;
-import org.mortbay.jetty.server.session.AbstractSessionManager;
-import org.mortbay.jetty.server.session.HashSessionIdManager;
+import org.eclipse.jetty.server.session.AbstractSessionManager;
+import org.eclipse.jetty.server.session.HashSessionIdManager;
 
 
 /**

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/pom.xml Fri Mar 27 11:21:58 2009
@@ -94,38 +94,38 @@
         <!--</dependency>-->
          
         <!--<dependency>-->
-            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<groupId>org.eclipse.jetty</groupId>-->
             <!--<artifactId>jetty-server</artifactId>-->
         <!--</dependency>-->
         
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-ajp</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.mortbay.jetty</groupId>-->
-            <!--<artifactId>jetty-ssl</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-jaspi</artifactId>
+        </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<groupId>org.eclipse.jetty</groupId>-->
             <!--<artifactId>jetty-util</artifactId>-->
         <!--</dependency>-->
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-webapp</artifactId>
         </dependency>
         <!--<dependency>-->
-            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<groupId>org.eclipse.jetty</groupId>-->
             <!--<artifactId>jetty-security</artifactId>-->
         <!--</dependency>-->
         <!--<dependency>-->
-            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<groupId>org.eclipse.jetty</groupId>-->
             <!--<artifactId>jetty-servlet</artifactId>-->
         <!--</dependency>-->
         <!--<dependency>-->
-            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<groupId>org.eclipse.jetty</groupId>-->
             <!--<artifactId>jetty-plus</artifactId>-->
         <!--</dependency>-->
 

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -17,9 +17,9 @@
 
 package org.apache.geronimo.jetty7;
 
-import org.mortbay.jetty.server.Handler;
-import org.mortbay.jetty.server.Server;
-import org.mortbay.jetty.util.component.LifeCycle;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.component.LifeCycle;
 
 /**
  * @version $Rev: 449059 $ $Date: 2006-09-23 05:23:09 +1000 (Sat, 23 Sep 2006) $

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -26,7 +26,7 @@
 import javax.naming.InitialContext;
 import javax.servlet.Servlet;
 
-import org.mortbay.jetty.server.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.ServletHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.geronimo.j2ee.annotation.Injection;

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -30,8 +30,8 @@
 import org.apache.geronimo.jetty7.handler.LifecycleCommand;
 import org.apache.geronimo.security.Callers;
 import org.apache.geronimo.security.ContextManager;
-import org.mortbay.jetty.server.Request;
-import org.mortbay.jetty.server.servlet.ServletHolder;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.servlet.ServletHolder;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -20,9 +20,9 @@
 import java.io.File;
 
 import org.apache.geronimo.management.geronimo.WebContainer;
-import org.mortbay.jetty.server.Connector;
-import org.mortbay.jetty.server.RequestLog;
-import org.mortbay.jetty.server.Handler;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.RequestLog;
+import org.eclipse.jetty.server.Handler;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -33,15 +33,15 @@
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.webservices.SoapHandler;
 import org.apache.geronimo.webservices.WebServiceContainer;
-import org.mortbay.jetty.server.Connector;
-import org.mortbay.jetty.server.Handler;
-import org.mortbay.jetty.server.handler.StatisticsHandler;
-import org.mortbay.jetty.server.handler.HandlerCollection;
-import org.mortbay.jetty.server.handler.ContextHandlerCollection;
-import org.mortbay.jetty.server.handler.DefaultHandler;
-import org.mortbay.jetty.server.handler.RequestLogHandler;
-import org.mortbay.jetty.server.RequestLog;
-import org.mortbay.jetty.server.Server;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.handler.StatisticsHandler;
+import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.RequestLogHandler;
+import org.eclipse.jetty.server.RequestLog;
+import org.eclipse.jetty.server.Server;
 
 /**
  * @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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -29,10 +29,10 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.geronimo.webservices.WebServiceContainer;
-import org.mortbay.jetty.server.Request;
-import org.mortbay.jetty.server.Response;
-import org.mortbay.jetty.server.handler.ContextHandler;
-import org.mortbay.jetty.io.HttpException;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.io.HttpException;
 
 /**
  * Delegates requests to a WebServiceContainer which is presumably for an EJB WebService.

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -23,7 +23,7 @@
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.jetty7.handler.LifecycleCommand;
-import org.mortbay.jetty.server.servlet.FilterHolder;
+import org.eclipse.jetty.servlet.FilterHolder;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -27,8 +27,8 @@
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
 import org.apache.geronimo.gbean.ReferenceCollectionListener;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.mortbay.jetty.server.servlet.FilterMapping;
-import org.mortbay.jetty.server.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.FilterMapping;
+import org.eclipse.jetty.servlet.ServletHandler;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -42,6 +42,7 @@
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.EditableConfigurationManager;
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.proxy.ProxyManager;
@@ -176,10 +177,10 @@
             if (!found) {
                 throw new GBeanNotFoundException(connectorName);
             }
-            EditableConfigurationManager mgr = ConfigurationUtil.getEditableConfigurationManager(kernel);
-            if (mgr != null) {
+            ConfigurationManager mgr = ConfigurationUtil.getConfigurationManager(kernel);
+            if (mgr != null && mgr instanceof EditableConfigurationManager) {
                 try {
-                    mgr.removeGBeanFromConfiguration(connectorName.getArtifact(), connectorName);
+                   ((EditableConfigurationManager)mgr).removeGBeanFromConfiguration(connectorName.getArtifact(), connectorName);
                 } catch (InvalidConfigException e) {
                     log.error("Unable to add GBean", e);
                 } finally {
@@ -260,18 +261,19 @@
             gbeanData.setReferencePattern("KeystoreManager", query);
         }
         
-        EditableConfigurationManager mgr = ConfigurationUtil.getEditableConfigurationManager(kernel);
-        if (mgr != null) {
-            try {
-                mgr.addGBeanToConfiguration(containerName.getArtifact(), gbeanData, false);
-            } catch (InvalidConfigException e) {
-                log.error("Unable to add GBean", e);
+        try {
+            ConfigurationManager mgr = ConfigurationUtil.getConfigurationManager(kernel);
+            if (mgr != null && mgr instanceof EditableConfigurationManager) {
+                ((EditableConfigurationManager)mgr).addGBeanToConfiguration(containerName.getArtifact(), gbeanData, false);
+            } else {
+                log.warn("The ConfigurationManager in the kernel does not allow editing");
                 return null;
-            } finally {
-                ConfigurationUtil.releaseConfigurationManager(kernel, mgr);
             }
-        } else {
-            log.warn("The ConfigurationManager in the kernel does not allow editing");
+        } catch (InvalidConfigException e) {
+            log.error("Unable to add GBean", e);
+            return null;
+        } catch (GBeanNotFoundException e) {
+            log.error("Unable to add GBean", e);
             return null;
         }
         return name;

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -37,8 +37,8 @@
 import org.apache.geronimo.webservices.WebServiceContainer;
 import org.apache.geronimo.webservices.WebServiceContainerInvoker;
 import org.apache.geronimo.webservices.WebServiceContainerFactory;
-import org.mortbay.jetty.server.Request;
-import org.mortbay.jetty.server.servlet.ServletHolder;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.servlet.ServletHolder;
 
 
 /**

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -28,7 +28,7 @@
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.management.Servlet;
-import org.mortbay.jetty.server.servlet.ServletHolder;
+import org.eclipse.jetty.servlet.ServletHolder;
 
 
 /**

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -21,8 +21,8 @@
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginException;
 
-import org.mortbay.jetty.server.servlet.ServletHandler;
-import org.mortbay.jetty.server.servlet.ServletHolder;
+import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 import org.apache.geronimo.jetty7.handler.AbstractImmutableHandler;
 
 /**

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -63,14 +63,14 @@
 import org.apache.geronimo.naming.enc.EnterpriseNamingContext;
 import org.apache.geronimo.security.jacc.RunAsSource;
 import org.apache.geronimo.transaction.GeronimoUserTransaction;
-import org.mortbay.jetty.server.Handler;
-import org.mortbay.jetty.security.SecurityHandler;
-import org.mortbay.jetty.server.servlet.ErrorPageErrorHandler;
-import org.mortbay.jetty.server.servlet.ServletHandler;
-import org.mortbay.jetty.server.servlet.ServletHolder;
-import org.mortbay.jetty.server.servlet.ServletMapping;
-import org.mortbay.jetty.server.session.SessionHandler;
-import org.mortbay.jetty.http.MimeTypes;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.security.SecurityHandler;
+import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
+import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.servlet.ServletMapping;
+import org.eclipse.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.http.MimeTypes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -17,7 +17,7 @@
 
 package org.apache.geronimo.jetty7;
 
-import org.mortbay.jetty.server.Handler;
+import org.eclipse.jetty.server.Handler;
 
 /**
  * @version $Rev: 449059 $ $Date: 2006-09-23 05:23:09 +1000 (Sat, 23 Sep 2006) $

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.geronimo.jetty7;
 
-import org.mortbay.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.server.session.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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -22,7 +22,7 @@
 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;
+import org.eclipse.jetty.ajp.Ajp13SocketConnector;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -22,8 +22,8 @@
 
 import javax.net.ssl.SSLContext;
 
-import org.mortbay.jetty.server.ssl.SslSelectChannelConnector;
-import org.mortbay.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
 import org.apache.geronimo.management.geronimo.KeystoreManager;
 
 /**

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.geronimo.jetty7.connector;
 
-import org.mortbay.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
 import org.apache.geronimo.management.geronimo.KeystoreManager;
 
 import javax.net.ssl.SSLServerSocketFactory;

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -25,7 +25,7 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.server.nio.BlockingChannelConnector;
+import org.eclipse.jetty.server.nio.BlockingChannelConnector;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -29,7 +29,7 @@
 import org.apache.geronimo.management.geronimo.KeystoreManager;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
 
 /**
  * Implementation of a HTTPS connector based on Jetty's SslConnector (which uses pure JSSE).

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -26,7 +26,7 @@
 import org.apache.geronimo.management.geronimo.KeystoreManager;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.bio.SocketConnector;
 
 /**
  * Implementation of a HTTPS connector based on Jetty's SslConnector (which uses pure JSSE).

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -25,7 +25,7 @@
 import org.apache.geronimo.jetty7.JettyContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -22,7 +22,7 @@
 import org.apache.geronimo.jetty7.JettyContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.bio.SocketConnector;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -31,7 +31,7 @@
 import org.apache.geronimo.management.LazyStatisticsProvider;
 import org.apache.geronimo.management.geronimo.stats.JettyWebConnectorStatsImpl;
 import org.apache.geronimo.system.threads.ThreadPool;
-import org.mortbay.jetty.server.AbstractConnector;
+import org.eclipse.jetty.server.AbstractConnector;
 
 /**
  * Base class for GBeans for Jetty network connectors (HTTP, HTTPS, AJP, etc.).

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -30,7 +30,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class JettyThreadPool implements org.mortbay.jetty.util.thread.ThreadPool {
+public class JettyThreadPool implements org.eclipse.jetty.util.thread.ThreadPool {
 
     private static final Logger log = LoggerFactory.getLogger(JettyThreadPool.class);
     private final ThreadPool executor;

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -18,9 +18,9 @@
 
 package org.apache.geronimo.jetty7.handler;
 
-import org.mortbay.jetty.server.Handler;
-import org.mortbay.jetty.server.HandlerContainer;
-import org.mortbay.jetty.server.Server;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.HandlerContainer;
+import org.eclipse.jetty.server.Server;
 
 /**
  * @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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -26,7 +26,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.geronimo.naming.java.RootContext;
-import org.mortbay.jetty.server.Handler;
+import org.eclipse.jetty.server.Handler;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoRunAsToken.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoRunAsToken.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoRunAsToken.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoRunAsToken.java Fri Mar 27 11:21:58 2009
@@ -22,7 +22,7 @@
 
 import javax.security.auth.Subject;
 
-import org.mortbay.jetty.security.RunAsToken;
+import org.eclipse.jetty.security.RunAsToken;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentity.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentity.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentity.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentity.java Fri Mar 27 11:21:58 2009
@@ -27,9 +27,9 @@
 import javax.security.jacc.WebRoleRefPermission;
 import javax.security.auth.Subject;
 
-import org.mortbay.jetty.server.servlet.ServletHolder;
-import org.mortbay.jetty.server.UserIdentity;
-import org.mortbay.jetty.security.RunAsToken;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.UserIdentity;
+import org.eclipse.jetty.security.RunAsToken;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/GeronimoUserIdentityWrapper.java Fri Mar 27 11:21:58 2009
@@ -26,7 +26,7 @@
 import javax.security.auth.Subject;
 import javax.security.jacc.WebRoleRefPermission;
 
-import org.mortbay.jetty.server.UserIdentity;
+import org.eclipse.jetty.server.UserIdentity;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -31,7 +31,7 @@
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContextImpl;
 import org.apache.geronimo.connector.outbound.connectiontracking.SharedConnectorInstanceContext;
 import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
-import org.mortbay.jetty.server.Handler;
+import org.eclipse.jetty.server.Handler;
 
 /**
  * @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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -34,13 +34,13 @@
 import org.apache.geronimo.security.Callers;
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.jacc.RunAsSource;
-import org.mortbay.jetty.security.Authenticator;
-import org.mortbay.jetty.security.SecurityHandler;
-import org.mortbay.jetty.security.IdentityService;
-import org.mortbay.jetty.security.LoginService;
-import org.mortbay.jetty.server.Request;
-import org.mortbay.jetty.server.Response;
-import org.mortbay.jetty.server.UserIdentity;
+import org.eclipse.jetty.security.Authenticator;
+import org.eclipse.jetty.security.SecurityHandler;
+import org.eclipse.jetty.security.IdentityService;
+import org.eclipse.jetty.security.LoginService;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.server.UserIdentity;
 
 public class JettySecurityHandler extends SecurityHandler {
 
@@ -111,7 +111,7 @@
 
     /* ------------------------------------------------------------ */
     /*
-     * @see org.mortbay.jetty.security.SecurityHandler#handle(java.lang.String,
+     * @see org.eclipse.jetty.security.SecurityHandler#handle(java.lang.String,
      *      javax.servlet.http.HttpServletRequest,
      *      javax.servlet.http.HttpServletResponse, int)
      */

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -24,7 +24,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.mortbay.jetty.server.Handler;
+import org.eclipse.jetty.server.Handler;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -26,14 +26,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.mortbay.jetty.server.Handler;
-import org.mortbay.jetty.server.Server;
-import org.mortbay.jetty.server.handler.ErrorHandler;
-import org.mortbay.jetty.security.SecurityHandler;
-import org.mortbay.jetty.server.servlet.ServletHandler;
-import org.mortbay.jetty.server.session.SessionHandler;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.jetty.util.component.LifeCycle;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ErrorHandler;
+import org.eclipse.jetty.security.SecurityHandler;
+import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.util.component.LifeCycle;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -30,7 +30,7 @@
 import javax.transaction.SystemException;
 import javax.transaction.UserTransaction;
 
-import org.mortbay.jetty.server.Handler;
+import org.eclipse.jetty.server.Handler;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -28,14 +28,14 @@
 public class NCSARequestLog implements GBeanLifecycle, JettyRequestLog {
     private final JettyContainer container;
     private final ServerInfo serverInfo;
-    private final org.mortbay.jetty.server.NCSARequestLog requestLog;
+    private final org.eclipse.jetty.server.NCSARequestLog requestLog;
     private boolean preferProxiedForAddress;
     private String filename;
 
     public NCSARequestLog(JettyContainer container, ServerInfo serverInfo) {
         this.container = container;
         this.serverInfo = serverInfo;
-        requestLog = new org.mortbay.jetty.server.NCSARequestLog();
+        requestLog = new org.eclipse.jetty.server.NCSARequestLog();
     }
 
     public void setFilename(String filename) {

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/AuthConfigProviderHandlerFactory.java Fri Mar 27 11:21:58 2009
@@ -35,10 +35,10 @@
 import org.apache.geronimo.jetty7.handler.JettySecurityHandler;
 import org.apache.geronimo.jetty7.security.auth.JAASLoginService;
 import org.apache.geronimo.security.jacc.RunAsSource;
-import org.mortbay.jetty.security.Authenticator;
-import org.mortbay.jetty.security.LoginService;
-import org.mortbay.jetty.security.jaspi.JaspiAuthenticator;
-import org.mortbay.jetty.security.jaspi.ServletCallbackHandler;
+import org.eclipse.jetty.security.Authenticator;
+import org.eclipse.jetty.security.LoginService;
+import org.eclipse.jetty.security.jaspi.JaspiAuthenticator;
+import org.eclipse.jetty.security.jaspi.ServletCallbackHandler;
 
 /**
  * Fetches a ServerAuthConfig out of the AuthConfigFactory

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettyIdentityService.java Fri Mar 27 11:21:58 2009
@@ -26,9 +26,9 @@
 
 import javax.security.auth.Subject;
 
-import org.mortbay.jetty.security.IdentityService;
-import org.mortbay.jetty.security.RunAsToken;
-import org.mortbay.jetty.server.UserIdentity;
+import org.eclipse.jetty.security.IdentityService;
+import org.eclipse.jetty.security.RunAsToken;
+import org.eclipse.jetty.server.UserIdentity;
 import org.apache.geronimo.jetty7.handler.GeronimoUserIdentity;
 import org.apache.geronimo.jetty7.handler.GeronimoRunAsToken;
 import org.apache.geronimo.jetty7.handler.GeronimoUserIdentityWrapper;

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/JettySecurityHandlerFactory.java Fri Mar 27 11:21:58 2009
@@ -27,13 +27,13 @@
 import org.apache.geronimo.jetty7.handler.JettySecurityHandler;
 import org.apache.geronimo.jetty7.security.auth.JAASLoginService;
 import org.apache.geronimo.security.jacc.RunAsSource;
-import org.mortbay.jetty.security.LoginService;
-import org.mortbay.jetty.security.Authenticator;
-import org.mortbay.jetty.security.authentication.BasicAuthenticator;
-import org.mortbay.jetty.security.authentication.ClientCertAuthenticator;
-import org.mortbay.jetty.security.authentication.DigestAuthenticator;
-import org.mortbay.jetty.security.authentication.FormAuthenticator;
-import org.mortbay.jetty.security.authentication.SessionCachingAuthenticator;
+import org.eclipse.jetty.security.LoginService;
+import org.eclipse.jetty.security.Authenticator;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.security.authentication.ClientCertAuthenticator;
+import org.eclipse.jetty.security.authentication.DigestAuthenticator;
+import org.eclipse.jetty.security.authentication.FormAuthenticator;
+import org.eclipse.jetty.security.authentication.SessionCachingAuthenticator;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthConfigGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthConfigGBean.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthConfigGBean.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthConfigGBean.java Fri Mar 27 11:21:58 2009
@@ -29,10 +29,10 @@
 
 import org.apache.geronimo.jetty7.handler.JettySecurityHandler;
 import org.apache.geronimo.security.jacc.RunAsSource;
-import org.mortbay.jetty.security.jaspi.ServletCallbackHandler;
-import org.mortbay.jetty.security.jaspi.JaspiAuthenticator;
-import org.mortbay.jetty.security.jaspi.SimpleAuthConfig;
-import org.mortbay.jetty.security.Authenticator;
+import org.eclipse.jetty.security.jaspi.ServletCallbackHandler;
+import org.eclipse.jetty.security.jaspi.JaspiAuthenticator;
+import org.eclipse.jetty.security.jaspi.SimpleAuthConfig;
+import org.eclipse.jetty.security.Authenticator;
 
 /**
  * Wraps a supplied ServerAuthContext in a ServerAuthConfig instance.  Mostly for testing...

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthenticationGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthenticationGBean.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthenticationGBean.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/ServerAuthenticationGBean.java Fri Mar 27 11:21:58 2009
@@ -27,9 +27,9 @@
 
 import org.apache.geronimo.jetty7.handler.JettySecurityHandler;
 import org.apache.geronimo.security.jacc.RunAsSource;
-import org.mortbay.jetty.security.Authenticator;
-import org.mortbay.jetty.security.LoginService;
-import org.mortbay.jetty.security.authentication.LazyAuthenticator;
+import org.eclipse.jetty.security.Authenticator;
+import org.eclipse.jetty.security.LoginService;
+import org.eclipse.jetty.security.authentication.LazyAuthenticator;
 
 /**
  * Wraps a supplied ServerAuthentication in a AuthenticationManager instance.  Mostly for testing...

Modified: geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java (original)
+++ geronimo/sandbox/djencks/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/JAASLoginService.java Fri Mar 27 11:21:58 2009
@@ -29,10 +29,10 @@
 
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.realm.providers.PasswordCallbackHandler;
-import org.mortbay.jetty.security.LoginService;
-import org.mortbay.jetty.security.ServerAuthException;
-import org.mortbay.jetty.security.IdentityService;
-import org.mortbay.jetty.server.UserIdentity;
+import org.eclipse.jetty.security.LoginService;
+import org.eclipse.jetty.security.ServerAuthException;
+import org.eclipse.jetty.security.IdentityService;
+import org.eclipse.jetty.server.UserIdentity;
 
 /**
  * @version $Rev$ $Date$

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -56,15 +56,15 @@
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.geronimo.testsupport.TestSupport;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
-import org.mortbay.jetty.server.UserIdentity;
-import org.mortbay.jetty.security.LoginService;
-import org.mortbay.jetty.security.ServerAuthException;
-import org.mortbay.jetty.security.Authenticator;
-import org.mortbay.jetty.security.Authentication;
-import org.mortbay.jetty.security.DefaultAuthentication;
-import org.mortbay.jetty.security.IdentityService;
-import org.mortbay.jetty.security.authentication.SessionCachingAuthenticator;
-import org.mortbay.jetty.security.authentication.FormAuthenticator;
+import org.eclipse.jetty.server.UserIdentity;
+import org.eclipse.jetty.security.LoginService;
+import org.eclipse.jetty.security.ServerAuthException;
+import org.eclipse.jetty.security.Authenticator;
+import org.eclipse.jetty.security.Authentication;
+import org.eclipse.jetty.security.DefaultAuthentication;
+import org.eclipse.jetty.security.IdentityService;
+import org.eclipse.jetty.security.authentication.SessionCachingAuthenticator;
+import org.eclipse.jetty.security.authentication.FormAuthenticator;
 
 
 /**
@@ -92,7 +92,7 @@
 
         new JettyServletHolder("test:name=staticservlet",
                 "default",
-                "org.mortbay.jetty.server.servlet.DefaultServlet",
+                "org.eclipse.jetty.servlet.DefaultServlet",
                 null,
                 staticContentServletInitParams,
                 null,
@@ -227,6 +227,7 @@
         container.doStart();
         connector = new HTTPSocketConnector(container, null);
         connector.setPort(5678);
+        connector.setHost("localhost");
         connector.setMaxThreads(2);
         connector.doStart();
 

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=759104&r1=759103&r2=759104&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 Fri Mar 27 11:21:58 2009
@@ -27,7 +27,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.mortbay.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.server.session.SessionHandler;
 
 
 /**

Modified: geronimo/sandbox/djencks/jetty7/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/jetty7/pom.xml?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/jetty7/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/jetty7/pom.xml Fri Mar 27 11:21:58 2009
@@ -85,22 +85,22 @@
         <!--</dependency>-->
 
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-ajp</artifactId>
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<groupId>org.eclipse.jetty</groupId>-->
             <!--<artifactId>jetty-ssl</artifactId>-->
         <!--</dependency>-->
 
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
         </dependency>
 

Modified: geronimo/sandbox/djencks/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/jetty7/pom.xml?rev=759104&r1=759103&r2=759104&view=diff
==============================================================================
--- geronimo/sandbox/djencks/jetty7/pom.xml (original)
+++ geronimo/sandbox/djencks/jetty7/pom.xml Fri Mar 27 11:21:58 2009
@@ -39,56 +39,61 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
-                <version>7.0-SNAPSHOT</version>
+                <version>7.0.0.incubation0-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.mortbay.jetty</groupId>
+                        <groupId>org.eclipse.jetty</groupId>
                         <artifactId>servlet-api</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-ajp</artifactId>
-                <version>7.0-SNAPSHOT</version>
+                <version>7.0.0.incubation0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
-                <version>7.0-SNAPSHOT</version>
+                <version>7.0.0.incubation0-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.mortbay.jetty</groupId>
+                        <groupId>org.eclipse.jetty</groupId>
                         <artifactId>servlet-api</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-util</artifactId>
-                <version>7.0-SNAPSHOT</version>
+                <version>7.0.0.incubation0-SNAPSHOT</version>
             </dependency>
             
             <dependency>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-webapp</artifactId>
-                <version>7.0-SNAPSHOT</version>
+                <version>7.0.0.incubation0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-security</artifactId>
-                <version>7.0-SNAPSHOT</version>
+                <version>7.0.0.incubation0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-jaspi</artifactId>
+                <version>7.0.0.incubation0-SNAPSHOT</version>
             </dependency>
             <!-- for JAASLoginModule which we probably don't want -->
             <!--<dependency>-->
-                <!--<groupId>org.mortbay.jetty</groupId>-->
+                <!--<groupId>org.eclipse.jetty</groupId>-->
                 <!--<artifactId>jetty-plus</artifactId>-->
-                <!--<version>7.0-SNAPSHOT</version>-->
+                <!--<version>7.0.0.incubation0-SNAPSHOT</version>-->
             <!--</dependency>-->
 
         </dependencies>



Mime
View raw message