Bug 331607 renaming work

18 files changed, 92 insertions, 92 deletions

diff --git a/org.eclipse.jst.server.jetty.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jst.server.jetty.core/.settings/org.eclipse.jdt.core.prefs
index cb86080..9eef5c3 100644
--- a/org.eclipse.jst.server.jetty.core/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jst.server.jetty.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Nov 02 18:41:57 CDT 2010
+#Wed Nov 17 15:56:50 CST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
diff --git a/org.eclipse.jst.server.jetty.core/plugin.properties b/org.eclipse.jst.server.jetty.core/plugin.properties
index a34efda..f5849b5 100644
--- a/org.eclipse.jst.server.jetty.core/plugin.properties
+++ b/org.eclipse.jst.server.jetty.core/plugin.properties
@@ -13,16 +13,16 @@ providerName=Eclipse.org - Jetty
 

 # --------------- Runtime Types ---------------

 jetty=Jetty

-runtimeTypeJetty70Label=Jetty v7.0

-runtimeTypeJetty70Description=Jetty v7.0 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.

-runtimeTypeJetty80Label=Jetty v8.0

-runtimeTypeJetty80Description=Jetty v8.0 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.

+runtimeTypeJetty7Label=Jetty v7.x

+runtimeTypeJetty7Description=Jetty v7.0 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.

+runtimeTypeJetty8Label=Jetty v8.x

+runtimeTypeJetty8Description=Jetty v8.0 supports J2EE 1.2, 1.3, 1.4, and Java EE 5 and 6 Web modules.

 

 # --------------- Servers ---------------

-jetty70ServerType=Jetty v7.0 Server

-jetty70ServerDescription=Publishes and runs J2EE and Java EE Web projects and server configurations to a local Jetty server.

-jetty80ServerType=Jetty v8.0 Server

-jetty80ServerDescription=Publishes and runs J2EE and Java EE Web projects and server configurations to a local Jetty server.

+jetty7ServerType=Jetty v7.x Server

+jetty7ServerDescription=Publishes and runs J2EE and Java EE Web projects and server configurations to a local Jetty server.

+jetty8ServerType=Jetty v8.x Server

+jetty8ServerDescription=Publishes and runs J2EE and Java EE Web projects and server configurations to a local Jetty server.

 

 jettyLaunchConfigurationType=Jetty

 

diff --git a/org.eclipse.jst.server.jetty.core/plugin.xml b/org.eclipse.jst.server.jetty.core/plugin.xml
index deb0271..eb68775 100644
--- a/org.eclipse.jst.server.jetty.core/plugin.xml
+++ b/org.eclipse.jst.server.jetty.core/plugin.xml
@@ -16,9 +16,9 @@
   <extension point="org.eclipse.wst.server.core.runtimeTypes">

   

     <runtimeType

-       id="org.eclipse.jst.server.jetty.runtime.70"

-       name="%runtimeTypeJetty70Label"

-       description="%runtimeTypeJetty70Description"

+       id="org.eclipse.jst.server.jetty.runtime.7"

+       name="%runtimeTypeJetty7Label"

+       description="%runtimeTypeJetty7Description"

        vendor="%jetty"

        version="7.0"

        class="org.eclipse.jst.server.jetty.core.internal.JettyRuntime">

@@ -31,9 +31,9 @@
     </runtimeType>

     

     <runtimeType

-       id="org.eclipse.jst.server.jetty.runtime.80"

-       name="%runtimeTypeJetty80Label"

-       description="%runtimeTypeJetty80Description"

+       id="org.eclipse.jst.server.jetty.runtime.8"

+       name="%runtimeTypeJetty8Label"

+       description="%runtimeTypeJetty8Description"

        vendor="%jetty"

        version="8.0"

        class="org.eclipse.jst.server.jetty.core.internal.JettyRuntime">

@@ -65,9 +65,9 @@
              

   <extension point="org.eclipse.wst.server.core.serverTypes">

      <serverType

