diff --git a/plugins/org.eclipse.jst.server.core/component.xml b/plugins/org.eclipse.jst.server.core/component.xml
index 9628870..b81ce33 100644
--- a/plugins/org.eclipse.jst.server.core/component.xml
+++ b/plugins/org.eclipse.jst.server.core/component.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="jst.server"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.server.core" fragment="false"/><plugin id="org.eclipse.jst.server.generic.core" fragment="false"/><plugin id="org.eclipse.jst.server.generic.serverdefinitions" fragment="false"/><plugin id="org.eclipse.jst.server.generic.ui" fragment="false"/><plugin id="org.eclipse.jst.server.tomcat.core" fragment="false"/><plugin id="org.eclipse.jst.server.tomcat.ui" fragment="false"/><plugin id="org.eclipse.jst.server.ui" fragment="false"/><package name="org.eclipse.jst.server.core"><type name="IConnectorModule"/><type name="IEJBModule"/><type name="IJ2EEModule"/><type name="Servlet"/><type name="ILooseArchiveSupport"/><type name="ILooseArchive"/><type name="IWebModule"/><type name="IEnterpriseApplication"/><type name="JndiObject"/><type name="ClasspathRuntimeTargetHandler"/><type name="IApplicationClientModule"/><type name="GenericRuntimeUtil" implement="false" subclass="false" instantiate="false"/><type name="EJBBean"/><type name="JndiLaunchable"/></package><package name="org.eclipse.jst.server.generic.servertype.definition"></package></component>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.server"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.server.core" fragment="false"/><plugin id="org.eclipse.jst.server.generic.core" fragment="false"/><plugin id="org.eclipse.jst.server.generic.serverdefinitions" fragment="false"/><plugin id="org.eclipse.jst.server.generic.ui" fragment="false"/><plugin id="org.eclipse.jst.server.tomcat.core" fragment="false"/><plugin id="org.eclipse.jst.server.tomcat.ui" fragment="false"/><plugin id="org.eclipse.jst.server.ui" fragment="false"/><package name="org.eclipse.jst.server.core"><type name="IConnectorModule"/><type name="IEJBModule"/><type name="IJ2EEModule"/><type name="Servlet"/><type name="ILooseArchiveSupport"/><type name="ILooseArchive"/><type name="IWebModule"/><type name="IEnterpriseApplication"/><type name="JndiObject"/><type name="ClasspathRuntimeTargetHandler"/><type name="IApplicationClientModule"/><type name="GenericRuntimeUtil" implement="false" subclass="false" instantiate="false"/><type name="EJBBean"/><type name="JndiLaunchable"/></package><package name="org.eclipse.jst.server.generic.servertype.definition"></package></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/component.xml b/plugins/org.eclipse.wst.internet.monitor.core/component.xml
index defe650..bbc5ba3 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/component.xml
+++ b/plugins/org.eclipse.wst.internet.monitor.core/component.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="wst.internet"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.internet.monitor.core" fragment="false"/><plugin id="org.eclipse.wst.internet.monitor.ui" fragment="false"/><plugin id="org.eclipse.wst.internet.proxy" fragment="false"/><plugin id="org.eclipse.wst.internet.webbrowser" fragment="false"/><package name="org.eclipse.wst.internet.monitor.core"><type name="IRequestListener" implement="false" subclass="false" instantiate="false"/><type name="MonitorCore" implement="false" subclass="false" instantiate="false"/><type name="IMonitorWorkingCopy" implement="false" subclass="false" instantiate="false"/><type name="ContentFilterDelegate"/><type name="Request"/><type name="IMonitorListener" subclass="false"/><type name="IMonitor" implement="false" subclass="false" instantiate="false"/></package><package name="org.eclipse.wst.internet.monitor.ui"><type name="MonitorUICore" implement="false" subclass="false" instantiate="false"/><type name="ContentViewer"/></package><package name="org.eclipse.wst.internet.webbrowser"><type name="ToolbarBrowser"/><type name="IWebBrowser" implement="false" subclass="false"/><type name="WebBrowser" implement="false" subclass="false"/></package></component>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.internet"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.internet.monitor.core" fragment="false"/><plugin id="org.eclipse.wst.internet.monitor.ui" fragment="false"/><plugin id="org.eclipse.wst.internet.proxy" fragment="false"/><plugin id="org.eclipse.wst.internet.webbrowser" fragment="false"/><package name="org.eclipse.wst.internet.monitor.core"><type name="IRequestListener" implement="false" subclass="false" instantiate="false"/><type name="MonitorCore" implement="false" subclass="false" instantiate="false"/><type name="IMonitorWorkingCopy" implement="false" subclass="false" instantiate="false"/><type name="ContentFilterDelegate"/><type name="Request"/><type name="IMonitorListener" subclass="false"/><type name="IMonitor" implement="false" subclass="false" instantiate="false"/></package><package name="org.eclipse.wst.internet.monitor.ui"><type name="MonitorUICore" implement="false" subclass="false" instantiate="false"/><type name="ContentViewer"/></package><package name="org.eclipse.wst.internet.webbrowser"><type name="ToolbarBrowser"/><type name="IWebBrowser" implement="false" subclass="false"/><type name="WebBrowser" implement="false" subclass="false"/></package></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.core/component.xml b/plugins/org.eclipse.wst.server.core/component.xml
index 5e0213c..a2d86fb 100644
--- a/plugins/org.eclipse.wst.server.core/component.xml
+++ b/plugins/org.eclipse.wst.server.core/component.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="wst.server"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.server.core" fragment="false"/><plugin id="org.eclipse.wst.server.ui" fragment="false"/><plugin id="org.eclipse.wst.server.util" fragment="false"/><package name="org.eclipse.wst.server.core.util"></package><package name="org.eclipse.wst.server.core.model"><type name="RuntimeTargetHandlerDelegate"/><type name="IURLProvider" subclass="false"/><type name="ServerLocatorDelegate"/><type name="IModuleFactoryListener"/><type name="ModuleFactoryEvent"/><type name="ModuleEvent"/><type name="IModuleResource"/><type name="IModuleListener"/><type name="ModuleFactoryDelegate"/><type name="IRunningActionServer"/><type name="IModuleResourceDeltaVisitor"/><type name="IModuleEventsListener"/><type name="RuntimeLocatorDelegate"/><type name="IModuleFile"/><type name="IModuleResourceDelta"/><type name="ModuleArtifactAdapterDelegate"/><type name="IModuleFolder"/><type name="RuntimeDelegate"/><type name="ServerDelegate"/><type name="LaunchableAdapterDelegate"/><type name="ClientDelegate"/><type name="ModuleDelegate"/><type name="ServerTaskDelegate"/><type name="ServerBehaviourDelegate"/></package><package name="org.eclipse.wst.server.ui.editor"><type name="ICommandManager"/><type name="IServerEditorSection"/><type name="ServerEditorPart"/><type name="ServerEditorPartFactoryDelegate"/><type name="ServerEditorSection"/><type name="ServerEditorPageSectionFactoryDelegate"/><type name="ServerEditorActionFactoryDelegate"/><type name="IServerEditorPartInput"/></package><package name="org.eclipse.wst.server.ui.wizard"><type name="TaskWizardPage"/><type name="IWizardHandle"/><type name="TaskWizard"/><type name="WizardFragment"/></package><package name="org.eclipse.wst.server.ui"><type name="ServerLaunchConfigurationTab"/><type name="ServerUIUtil" implement="false" subclass="false" instantiate="false"/><type name="ServerUICore" implement="false" subclass="false" instantiate="false"/></package><package name="org.eclipse.wst.server.ui.actions"></package><package name="org.eclipse.wst.server.core"><type name="IServer" implement="false" subclass="false" instantiate="false"/><type name="IModuleType" implement="false" subclass="false" instantiate="false"/><type name="ServerUtil" implement="false" subclass="false" instantiate="false"/><type name="IServerAttributes" implement="false" subclass="false" instantiate="false"/><type name="IOptionalTask" instantiate="false"/><type name="ITask" instantiate="false"/><type name="IRuntimeWorkingCopy" implement="false" subclass="false" instantiate="false"/><type name="IServerListener" subclass="false" instantiate="false"/><type name="IRuntime" implement="false" subclass="false" instantiate="false"/><type name="IServerType" implement="false" subclass="false" instantiate="false"/><type name="IModule" implement="false" subclass="false" instantiate="false"/><type name="IRuntimeLifecycleListener" subclass="false" instantiate="false"/><type name="IProjectProperties" implement="false" subclass="false" instantiate="false"/><type name="IServerLifecycleListener" subclass="false" instantiate="false"/><type name="IRuntimeTargetHandler" implement="false" subclass="false" instantiate="false"/><type name="ServerCore" implement="false" subclass="false" instantiate="false"/><type name="IServerWorkingCopy" implement="false" subclass="false" instantiate="false"/><type name="IServerPort" instantiate="false"/><type name="IRuntimeType" implement="false" subclass="false" instantiate="false"/><type name="TaskModel" implement="false"/><type name="IModuleArtifact" implement="false" subclass="false" instantiate="false"/></package></component>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.server"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.server.core" fragment="false"/><plugin id="org.eclipse.wst.server.ui" fragment="false"/><plugin id="org.eclipse.wst.server.util" fragment="false"/><package name="org.eclipse.wst.server.core.util"></package><package name="org.eclipse.wst.server.core.model"><type name="RuntimeTargetHandlerDelegate"/><type name="IURLProvider" subclass="false"/><type name="ServerLocatorDelegate"/><type name="IModuleFactoryListener"/><type name="ModuleFactoryEvent"/><type name="ModuleEvent"/><type name="IModuleResource"/><type name="IModuleListener"/><type name="ModuleFactoryDelegate"/><type name="IRunningActionServer"/><type name="IModuleResourceDeltaVisitor"/><type name="IModuleEventsListener"/><type name="RuntimeLocatorDelegate"/><type name="IModuleFile"/><type name="IModuleResourceDelta"/><type name="ModuleArtifactAdapterDelegate"/><type name="IModuleFolder"/><type name="RuntimeDelegate"/><type name="ServerDelegate"/><type name="LaunchableAdapterDelegate"/><type name="ClientDelegate"/><type name="ModuleDelegate"/><type name="ServerTaskDelegate"/><type name="ServerBehaviourDelegate"/></package><package name="org.eclipse.wst.server.ui.editor"><type name="ICommandManager"/><type name="IServerEditorSection"/><type name="ServerEditorPart"/><type name="ServerEditorPartFactoryDelegate"/><type name="ServerEditorSection"/><type name="ServerEditorPageSectionFactoryDelegate"/><type name="ServerEditorActionFactoryDelegate"/><type name="IServerEditorPartInput"/></package><package name="org.eclipse.wst.server.ui.wizard"><type name="TaskWizardPage"/><type name="IWizardHandle"/><type name="TaskWizard"/><type name="WizardFragment"/></package><package name="org.eclipse.wst.server.ui"><type name="ServerLaunchConfigurationTab"/><type name="ServerUIUtil" implement="false" subclass="false" instantiate="false"/><type name="ServerUICore" implement="false" subclass="false" instantiate="false"/></package><package name="org.eclipse.wst.server.ui.actions"></package><package name="org.eclipse.wst.server.core"><type name="IServer" implement="false" subclass="false" instantiate="false"/><type name="IModuleType" implement="false" subclass="false" instantiate="false"/><type name="ServerUtil" implement="false" subclass="false" instantiate="false"/><type name="IServerAttributes" implement="false" subclass="false" instantiate="false"/><type name="IOptionalTask" instantiate="false"/><type name="ITask" instantiate="false"/><type name="IRuntimeWorkingCopy" implement="false" subclass="false" instantiate="false"/><type name="IServerListener" subclass="false" instantiate="false"/><type name="IRuntime" implement="false" subclass="false" instantiate="false"/><type name="IServerType" implement="false" subclass="false" instantiate="false"/><type name="IModule" implement="false" subclass="false" instantiate="false"/><type name="IRuntimeLifecycleListener" subclass="false" instantiate="false"/><type name="IProjectProperties" implement="false" subclass="false" instantiate="false"/><type name="IServerLifecycleListener" subclass="false" instantiate="false"/><type name="IRuntimeTargetHandler" implement="false" subclass="false" instantiate="false"/><type name="ServerCore" implement="false" subclass="false" instantiate="false"/><type name="IServerWorkingCopy" implement="false" subclass="false" instantiate="false"/><type name="IServerPort" instantiate="false"/><type name="IRuntimeType" implement="false" subclass="false" instantiate="false"/><type name="TaskModel" implement="false"/><type name="IModuleArtifact" implement="false" subclass="false" instantiate="false"/></package></component>
\ No newline at end of file