-       id="org.eclipse.jst.server.jetty.70"

-       name="%jetty70ServerType"

-       description="%jetty70ServerDescription"

+       id="org.eclipse.jst.server.jetty.7"

+       name="%jetty7ServerType"

+       description="%jetty7ServerDescription"

        supportsRemoteHosts="false"

        runtime="true"

        startTimeout="30000"

@@ -75,15 +75,15 @@
        initialState="stopped"

        hasConfiguration="true"

        launchConfigId="org.eclipse.jst.server.jetty.core.launchConfigurationType"

-       runtimeTypeId="org.eclipse.jst.server.jetty.runtime.70"

+       runtimeTypeId="org.eclipse.jst.server.jetty.runtime.7"

        class="org.eclipse.jst.server.jetty.core.internal.JettyServer"

        behaviourClass="org.eclipse.jst.server.jetty.core.internal.JettyServerBehaviour">

      </serverType>

      

      <serverType

-       id="org.eclipse.jst.server.jetty.80"

-       name="%jetty80ServerType"

-       description="%jetty80ServerDescription"

+       id="org.eclipse.jst.server.jetty.8"

+       name="%jetty8ServerType"

+       description="%jetty8ServerDescription"

        supportsRemoteHosts="false"

        runtime="true"

        startTimeout="30000"

@@ -91,7 +91,7 @@
        initialState="stopped"

        hasConfiguration="true"

        launchConfigId="org.eclipse.jst.server.jetty.core.launchConfigurationType"

-       runtimeTypeId="org.eclipse.jst.server.jetty.runtime.80"

+       runtimeTypeId="org.eclipse.jst.server.jetty.runtime.8"

        class="org.eclipse.jst.server.jetty.core.internal.JettyServer"

        behaviourClass="org.eclipse.jst.server.jetty.core.internal.JettyServerBehaviour">

      </serverType>     

@@ -140,11 +140,11 @@
 

     <runtime-component-version

        type="org.eclipse.jst.server.jetty"

-       version="7.0"/>

+       version="7.x"/>

 

     <runtime-component-version

        type="org.eclipse.jst.server.jetty"

-       version="8.0"/>

+       version="8.x"/>

 

     <adapter>

       <runtime-component

@@ -192,26 +192,26 @@
   

   <extension point="org.eclipse.jst.server.core.runtimeFacetMappings">

     <runtimeFacetMapping

-      runtimeTypeId="org.eclipse.jst.server.jetty.runtime.70"

+      runtimeTypeId="org.eclipse.jst.server.jetty.runtime.7"

       runtime-component="org.eclipse.jst.server.jetty"

-      version="7.0"/>

+      version="7.x"/>

     <runtimeFacetMapping

-      runtimeTypeId="org.eclipse.jst.server.jetty.runtime.80"

+      runtimeTypeId="org.eclipse.jst.server.jetty.runtime.8"

       runtime-component="org.eclipse.jst.server.jetty"

-      version="8.0"/>

+      version="8.x"/>

   </extension>

           

   <extension point="org.eclipse.wst.server.core.installableRuntimes">

     <runtime

-      id="org.eclipse.jst.server.jetty.runtime.70"

+      id="org.eclipse.jst.server.jetty.runtime.7"

       licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"

       archiveUrl="http://download.eclipse.org/jetty/7.2.1.v20101111/dist/jetty-distribution-7.2.1.v20101111.zip"

       archivePath="jetty-distribution-7.2.1.v20101111" />

 	  <runtime

-      id="org.eclipse.jst.server.jetty.runtime.80"

+      id="org.eclipse.jst.server.jetty.runtime.8"

       licenseUrl="http://www.apache.org/licenses/LICENSE-2.0.txt"

-      archiveUrl="http://download.eclipse.org/jetty/8.0.0.M1/dist/jetty-distribution-8.0.0.M1.zip"

-      archivePath="jetty-distribution-8.0.0.M1" />      

+      archiveUrl="http://download.eclipse.org/jetty/8.0.0.M2/dist/jetty-distribution-8.0.0.M2.zip"

+      archivePath="jetty-distribution-8.0.0.M2" />      

   </extension>          

           

 </plugin>    
\ No newline at end of file
diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyVersionManager.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyVersionManager.java
index 87e8336..2adb57c 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyVersionManager.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/JettyVersionManager.java
@@ -20,8 +20,8 @@ import java.util.Map;
 

 import org.eclipse.core.resources.IFolder;

 import org.eclipse.jst.server.jetty.core.IJettyConfiguration;

-import org.eclipse.jst.server.jetty.core.internal.jetty70.Jetty70Provider;

-import org.eclipse.jst.server.jetty.core.internal.jetty80.Jetty80Provider;

+import org.eclipse.jst.server.jetty.core.internal.jetty7.Jetty7Provider;

+import org.eclipse.jst.server.jetty.core.internal.jetty8.Jetty8Provider;

 

 public class JettyVersionManager

 {

@@ -40,9 +40,9 @@ public class JettyVersionManager
     private JettyVersionManager()

     {

         // Jetty 7.0

-        register(JettyVersion.V70,Jetty70Provider.INSTANCE);

+        register(JettyVersion.V70,Jetty7Provider.INSTANCE);

         // Jetty 8.0, same than Jetty7.0

-        register(JettyVersion.V80,Jetty80Provider.INSTANCE);

+        register(JettyVersion.V80,Jetty8Provider.INSTANCE);

     }

 

     public void register(JettyVersion version, IJettyVersionProvider versionProvider)

diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty70/Jetty70Configuration.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty7/Jetty7Configuration.java
index 60f8427..10cea8d 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty70/Jetty70Configuration.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty7/Jetty7Configuration.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation 

  *******************************************************************************/

-package org.eclipse.jst.server.jetty.core.internal.jetty70;

+package org.eclipse.jst.server.jetty.core.internal.jetty7;

 

 import java.beans.PropertyChangeEvent;

 import java.beans.PropertyChangeListener;

@@ -43,18 +43,18 @@ import org.eclipse.jst.server.jetty.core.internal.config.StartIni;
 import org.eclipse.jst.server.jetty.core.internal.config.WebdefaultXMLConfig;

 import org.eclipse.jst.server.jetty.core.internal.util.IOUtils;

 import org.eclipse.jst.server.jetty.core.internal.xml.Factory;

-import org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.ServerInstance;

-import org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server.Connector;

-import org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server.Server;

-import org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server.WebApp;

-import org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.webapp.WebAppContext;

+import org.eclipse.jst.server.jetty.core.internal.xml.jetty7.ServerInstance;

+import org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server.Connector;

+import org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server.Server;

+import org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server.WebApp;

+import org.eclipse.jst.server.jetty.core.internal.xml.jetty7.webapp.WebAppContext;

 import org.eclipse.osgi.util.NLS;

 import org.eclipse.wst.server.core.ServerPort;

 

-public class Jetty70Configuration extends JettyConfiguration implements JettyConstants

+public class Jetty7Configuration extends JettyConfiguration implements JettyConstants

 {

 

-    public Jetty70Configuration(IFolder path)

+    public Jetty7Configuration(IFolder path)

     {

         super(path);

     }

@@ -338,7 +338,7 @@ public class Jetty70Configuration extends JettyConfiguration implements JettyCon
 

                     jettyPath = jettyXMLConfig.getPath();

                     serverFactory = new Factory();

-                    serverFactory.setPackageName("org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server");

+                    serverFactory.setPackageName("org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server");

                     server = (Server)serverFactory.loadDocument(JettyXMLConfig.getInputStream(file));

                     server.setFile(file);

                     server.setPath(jettyPath);

@@ -354,7 +354,7 @@ public class Jetty70Configuration extends JettyConfiguration implements JettyCon
                 IPath webAppPath = pathFileConfig.getPath();

 

                 Factory webdefaultFactory = new Factory();

-                webdefaultFactory.setPackageName("org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server");

+                webdefaultFactory.setPackageName("org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server");

                 webApp = (WebApp)webdefaultFactory.loadDocument(WebdefaultXMLConfig.getInputStream(webAppFile));

                 webApp.setFile(webAppFile);

                 webApp.setPath(webAppPath);

@@ -391,7 +391,7 @@ public class Jetty70Configuration extends JettyConfiguration implements JettyCon
         }

         catch (Exception e)

         {

-            Trace.trace(Trace.WARNING,"Could not load Jetty v7.0 configuration from " + path.toOSString() + ": " + e.getMessage());

+            Trace.trace(Trace.WARNING,"Could not load Jetty v7.x configuration from " + path.toOSString() + ": " + e.getMessage());

             throw new CoreException(new Status(IStatus.ERROR,JettyPlugin.PLUGIN_ID,0,NLS.bind(Messages.errorCouldNotLoadConfiguration,path.toOSString()),e));

         }

     }

@@ -421,7 +421,7 @@ public class Jetty70Configuration extends JettyConfiguration implements JettyCon
                     file = jettyXMLConfig.getFile();

                     jettyPath = jettyXMLConfig.getPath();

                     serverFactory = new Factory();

-                    serverFactory.setPackageName("org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server");

+                    serverFactory.setPackageName("org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server");

                     server = (Server)serverFactory.loadDocument(new FileInputStream(file));

                     server.setFile(file);

                     server.setPath(jettyPath);

@@ -443,7 +443,7 @@ public class Jetty70Configuration extends JettyConfiguration implements JettyCon
                 IPath webAppPath = pathFileConfig.getPath();

 

                 Factory webdefaultFactory = new Factory();

-                webdefaultFactory.setPackageName("org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server");

+                webdefaultFactory.setPackageName("org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server");

                 webApp = (WebApp)webdefaultFactory.loadDocument(new FileInputStream(webAppFile));

                 webApp.setFile(webAppFile);

                 webApp.setPath(webAppPath);

@@ -493,7 +493,7 @@ public class Jetty70Configuration extends JettyConfiguration implements JettyCon
         }

         catch (Exception e)

         {

-            Trace.trace(Trace.WARNING,"Could not reload Jetty v7.0 configuration from: " + folder.getFullPath() + ": " + e.getMessage());

+            Trace.trace(Trace.WARNING,"Could not reload Jetty v7.x configuration from: " + folder.getFullPath() + ": " + e.getMessage());

             throw new CoreException(new Status(IStatus.ERROR,JettyPlugin.PLUGIN_ID,0,NLS.bind(Messages.errorCouldNotLoadConfiguration,folder.getFullPath()

                     .toOSString()),e));

         }

@@ -574,7 +574,7 @@ public class Jetty70Configuration extends JettyConfiguration implements JettyCon
         }

         catch (Exception e)

         {

-            Trace.trace(Trace.SEVERE,"Could not save Jetty v7.0 configuration to " + folder.toString(),e);

+            Trace.trace(Trace.SEVERE,"Could not save Jetty v7.x configuration to " + folder.toString(),e);

             throw new CoreException(new Status(IStatus.ERROR,JettyPlugin.PLUGIN_ID,0,NLS.bind(Messages.errorCouldNotSaveConfiguration,new String[]

             { e.getLocalizedMessage() }),e));

         }

diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty70/Jetty70Handler.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty7/Jetty7Handler.java
index 59c4f7a..025660f 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty70/Jetty70Handler.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty7/Jetty7Handler.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation 

  *******************************************************************************/

-package org.eclipse.jst.server.jetty.core.internal.jetty70;

+package org.eclipse.jst.server.jetty.core.internal.jetty7;

 

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.IStatus;

@@ -22,7 +22,7 @@ import org.eclipse.jst.server.jetty.core.internal.Messages;
 import org.eclipse.jst.server.jetty.core.internal.util.JettyVersionHelper;

 import org.eclipse.wst.server.core.IModule;

 

-public class Jetty70Handler extends JettyHandler

+public class Jetty7Handler extends JettyHandler

 {

 

     protected static final IStatus startJarRequiredInstallDirStatus = new Status(IStatus.ERROR,JettyPlugin.PLUGIN_ID,0,

diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty70/Jetty70Provider.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty7/Jetty7Provider.java
index 38c6494..36dd928 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty70/Jetty70Provider.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty7/Jetty7Provider.java
@@ -8,19 +8,19 @@
  * Contributors:

  *     Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation 

  *******************************************************************************/

-package org.eclipse.jst.server.jetty.core.internal.jetty70;

+package org.eclipse.jst.server.jetty.core.internal.jetty7;

 

 import org.eclipse.core.resources.IFolder;

 import org.eclipse.jst.server.jetty.core.IJettyConfiguration;

 import org.eclipse.jst.server.jetty.core.internal.IJettyVersionHandler;

 import org.eclipse.jst.server.jetty.core.internal.IJettyVersionProvider;

 

-public class Jetty70Provider implements IJettyVersionProvider

+public class Jetty7Provider implements IJettyVersionProvider

 {

 

-    public static final IJettyVersionProvider INSTANCE = new Jetty70Provider();

+    public static final IJettyVersionProvider INSTANCE = new Jetty7Provider();

 

-    private IJettyVersionHandler versionHandler = new Jetty70Handler();

+    private IJettyVersionHandler versionHandler = new Jetty7Handler();

 

     public IJettyVersionHandler getJettyVersionHandler()

     {

@@ -29,6 +29,6 @@ public class Jetty70Provider implements IJettyVersionProvider
 

     public IJettyConfiguration createJettyConfiguration(IFolder path)

     {

-        return new Jetty70Configuration(path);

+        return new Jetty7Configuration(path);

     }

 }

diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty80/Jetty80Handler.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty8/Jetty8Handler.java
index 89cd3e9..8fb57fd 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty80/Jetty80Handler.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty8/Jetty8Handler.java
@@ -8,17 +8,17 @@
  * Contributors:

  *     Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation 

  *******************************************************************************/

-package org.eclipse.jst.server.jetty.core.internal.jetty80;

+package org.eclipse.jst.server.jetty.core.internal.jetty8;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

 import org.eclipse.jst.server.jetty.core.JettyPlugin;

 import org.eclipse.jst.server.jetty.core.internal.IJettyVersionHandler;

 import org.eclipse.jst.server.jetty.core.internal.Messages;

-import org.eclipse.jst.server.jetty.core.internal.jetty70.Jetty70Handler;

+import org.eclipse.jst.server.jetty.core.internal.jetty7.Jetty7Handler;

 import org.eclipse.wst.server.core.IModule;

 

-public class Jetty80Handler extends Jetty70Handler

+public class Jetty8Handler extends Jetty7Handler

 {

 

     /**

diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty80/Jetty80Provider.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty8/Jetty8Provider.java
index 9940ba3..132e3b8 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty80/Jetty80Provider.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/jetty8/Jetty8Provider.java
@@ -8,20 +8,20 @@
  * Contributors:

  *     Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation 

  *******************************************************************************/

-package org.eclipse.jst.server.jetty.core.internal.jetty80;

+package org.eclipse.jst.server.jetty.core.internal.jetty8;

 

 import org.eclipse.core.resources.IFolder;

 import org.eclipse.jst.server.jetty.core.IJettyConfiguration;

 import org.eclipse.jst.server.jetty.core.internal.IJettyVersionHandler;

 import org.eclipse.jst.server.jetty.core.internal.IJettyVersionProvider;

-import org.eclipse.jst.server.jetty.core.internal.jetty70.Jetty70Configuration;

+import org.eclipse.jst.server.jetty.core.internal.jetty7.Jetty7Configuration;

 

-public class Jetty80Provider implements IJettyVersionProvider

+public class Jetty8Provider implements IJettyVersionProvider

 {

 

-    public static final IJettyVersionProvider INSTANCE = new Jetty80Provider();

+    public static final IJettyVersionProvider INSTANCE = new Jetty8Provider();

 

-    private IJettyVersionHandler versionHandler = new Jetty80Handler();

+    private IJettyVersionHandler versionHandler = new Jetty8Handler();

 

     public IJettyVersionHandler getJettyVersionHandler()

     {

@@ -30,6 +30,6 @@ public class Jetty80Provider implements IJettyVersionProvider
 

     public IJettyConfiguration createJettyConfiguration(IFolder path)

     {

-        return new Jetty70Configuration(path);

+        return new Jetty7Configuration(path);

     }

 }

diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/ServerInstance.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/ServerInstance.java
index a1790be..6415295 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/ServerInstance.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/ServerInstance.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation 

  *******************************************************************************/

-package org.eclipse.jst.server.jetty.core.internal.xml.jetyy70;

+package org.eclipse.jst.server.jetty.core.internal.xml.jetty7;

 

 import java.io.ByteArrayInputStream;

 import java.io.File;

@@ -27,10 +27,10 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jst.server.core.internal.ProgressUtil;

 import org.eclipse.jst.server.jetty.core.internal.util.IOUtils;

 import org.eclipse.jst.server.jetty.core.internal.xml.Factory;

-import org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server.Connector;

-import org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server.Server;

-import org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server.WebApp;

-import org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.webapp.WebAppContext;

+import org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server.Connector;

+import org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server.Server;

+import org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server.WebApp;

+import org.eclipse.jst.server.jetty.core.internal.xml.jetty7.webapp.WebAppContext;

 import org.xml.sax.SAXException;

 

 public class ServerInstance

@@ -196,7 +196,7 @@ public class ServerInstance
     private WebAppContext createContext(InputStream stream) throws IOException, SAXException

     {

         Factory webAppContextFactory = new Factory();

-        webAppContextFactory.setPackageName("org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.webapp");

+        webAppContextFactory.setPackageName("org.eclipse.jst.server.jetty.core.internal.xml.jetty70.webapp");

         WebAppContext context = (WebAppContext)webAppContextFactory.loadDocument(stream);

         webAppContexts.add(context);

         return context;

diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/server/Connector.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/server/Connector.java
index b37504a..2e7df37 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/server/Connector.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/server/Connector.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation 

  *******************************************************************************/

-package org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server;

+package org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server;

 

 import org.w3c.dom.Element;

 import org.w3c.dom.Node;

diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/server/Server.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/server/Server.java
index aad7737..df8186e 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/server/Server.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/server/Server.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation 

  *******************************************************************************/

-package org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server;

+package org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server;

 

 import java.io.File;

 import java.util.ArrayList;

diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/server/WebApp.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/server/WebApp.java
index 80ec428..8cb9601 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/server/WebApp.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/server/WebApp.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation 

  *******************************************************************************/

-package org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.server;

+package org.eclipse.jst.server.jetty.core.internal.xml.jetty7.server;

 

 import java.io.File;

 

diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/webapp/WebAppContext.java b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/webapp/WebAppContext.java
index f476d74..540d61b 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/webapp/WebAppContext.java
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/webapp/WebAppContext.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation 

  *******************************************************************************/

-package org.eclipse.jst.server.jetty.core.internal.xml.jetyy70.webapp;

+package org.eclipse.jst.server.jetty.core.internal.xml.jetty7.webapp;

 

 import java.io.File;

 import java.io.IOException;

diff --git a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/webapp/WebAppContext.xml b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/webapp/WebAppContext.xml
index 46c451d..46c451d 100644
--- a/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetyy70/webapp/WebAppContext.xml
+++ b/org.eclipse.jst.server.jetty.core/src/org/eclipse/jst/server/jetty/core/internal/xml/jetty7/webapp/WebAppContext.xml
diff --git a/org.eclipse.jst.server.jetty.ui.websocket/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jst.server.jetty.ui.websocket/.settings/org.eclipse.jdt.core.prefs
index 2cf69bc..37c1f59 100644
--- a/org.eclipse.jst.server.jetty.ui.websocket/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jst.server.jetty.ui.websocket/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Nov 02 18:42:50 CDT 2010
+#Wed Nov 17 15:57:23 CST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
diff --git a/org.eclipse.jst.server.jetty.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jst.server.jetty.ui/.settings/org.eclipse.jdt.core.prefs
index 51a440b..48dbe8f 100644
--- a/org.eclipse.jst.server.jetty.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jst.server.jetty.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Nov 02 18:42:31 CDT 2010
+#Wed Nov 17 15:57:07 CST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
diff --git a/org.eclipse.jst.server.jetty.ui/plugin.xml b/org.eclipse.jst.server.jetty.ui/plugin.xml
index da93605..07436a2 100644
--- a/org.eclipse.jst.server.jetty.ui/plugin.xml
+++ b/org.eclipse.jst.server.jetty.ui/plugin.xml
@@ -14,22 +14,22 @@
 <plugin>

 <extension point="org.eclipse.wst.server.ui.serverImages">

       <image

-         id="org.eclipse.jst.server.jetty.70"

+         id="org.eclipse.jst.server.jetty.7"

          icon="icons/obj16/jetty.gif"

-         typeIds="org.eclipse.jst.server.jetty.runtime.70"/>

+         typeIds="org.eclipse.jst.server.jetty.runtime.7"/>

       <image

-         id="org.eclipse.jst.server.jetty.80"

+         id="org.eclipse.jst.server.jetty.8"

          icon="icons/obj16/jetty.gif"

-         typeIds="org.eclipse.jst.server.jetty.runtime.80"/>

+         typeIds="org.eclipse.jst.server.jetty.runtime.8"/>

 

       <image

-         id="org.eclipse.jst.server.jetty.70"

+         id="org.eclipse.jst.server.jetty.7"

          icon="icons/obj16/jetty.gif"

-         typeIds="org.eclipse.jst.server.jetty.70"/>

+         typeIds="org.eclipse.jst.server.jetty.7"/>

       <image

-         id="org.eclipse.jst.server.jetty.80"

+         id="org.eclipse.jst.server.jetty.8"

          icon="icons/obj16/jetty.gif"

-         typeIds="org.eclipse.jst.server.jetty.80"/>

+         typeIds="org.eclipse.jst.server.jetty.8"/>

    </extension>

    

    <extension point="org.eclipse.core.expressions.propertyTesters">

@@ -70,12 +70,12 @@
       

    <extension point="org.eclipse.wst.server.ui.wizardFragments">

       <fragment

-         id="org.eclipse.jst.server.jetty.runtime.70"

-         typeIds="org.eclipse.jst.server.jetty.runtime.70"

+         id="org.eclipse.jst.server.jetty.runtime.7"

+         typeIds="org.eclipse.jst.server.jetty.runtime.7"

          class="org.eclipse.jst.server.jetty.ui.internal.JettyRuntimeWizardFragment"/>

       <fragment

-         id="org.eclipse.jst.server.jetty.runtime.80"

-         typeIds="org.eclipse.jst.server.jetty.runtime.80"

+         id="org.eclipse.jst.server.jetty.runtime.8"

+         typeIds="org.eclipse.jst.server.jetty.runtime.8"

          class="org.eclipse.jst.server.jetty.ui.internal.JettyRuntimeWizardFragment"/>         

    </extension>