From: pombredanne <pombredanne>
Date: Tue, 17 Oct 2006 19:43:29 +0000 (+0000)
Subject: Bug 579207: Upgrade all manifest to OSGI style and 3.2
X-Git-Url: http://git.phpeclipse.com?hp=0bb7de6aeb47675cd5c5ba93850c99c7f913277f

Bug 579207: Upgrade all manifest to OSGI style and 3.2
---

diff --git a/net.sourceforge.phpeclipse.core/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..249e4d7
--- /dev/null
+++ b/net.sourceforge.phpeclipse.core/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: PHPeclipse Web Development Tools Core
+Bundle-SymbolicName: net.sourceforge.phpeclipse.core
+Bundle-Version: 1.1.9
+Bundle-ClassPath: webcore.jar
+Bundle-Activator: net.sourceforge.phpeclipse.core.WebCore
+Bundle-Vendor: PHPEclipse project team
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpeclipse.core,
+ net.sourceforge.phpeclipse.core.model
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.text
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.core/plugin.xml b/net.sourceforge.phpeclipse.core/plugin.xml
deleted file mode 100644
index 4648611..0000000
--- a/net.sourceforge.phpeclipse.core/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.core"
-   name="PHPeclipse Web Development Tools Core"
-   version="1.1.9"
-   provider-name="WDTE Project/PHPeclipse"
-   class="net.sourceforge.phpeclipse.core.WebCore">
-
-   <runtime>
-      <library name="webcore.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.text"/>
-   </requires>
-
-
-</plugin>
diff --git a/net.sourceforge.phpeclipse.debug.core/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.debug.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..1f0be88
--- /dev/null
+++ b/net.sourceforge.phpeclipse.debug.core/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Plugin.name
+Bundle-SymbolicName: net.sourceforge.phpeclipse.debug.core; singleton:=true
+Bundle-Version: 1.1.9
+Bundle-ClassPath: core.jar
+Bundle-Activator: net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin
+Bundle-Vendor: PHPEclipse project team
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpdt.debug.core,
+ net.sourceforge.phpdt.internal.debug.core,
+ net.sourceforge.phpdt.internal.debug.core.breakpoints,
+ net.sourceforge.phpdt.internal.debug.core.model,
+ net.sourceforge.phpdt.internal.debug.core.watch
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ net.sourceforge.phpeclipse
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.debug.core/plugin.xml b/net.sourceforge.phpeclipse.debug.core/plugin.xml
index 5d83786..ce7822f 100644
--- a/net.sourceforge.phpeclipse.debug.core/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.core/plugin.xml
@@ -1,26 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.debug.core"
-   name="%Plugin.name"
-   version="1.1.9"
-   provider-name="phpeclipse.de"
-   class="net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin">
-
-   <runtime>
-      <library name="core.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-	  <import plugin="org.eclipse.ui"/>   
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="net.sourceforge.phpeclipse"/>
-   </requires>
-
-<!-- Extensions -->
+<?eclipse version="3.2"?>
+<plugin>
    <extension id="phpBreakpointMarker" point="org.eclipse.core.resources.markers">
       <super type="org.eclipse.debug.core.breakpointMarker"/>
    </extension>
@@ -44,7 +24,6 @@
       </breakpoint>
    </extension>
    
-   
    <extension point="org.eclipse.debug.core.watchExpressionDelegates">
      <watchExpressionDelegate
        debugModel="net.sourceforge.phpeclipse.debug.core"
diff --git a/net.sourceforge.phpeclipse.debug.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.debug.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..36a0a26
--- /dev/null
+++ b/net.sourceforge.phpeclipse.debug.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Plugin.name
+Bundle-SymbolicName: net.sourceforge.phpeclipse.debug.ui; singleton:=true
+Bundle-Version: 1.1.9
+Bundle-ClassPath: debug.jar
+Bundle-Activator: net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin
+Bundle-Vendor: PHPEclipse project team
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpdt.debug.ui,
+ net.sourceforge.phpdt.internal.debug.ui,
+ net.sourceforge.phpdt.internal.debug.ui.actions,
+ net.sourceforge.phpdt.internal.debug.ui.launcher,
+ net.sourceforge.phpdt.internal.debug.ui.preferences,
+ net.sourceforge.phpdt.internal.debug.ui.properties
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ net.sourceforge.phpeclipse.webbrowser,
+ net.sourceforge.phpeclipse.debug.core,
+ net.sourceforge.phpeclipse.launching,
+ net.sourceforge.phpeclipse
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.debug.ui/plugin.xml b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
index 759952d..a81cb4f 100644
--- a/net.sourceforge.phpeclipse.debug.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
@@ -1,35 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.debug.ui"
-   name="%Plugin.name"
-   version="1.1.9"
-   provider-name="phpeclipse.de"
-   class="net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin">
-
-   <runtime>
-      <library name="debug.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
-      <import plugin="net.sourceforge.phpeclipse.debug.core"/>
-      <import plugin="net.sourceforge.phpeclipse.launching"/> 
-      <import plugin="net.sourceforge.phpeclipse"/>
-   </requires>
-
-
-<!-- Extensions -->
+<?eclipse version="3.2"?>
+<plugin>
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
@@ -96,28 +67,6 @@
             id="net.sourceforge.phpeclipse.debug.core.PHPLineBreakpointMarkerProvider">
       </imageprovider>
    </extension>
-<!--   <extension
-         point="org.eclipse.ui.actionSets">
-         <actionSet
-            label="%BreakpoingActionSet.label"
-            visible="false"
-            id="org.eclipse.debug.ui.breakpointActionSet">
-         <menu
-               label="%RunMenu.label"
-               path="additions"
-               id="org.eclipse.ui.run">
-            <separator
-                  name="breakpointGroup">
-            </separator>
-         </menu>
-         <action
-               label="%GlobalManageBreakpointAction.label"
-               class="net.sourceforge.phpdt.internal.debug.ui.actions.ManageBreakpointActionDelegate"
-               menubarPath="org.eclipse.ui.run/phpBreakpointGroup"
-               id="net.sourceforge.phpeclipse.debug.ui.ManageBreakpointActionDelegate">
-         </action>
-      </actionSet>
-   </extension>   -->
    <extension
          point="org.eclipse.ui.contexts">
       <context
@@ -163,7 +112,6 @@
          <factory 
             class="net.sourceforge.phpdt.internal.debug.ui.actions.RetargettableActionAdapterFactory" 
             adaptableType="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor">
-     <!--       <adapter type="org.eclipse.debug.ui.actions.IRunToLineTarget"/>  -->
             <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
          </factory>
     </extension>
@@ -172,20 +120,6 @@
       <viewerContribution
             targetID="#PHPRulerContext"
             id="net.sourceforge.phpdt.ui.PHPUnitEditorPopupActions">
-  <!--       <action
-               label="%JavaBreakpointProperties.label"
-               helpContextId="breakpoint_properties_action_context"
-               class="org.eclipse.jdt.internal.debug.ui.actions.JavaBreakpointPropertiesRulerActionDelegate"
-               menubarPath="debug"
-               id="org.eclipse.jdt.debug.ui.actions.JavaBreakpointPropertiesRulerActionDelegate">
-         </action>
-         <action
-               label="%EnableBreakpoint.label"
-               helpContextId="enable_disable_breakpoint_action_context"
-               class="org.eclipse.jdt.internal.debug.ui.actions.EnableDisableBreakpointRulerActionDelegate"
-               menubarPath="debug"
-               id="org.eclipse.jdt.debug.ui.actions.EnableDisableBreakpointRulerActionDelegate">
-         </action>  -->
          <action
                label="%AddBreakpoint.label"
                helpContextId="manage_breakpoint_action_context"
diff --git a/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d11a190
--- /dev/null
+++ b/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF
@@ -0,0 +1,33 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: PHP ExternalTools Plug-in
+Bundle-SymbolicName: net.sourceforge.phpeclipse.externaltools; singleton:=true
+Bundle-Version: 1.1.9
+Bundle-ClassPath: externaltools.jar
+Bundle-Activator: net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin
+Bundle-Vendor: PHPEclipse project team
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpdt.externaltools.actions,
+ net.sourceforge.phpdt.externaltools.group,
+ net.sourceforge.phpdt.externaltools.internal.dialog,
+ net.sourceforge.phpdt.externaltools.internal.model,
+ net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations,
+ net.sourceforge.phpdt.externaltools.internal.registry,
+ net.sourceforge.phpdt.externaltools.internal.ui,
+ net.sourceforge.phpdt.externaltools.launchConfigurations,
+ net.sourceforge.phpdt.externaltools.model,
+ net.sourceforge.phpdt.externaltools.preferences,
+ net.sourceforge.phpdt.externaltools.util,
+ net.sourceforge.phpdt.externaltools.variable,
+ net.sourceforge.phpeclipse.externaltools
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.ui.console,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.editors,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.ui.externaltools,
+ net.sourceforge.phpeclipse.ui
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.externaltools/plugin.xml b/net.sourceforge.phpeclipse.externaltools/plugin.xml
index 0f780d1..669fc72 100644
--- a/net.sourceforge.phpeclipse.externaltools/plugin.xml
+++ b/net.sourceforge.phpeclipse.externaltools/plugin.xml
@@ -1,34 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.externaltools"
-   name="PHP ExternalTools Plug-in"
-   version="1.1.9"
-   provider-name="phpeclipse.de"
-   class="net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin">
-
-   <runtime>
-	  <library name="externaltools.jar">
-		 <export name="*"/>
-	  </library>
-   </runtime>
-
-   <requires>
-	  <import plugin="org.eclipse.ui"/>
-	  <import plugin="org.eclipse.ui.console"/>
-	  <import plugin="org.eclipse.ui.ide"/>
-	  <import plugin="org.eclipse.ui.editors"/>
-	  <import plugin="org.eclipse.core.resources"/>
-	  <import plugin="org.eclipse.core.runtime"/>
-	  <import plugin="org.eclipse.debug.core"/>
-	  <import plugin="org.eclipse.debug.ui"/>
-	  <import plugin="org.eclipse.ui.externaltools"/>
-	  <import plugin="net.sourceforge.phpeclipse.ui"/>
-   </requires>
-
-
-<!-- external tools -->
-
+<?eclipse version="3.2"?>
+<plugin>
 <!-- extension point definitions -->
 	<extension-point id="configurationDuplicationMaps" name="%ExtPoint.configurationDuplicationMaps"/>
 	<extension-point id="argumentVariables" name="%ExtPoint.argumentVariables"/>
@@ -37,41 +9,6 @@
 	<extension-point id="refreshVariables" name="%ExtPoint.refreshVariables"/>
 
 <!-- Extensions -->
-<!--
-	<extension point="org.eclipse.ui.actionSets">
-		<actionSet
-			id="net.sourceforge.phpdt.externaltools.ExternalToolsSet"
-			label="%ActionSet.externalTools"
-			visible="true">
-			<menu id="org.eclipse.ui.run"
-				label="%Menu.run"
-				path="additions">
-				<separator name="ExternalToolsGroup"/>
-			</menu>
-			<action
-				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu"
-				label="%Action.externalTools"
-				menubarPath="org.eclipse.ui.run/ExternalToolsGroup"
-				disabledIcon="icons/full/dtool16/external_tools.gif"
-				icon="icons/full/etool16/external_tools.gif"
-				hoverIcon="icons/full/ctool16/external_tools.gif"
-				pulldown="true"
-				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action>
-			<action
-				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateToolbar"
-				label="%Action.externalTools"
-				toolbarPath="Normal/additions"
-				disabledIcon="icons/full/dtool16/external_tools.gif"
-				icon="icons/full/etool16/external_tools.gif"
-				hoverIcon="icons/full/ctool16/external_tools.gif"
-				tooltip="%Action.externalToolsTip"
-				pulldown="true"
-				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action>
-		</actionSet>
-	</extension>
--->
 
 	<!-- Launch Configuration Extensions -->
 	<extension point="org.eclipse.debug.core.launchConfigurationTypes">
@@ -421,4 +358,4 @@
 		 </action>
 	  </objectContribution>
 	</extension>
-</plugin>
+</plugin>
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse.launching/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.launching/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..4c65104
--- /dev/null
+++ b/net.sourceforge.phpeclipse.launching/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Plugin.name
+Bundle-SymbolicName: net.sourceforge.phpeclipse.launching; singleton:=true
+Bundle-Version: 1.1.9
+Bundle-ClassPath: launch.jar
+Bundle-Activator: net.sourceforge.phpdt.internal.launching.PHPLaunchingPlugin
+Bundle-Vendor: PHPEclipse project team
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpdt.internal.launching
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.debug.core,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ net.sourceforge.phpeclipse,
+ net.sourceforge.phpeclipse.debug.core,
+ org.eclipse.debug.ui,
+ net.sourceforge.phpeclipse.ui,
+ org.eclipse.ui.ide
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.launching/plugin.xml b/net.sourceforge.phpeclipse.launching/plugin.xml
index 4a996df..f663157 100644
--- a/net.sourceforge.phpeclipse.launching/plugin.xml
+++ b/net.sourceforge.phpeclipse.launching/plugin.xml
@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.launching"
-   name="%Plugin.name"
-   version="1.1.9"
-   provider-name="phpeclipse.de"
-   class="net.sourceforge.phpdt.internal.launching.PHPLaunchingPlugin">
-
-   <runtime>
-	  <library name="launch.jar">
-		 <export name="*"/>
-	  </library>
-   </runtime>
-   <requires>
-<!--      <import plugin="org.eclipse.core.runtime.compatibility"/> -->
-	  <import plugin="org.eclipse.core.runtime"/>
-	  <import plugin="org.eclipse.core.resources"/>
-	  <import plugin="org.eclipse.ui"/>
-	  <import plugin="org.eclipse.debug.core"/>
-	  <import plugin="org.eclipse.jface.text"/>
-	  <import plugin="org.eclipse.ui.workbench.texteditor"/>
-	  <import plugin="net.sourceforge.phpeclipse"/>
-	  <import plugin="net.sourceforge.phpeclipse.debug.core"/>
-	  <import plugin="org.eclipse.debug.ui"/>
-	  <import plugin="net.sourceforge.phpeclipse.ui"/>
-	  <import plugin="org.eclipse.ui.ide"/>
-   </requires>
-
-
+<?eclipse version="3.2"?>
+<plugin>
    <extension
 		 point="org.eclipse.debug.core.launchConfigurationTypes">
 	  <launchConfigurationType
diff --git a/net.sourceforge.phpeclipse.nl1/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.nl1/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..b9f6111
--- /dev/null
+++ b/net.sourceforge.phpeclipse.nl1/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: PHPeclipse PHP Development Tools NL Support
+Bundle-SymbolicName: net.sourceforge.phpeclipse.nl1
+Bundle-Version: 1.0.10
+Bundle-ClassPath: nl1.jar
+Bundle-Vendor: PHPEclipse project team
+Fragment-Host: net.sourceforge.phpeclipse;bundle-version="1.0.10"
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.runtime.compatibility
diff --git a/net.sourceforge.phpeclipse.nl1/fragment.xml b/net.sourceforge.phpeclipse.nl1/fragment.xml
deleted file mode 100644
index 7c3a019..0000000
--- a/net.sourceforge.phpeclipse.nl1/fragment.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-   id="net.sourceforge.phpeclipse.nl1"
-   name="PHPeclipse PHP Development Tools NL Support"
-   version="1.0.10"
-   provider-name="phpeclipse.de"
-   plugin-id="net.sourceforge.phpeclipse"
-   plugin-version="1.0.10"
-   match="greaterOrEqual">
-
-   <runtime>
-      <library name="nl1.jar"/>
-   </runtime>
-</fragment>
diff --git a/net.sourceforge.phpeclipse.phphelp.nl1/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.phphelp.nl1/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..296558c
--- /dev/null
+++ b/net.sourceforge.phpeclipse.phphelp.nl1/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: PHPeclipse PHPHelp NL Support
+Bundle-SymbolicName: net.sourceforge.phpeclipse.phphelp.nl1
+Bundle-Version: 1.0.4
+Bundle-ClassPath: nl1.jar
+Bundle-Vendor: PHPEclipse project team
+Fragment-Host: net.sourceforge.phpeclipse.phphelp;bundle-version="1.0.0"
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.runtime.compatibility
diff --git a/net.sourceforge.phpeclipse.phphelp.nl1/fragment.xml b/net.sourceforge.phpeclipse.phphelp.nl1/fragment.xml
deleted file mode 100644
index 85ebba1..0000000
--- a/net.sourceforge.phpeclipse.phphelp.nl1/fragment.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-   id="net.sourceforge.phpeclipse.phphelp.nl1"
-   name="PHPeclipse PHPHelp NL Support"
-   version="1.0.4"
-   provider-name="phpeclipse.de"
-   plugin-id="net.sourceforge.phpeclipse.phphelp"
-   plugin-version="1.0.4"
-   match="greaterOrEqual">
-
-   <runtime>
-      <library name="nl1.jar"/>
-   </runtime>
-</fragment>
diff --git a/net.sourceforge.phpeclipse.phphelp/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.phphelp/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..62fc871
--- /dev/null
+++ b/net.sourceforge.phpeclipse.phphelp/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: net.sourceforge.phpeclipse.phphelp; singleton:=true
+Bundle-Version: 1.1.9
+Bundle-ClassPath: phphelp.jar
+Bundle-Activator: net.sourceforge.phpdt.phphelp.PHPHelpPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpdt.httpquery,
+ net.sourceforge.phpdt.httpquery.config,
+ net.sourceforge.phpdt.httpquery.preferences,
+ net.sourceforge.phpdt.phphelp,
+ net.sourceforge.phpdt.phphelp.actions
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.help,
+ org.eclipse.jface.text,
+ org.eclipse.swt,
+ net.sourceforge.phpeclipse,
+ net.sourceforge.phpeclipse.webbrowser,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.phphelp/plugin.properties b/net.sourceforge.phpeclipse.phphelp/plugin.properties
index 76ecb88..52c63ef 100644
--- a/net.sourceforge.phpeclipse.phphelp/plugin.properties
+++ b/net.sourceforge.phpeclipse.phphelp/plugin.properties
@@ -2,7 +2,7 @@
 #
 #########################################
 pluginName=PHP Help
-providerName=phpeclipse.de
+providerName=PHPEclipse project team
 phphelpLabel=PHP Help
 phphelpFormat=Help (WIN_32 *.chm format)
 httpQuery=HTTP Query
diff --git a/net.sourceforge.phpeclipse.phphelp/plugin.xml b/net.sourceforge.phpeclipse.phphelp/plugin.xml
index 900dea5..c74c0a3 100644
--- a/net.sourceforge.phpeclipse.phphelp/plugin.xml
+++ b/net.sourceforge.phpeclipse.phphelp/plugin.xml
@@ -1,29 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.phphelp"
-   name="%pluginName"
-   version="1.1.9"
-   provider-name="%providerName"
-   class="net.sourceforge.phpdt.phphelp.PHPHelpPlugin">
-
-   <runtime>
-      <library name="phphelp.jar">
-      <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.help"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="net.sourceforge.phpeclipse"/>
-      <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-   </requires>
+<?eclipse version="3.2"?>
+<plugin>
    <extension
          point="org.eclipse.ui.popupMenus">
       <viewerContribution
@@ -147,51 +124,6 @@
          </action>
       </viewerContribution>
     </extension>
-    <!--
-    <extension
-         point="org.eclipse.ui.popupMenus">
-      <viewerContribution
-            targetID="#EditorContext"
-            id="net.sourceforge.phpdt.phphelp.actions.httpquery">
-         <menu
-			id="httpqueryMenu"
-			label="%HTTPQuery.label"
-			path="rest">
-		 </menu>
-		 <action
-               label="Koders.com"
-               class="net.sourceforge.phpdt.httpquery.KodersAction"
-               menubarPath="httpqueryMenu/additions"
-               id="net.sourceforge.phpdt.httpquery.KodersAction">
-         </action>
-		 <action
-               label="Google.com"
-               class="net.sourceforge.phpdt.httpquery.GoogleAction"
-               menubarPath="httpqueryMenu/additions"
-               id="net.sourceforge.phpdt.httpquery.GoogleAction">
-         </action>
-         <action
-               label="Localhost"
-               class="net.sourceforge.phpdt.httpquery.LocalhostAction"
-               menubarPath="httpqueryMenu/additions"
-               id="net.sourceforge.phpdt.httpquery.LocalhostAction">
-         </action>
-         <action
-               label="PHP Manual"
-               class="net.sourceforge.phpdt.httpquery.PHPHelpAction"
-               menubarPath="httpqueryMenu/additions"
-               id="net.sourceforge.phpdt.httpquery.PHPHelpAction">
-         </action>
-		 <action
-               label="HTTP Query..."
-               class="net.sourceforge.phpdt.httpquery.HTTPQueryAction"
-               menubarPath="httpqueryMenu/additions"
-               id="net.sourceforge.phpdt.httpquery.HTTPQueryAction">
-         </action>
-      </viewerContribution>
-
-    </extension>
--->
 
     <extension
          point="org.eclipse.ui.commands">
diff --git a/net.sourceforge.phpeclipse.phpunit/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.phpunit/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..304a477
--- /dev/null
+++ b/net.sourceforge.phpeclipse.phpunit/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: net.sourceforge.phpeclipse.phpunit
+Bundle-SymbolicName: net.sourceforge.phpeclipse.phpunit; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: phpunit.jar
+Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
+Bundle-Vendor: PHPEclipse project team
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.ui.ide;resolution:=optional,
+ org.eclipse.ui.views;resolution:=optional,
+ org.eclipse.ui.editors;resolution:=optional,
+ org.eclipse.jface.text;resolution:=optional,
+ org.eclipse.ui.workbench.texteditor;resolution:=optional,
+ org.eclipse.ui.views,
+ org.eclipse.core.runtime.compatibility,
+ org.eclipse.core.runtime;bundle-version="2.1"
+Eclipse-LazyStart: true
+Plugin-Class: net.sourceforge.phpeclipse.phpunit.PHPUnitPlugin
diff --git a/net.sourceforge.phpeclipse.phpunit/plugin.xml b/net.sourceforge.phpeclipse.phpunit/plugin.xml
index 2ea8e3f..99e0eb2 100644
--- a/net.sourceforge.phpeclipse.phpunit/plugin.xml
+++ b/net.sourceforge.phpeclipse.phpunit/plugin.xml
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin
-   id="net.sourceforge.phpeclipse.phpunit"
-   name="net.sourceforge.phpeclipse.phpunit"
-   version="1.0.0"
-   provider-name="Ali Echihabi"
-   class="net.sourceforge.phpeclipse.phpunit.PHPUnitPlugin">
-
-   <runtime>
-      <library name="phpunit.jar"/>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.views"/>
-   </requires>
-
-
+<?eclipse version="3.2"?>
+<plugin>
    <extension
          point="org.eclipse.ui.views">
       <category
diff --git a/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f9bbfae
--- /dev/null
+++ b/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: PHPeclipse Smarty UI
+Bundle-SymbolicName: net.sourceforge.phpdt.smarty.ui; singleton:=true
+Bundle-Version: 1.1.9
+Bundle-ClassPath: smartyui.jar
+Bundle-Activator: net.sourceforge.phpdt.smarty.ui.SmartyUI
+Bundle-Vendor: PHPEclipse project team
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpdt.smarty.ui,
+ net.sourceforge.phpdt.smarty.ui.internal,
+ net.sourceforge.phpdt.smarty.ui.internal.editor,
+ net.sourceforge.phpdt.smarty.ui.internal.text
+Require-Bundle: net.sourceforge.phpeclipse.xml.ui,
+ net.sourceforge.phpeclipse.ui,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.core.resources,
+ org.eclipse.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.ui,
+ org.eclipse.core.filebuffers,
+ org.eclipse.core.runtime
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.smarty.ui/plugin.xml b/net.sourceforge.phpeclipse.smarty.ui/plugin.xml
index 1086175..f29783d 100644
--- a/net.sourceforge.phpeclipse.smarty.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.smarty.ui/plugin.xml
@@ -1,31 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpdt.smarty.ui"
-   name="PHPeclipse Smarty UI"
-   version="1.1.9"
-   provider-name="PHPeclipse.de"
-   class="net.sourceforge.phpdt.smarty.ui.SmartyUI">
-
-   <runtime>
-      <library name="smartyui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="net.sourceforge.phpeclipse.xml.ui"/>
-      <import plugin="net.sourceforge.phpeclipse.ui"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.text"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
+<?eclipse version="3.2"?>
+<plugin>
 
    <extension
          point="org.eclipse.ui.editors">
diff --git a/net.sourceforge.phpeclipse.tests/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a5527ca
--- /dev/null
+++ b/net.sourceforge.phpeclipse.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Core Tests
+Bundle-SymbolicName: net.sourceforge.phpeclipse.tests; singleton:=true
+Bundle-Version: 1.1.0
+Bundle-ClassPath: coretests.jar
+Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
+Bundle-Vendor: PHPEclipse project team
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime.compatibility,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.ui,
+ org.junit,
+ net.sourceforge.phpeclipse,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.core.resources
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.tests/plugin.xml b/net.sourceforge.phpeclipse.tests/plugin.xml
index 8f3e07b..b3ca49b 100644
--- a/net.sourceforge.phpeclipse.tests/plugin.xml
+++ b/net.sourceforge.phpeclipse.tests/plugin.xml
@@ -1,28 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.tests"
-   name="Core Tests"
-   version="1.1.0"
-   provider-name="phpeclipse.net">
+<?eclipse version="3.2"?>
+<plugin>
 
-   <runtime>
-      <library name="coretests.jar"/>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.junit"/>
-      <import plugin="net.sourceforge.phpeclipse"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.core.resources"/>
-   </requires>
-<!-- <import plugin="org.apache.lucene"/> -->
    <extension
          point="org.eclipse.ui.popupMenus">
       <objectContribution
diff --git a/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3075690
--- /dev/null
+++ b/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,33 @@
+Manifest-Version: 1.0
+Generated-from: 1150021273000;type=2
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: net.sourceforge.phpeclipse.ui; singleton:=true
+Bundle-Version: 1.1.9
+Bundle-ClassPath: ui.jar
+Bundle-Activator: net.sourceforge.phpeclipse.ui.WebUI
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpeclipse.ui,
+ net.sourceforge.phpeclipse.ui.editor,
+ net.sourceforge.phpeclipse.ui.internal,
+ net.sourceforge.phpeclipse.ui.overlaypages,
+ net.sourceforge.phpeclipse.ui.preferences,
+ net.sourceforge.phpeclipse.ui.templates.preferences,
+ net.sourceforge.phpeclipse.ui.templates.template,
+ net.sourceforge.phpeclipse.ui.text,
+ net.sourceforge.phpeclipse.ui.text.rules,
+ net.sourceforge.phpeclipse.ui.text.source,
+ net.sourceforge.phpeclipse.ui.views.outline,
+ net.sourceforge.phpeclipse.ui.views.util
+Require-Bundle: net.sourceforge.phpeclipse.core,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.ui.workbench.texteditor,
+ net.sourceforge.phpeclipse.webbrowser
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.ui/plugin.properties b/net.sourceforge.phpeclipse.ui/plugin.properties
index 5f1caf6..b40847d 100644
--- a/net.sourceforge.phpeclipse.ui/plugin.properties
+++ b/net.sourceforge.phpeclipse.ui/plugin.properties
@@ -8,11 +8,11 @@
 # Contributors:
 #     Christopher Lenz - initial english resources
 # 
-# $Id: plugin.properties,v 1.2 2004-09-03 17:30:19 jsurfer Exp $
+# $Id: plugin.properties,v 1.3 2006-10-17 19:42:23 pombredanne Exp $
 #
 
 pluginName = Web Development Tools UI
-providerName= WDTE Project
+providerName= PHPEclipse project team
 
 preferencePageName = PHPeclipse Web Development
 viewCategoryName = PHPeclipse Web Development
diff --git a/net.sourceforge.phpeclipse.ui/plugin.xml b/net.sourceforge.phpeclipse.ui/plugin.xml
index c8f93af..cdcea3e 100644
--- a/net.sourceforge.phpeclipse.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.ui/plugin.xml
@@ -1,30 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.ui"
-   name="%pluginName"
-   version="1.1.9"
-   provider-name="%providerName"
-   class="net.sourceforge.phpeclipse.ui.WebUI">
-
-   <runtime>
-      <library name="ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="net.sourceforge.phpeclipse.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
-   </requires>
-
+<?eclipse version="3.2"?>
+<plugin>
 
    <extension
          point="org.eclipse.ui.preferencePages">
@@ -33,15 +9,6 @@
             class="net.sourceforge.phpeclipse.ui.preferences.EmptyPreferencePage"
             id="net.sourceforge.phpeclipse.ui.preferencePage">
       </page>
-<!-- removed templates page, because it also exists in net.sf.phpeclipse,
-     and has more features there
-      <page
-            name="Templates"
-            category="net.sourceforge.phpeclipse.ui.preferencePage"
-            class="net.sourceforge.phpeclipse.ui.templates.preferences.TemplatesPreferencePage"
-            id="net.sourceforge.phpeclipse.ui.templates.preferences.TemplatesPreferencePage">
-      </page>
--->
       <page
             category="net.sourceforge.phpeclipse.ui.preferencePage"
             name="Project Defaults"
@@ -57,16 +24,6 @@
    </extension>
       <extension
          point="org.eclipse.ui.propertyPages">
-<!--      <page
-            objectClass="org.eclipse.core.resources.IProject"
-            name="%propertyPagePHPProject.name"
-            class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
-            id="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage">
-         <filter
-               name="nature"
-               value="net.sourceforge.phpeclipse.phpnature">
-         </filter>
-      </page> -->
       <page
             class="net.sourceforge.phpeclipse.ui.preferences.PHPMiscProjectPreferences"
             icon="icons/full/obj16/php.png"
@@ -85,21 +42,6 @@
             objectClass="org.eclipse.core.resources.IFile">
       </page>
    </extension>
-    <!-- <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="%viewCategoryName"
-            id="net.sourceforge.phpeclipse.views.category">
-      </category>
-    <view
-            name="%previewViewName"
-            icon="icons/full/cview16/preview.gif"
-            category="net.sourceforge.phpeclipse.ui.views"
-            fastViewWidthRatio="66"
-            class="net.sourceforge.phpeclipse.ui.views.preview.BrowserPreview"
-            id="net.sourceforge.phpeclipse.ui.views.browserPreview">
-      </view>
-   </extension> -->
 
    <extension
          point="org.eclipse.ui.editors.templates">
@@ -123,29 +65,9 @@
             class="net.sourceforge.phpeclipse.ui.templates.template.SmartyContextType"
             id="smarty">
       </contextType>
-  <!--    <contextType
-            name="%templates.javadoc.contextType.name"
-            class="org.eclipse.jdt.internal.corext.template.java.JavaDocContextType"
-            id="javadoc">
-      </contextType> -->
       <include
       		file="templates/default-templates.xml"
       		translations="templates/default-templates.properties">
       </include>
- <!--     <include
-      		file="templates/default-codetemplates.xml"
-      		translations="templates/default-templates.properties">
-      </include> -->
    </extension>
- <!--     <extension
-         point="org.eclipse.team.core.fileTypes">
-      <fileTypes
-            type="text"
-            extension="htm">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="html">
-      </fileTypes>
-   </extension> -->
 </plugin>
diff --git a/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..b07ef0b
--- /dev/null
+++ b/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: net.sourceforge.phpeclipse.webbrowser; singleton:=true
+Bundle-Version: 1.1.9
+Bundle-ClassPath: webbrowser.jar
+Bundle-Activator: net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpeclipse.webbrowser,
+ net.sourceforge.phpeclipse.webbrowser.internal,
+ net.sourceforge.phpeclipse.webbrowser.views
+Require-Bundle: org.eclipse.core.resources;bundle-version="3.0.0",
+ org.eclipse.core.runtime;bundle-version="3.0.0",
+ org.eclipse.ui;bundle-version="3.0.0",
+ org.eclipse.ui.ide;bundle-version="3.0.0"
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.webbrowser/plugin.properties b/net.sourceforge.phpeclipse.webbrowser/plugin.properties
index 87c6943..a23bc71 100644
--- a/net.sourceforge.phpeclipse.webbrowser/plugin.properties
+++ b/net.sourceforge.phpeclipse.webbrowser/plugin.properties
@@ -2,7 +2,7 @@ phpBrowserView=PHP Browser
 viewCategoryName = PHPeclipse Web Development
 
 pluginName=PHPeclipse Browser
-providerName=PHPeclipse
+providerName=PHPEclipse project team
 extensionPointURLMap=URL Map
 extensionPointFavorites=Favorite URLs
 
diff --git a/net.sourceforge.phpeclipse.webbrowser/plugin.xml b/net.sourceforge.phpeclipse.webbrowser/plugin.xml
index 42f5f47..ae304fb 100644
--- a/net.sourceforge.phpeclipse.webbrowser/plugin.xml
+++ b/net.sourceforge.phpeclipse.webbrowser/plugin.xml
@@ -1,26 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin id="net.sourceforge.phpeclipse.webbrowser"
-  name="%pluginName"
-  version="1.1.9"
-  provider-name="%providerName"
-  class="net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUIPlugin">
-
-  <requires>
-    <import plugin="org.eclipse.core.resources" version="3.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.core.runtime" version="3.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.ui" version="3.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.ui.ide" version="3.0.0" match="greaterOrEqual"/>
-  </requires>
-
-  <runtime>
-    <library name="webbrowser.jar">
-      <export name="net.sourceforge.phpeclipse.webbrowser.*"/>
-      <export name="net.sourceforge.phpeclipse.webbrowser.views.*"/>
-    </library>
-  </runtime>
-
+<?eclipse version="3.2"?>
+<plugin>
   <extension-point id="urlMap" name="%extensionPointURLMap" schema="schema/urlMap.exsd"/>
   <extension-point id="favorites" name="%extensionPointFavorites" schema="schema/favorites.exsd"/>
 
@@ -47,10 +27,6 @@
   </extension>
 
   <extension point="org.eclipse.ui.preferencePages">
- <!--   <page
-      id="org.eclipse.internet"
-      name="%preferenceInternetTitle"
-      class="net.sourceforge.phpeclipse.webbrowser.internal.InternetPreferencePage"/> -->
     <page
       id="net.sourceforge.phpeclipse.webbrowser.preferencePage"
       name="%preferenceWebBrowserTitle"
@@ -124,5 +100,4 @@
             id="net.sourceforge.phpeclipse.webbrowser.views">
       </view>
    </extension>
-
 </plugin>
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF
index 06dc7ca..76828d3 100644
--- a/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@ Bundle-Version: 0.0.1
 Bundle-ClassPath: core.jar
 Bundle-Activator: net.sourceforge.phpeclipse.xdebug.core.XDebugCorePlugin
 Bundle-Localization: plugin
+Bundle-Vendor: PHPEclipse project team
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.core.resources,
  net.sourceforge.phpeclipse
-Eclipse-AutoStart: true
 Provide-Package: net.sourceforge.phpeclipse.xdebug.core,
  net.sourceforge.phpeclipse.xdebug.php.launching,
  net.sourceforge.phpeclipse.xdebug.php.model
-Bundle-Vendor: PHPeclipse.de
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.xdebug.core/plugin.xml b/net.sourceforge.phpeclipse.xdebug.core/plugin.xml
index 7a085b8..5f73f82 100644
--- a/net.sourceforge.phpeclipse.xdebug.core/plugin.xml
+++ b/net.sourceforge.phpeclipse.xdebug.core/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.2"?>
 <plugin>
    <extension
          point="org.eclipse.debug.core.launchConfigurationTypes">
@@ -38,5 +38,4 @@
       <super type="org.eclipse.debug.core.lineBreakpointMarker"/>
    
    </extension>
-
 </plugin>
diff --git a/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF
index ac52ff5..1a84bfc 100644
--- a/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.xdebug.ui/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: net.sourceforge.phpeclipse.xdebug.ui ; singleton:=true
 Bundle-Version: 0.0.1
 Bundle-Activator: net.sourceforge.phpeclipse.xdebug.ui.XDebugUIPlugin
 Bundle-Localization: plugin
+Bundle-Vendor: PHPEclipse project team
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
@@ -16,5 +17,9 @@ Require-Bundle: org.eclipse.core.resources,
  net.sourceforge.phpeclipse,
  net.sourceforge.phpeclipse.externaltools,
  net.sourceforge.phpeclipse.xdebug.core
-Eclipse-AutoStart: true
-Bundle-Vendor: PHPeclipse.de
+Export-Package: net.sourceforge.phpeclipse.xdebug.ui,
+ net.sourceforge.phpeclipse.xdebug.ui.actions,
+ net.sourceforge.phpeclipse.xdebug.ui.php.launching,
+ net.sourceforge.phpeclipse.xdebug.ui.php.model,
+ net.sourceforge.phpeclipse.xdebug.ui.preference
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.xdebug.ui/plugin.xml b/net.sourceforge.phpeclipse.xdebug.ui/plugin.xml
index 4387499..5ad53ff 100644
--- a/net.sourceforge.phpeclipse.xdebug.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.xdebug.ui/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.2"?>
 <plugin>
    <extension
 		 point="org.eclipse.debug.ui.launchConfigurationTabGroups">
@@ -70,7 +70,4 @@
 			icon="icons/obj16/xdebug.gif"
 			id="net.sourceforge.phpeclipse.xdebug.ui.launchImage"/>
    </extension>
-
-
-
 </plugin>
diff --git a/net.sourceforge.phpeclipse.xml.core/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xml.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6792f99
--- /dev/null
+++ b/net.sourceforge.phpeclipse.xml.core/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: net.sourceforge.phpeclipse.xml.core; singleton=true
+Bundle-Version: 1.1.9
+Bundle-ClassPath: xmlcore.jar
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpeclipse.xml.core.internal.model,
+ net.sourceforge.phpeclipse.xml.core.internal.parser,
+ net.sourceforge.phpeclipse.xml.core.model,
+ net.sourceforge.phpeclipse.xml.core.parser
+Require-Bundle: net.sourceforge.phpeclipse.core,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.text
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.xml.core/plugin.properties b/net.sourceforge.phpeclipse.xml.core/plugin.properties
index 50ade75..3d999cf 100644
--- a/net.sourceforge.phpeclipse.xml.core/plugin.properties
+++ b/net.sourceforge.phpeclipse.xml.core/plugin.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Christopher Lenz - initial english resources
 # 
-# $Id: plugin.properties,v 1.2 2004-09-04 08:59:33 jsurfer Exp $
+# $Id: plugin.properties,v 1.3 2006-10-17 19:41:49 pombredanne Exp $
 #
 
 pluginName = PHPeclipse Web Development Tools XML Core
-providerName= WDTE Project/PHPeclipse.de
+providerName= PHPEclipse project team
diff --git a/net.sourceforge.phpeclipse.xml.core/plugin.xml b/net.sourceforge.phpeclipse.xml.core/plugin.xml
deleted file mode 100644
index 3342dfd..0000000
--- a/net.sourceforge.phpeclipse.xml.core/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.xml.core"
-   name="%pluginName"
-   version="1.1.9"
-   provider-name="%providerName"
-   class="">
-
-   <runtime>
-      <library name="xmlcore.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="net.sourceforge.phpeclipse.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.text"/>
-   </requires>
-
-
-</plugin>
diff --git a/net.sourceforge.phpeclipse.xml.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xml.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..001b8e7
--- /dev/null
+++ b/net.sourceforge.phpeclipse.xml.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,31 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: net.sourceforge.phpeclipse.xml.ui; singleton:=true
+Bundle-Version: 1.1.9
+Bundle-ClassPath: xmlui.jar
+Bundle-Activator: net.sourceforge.phpeclipse.xml.ui.XMLPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpeclipse.xml.ui,
+ net.sourceforge.phpeclipse.xml.ui.internal.compare,
+ net.sourceforge.phpeclipse.xml.ui.internal.editor,
+ net.sourceforge.phpeclipse.xml.ui.internal.outline,
+ net.sourceforge.phpeclipse.xml.ui.internal.preferences,
+ net.sourceforge.phpeclipse.xml.ui.internal.text,
+ net.sourceforge.phpeclipse.xml.ui.text
+Require-Bundle: net.sourceforge.phpeclipse.core,
+ net.sourceforge.phpeclipse.xml.core,
+ net.sourceforge.phpeclipse.ui,
+ org.eclipse.compare,
+ org.eclipse.core.filebuffers,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.osgi,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.ui.workbench.texteditor
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.xml.ui/plugin.properties b/net.sourceforge.phpeclipse.xml.ui/plugin.properties
index 30fdf15..d184fa9 100644
--- a/net.sourceforge.phpeclipse.xml.ui/plugin.properties
+++ b/net.sourceforge.phpeclipse.xml.ui/plugin.properties
@@ -8,11 +8,11 @@
 # Contributors:
 #     Christopher Lenz - initial english resources
 # 
-# $Id: plugin.properties,v 1.3 2005-07-10 15:16:13 axelcl Exp $
+# $Id: plugin.properties,v 1.4 2006-10-17 19:42:02 pombredanne Exp $
 #
 
 pluginName = PHPeclipse Web Development Tools XML UI
-providerName= WDTE Project/PHPeclipse.de
+providerName= PHPEclipse project team
 
 xmlEditorName = XML Editor
 dtdEditorName = DTD Editor
diff --git a/net.sourceforge.phpeclipse.xml.ui/plugin.xml b/net.sourceforge.phpeclipse.xml.ui/plugin.xml
index 3a3246f..98af6ad 100644
--- a/net.sourceforge.phpeclipse.xml.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.xml.ui/plugin.xml
@@ -1,116 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.xml.ui"
-   name="%pluginName"
-   version="1.1.9"
-   provider-name="%providerName"
-   class="net.sourceforge.phpeclipse.xml.ui.XMLPlugin">
-
-   <runtime>
-      <library name="xmlui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="net.sourceforge.phpeclipse.core"/>
-      <import plugin="net.sourceforge.phpeclipse.xml.core"/>
-      <import plugin="net.sourceforge.phpeclipse.ui"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-   </requires>
-
+<?eclipse version="3.2"?>
+<plugin>
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer class="net.sourceforge.phpeclipse.xml.ui.internal.preferences.XMLPreferenceInitializer"/>
    </extension>
- <!--
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="%xmlEditorPreferencePageName"
-            category="net.sourceforge.phpeclipse.ui.preferencePage"
-            class="net.sourceforge.phpeclipse.xml.ui.internal.preferences.XMLSyntaxPreferencePage"
-            id="net.sourceforge.phpeclipse.xml.ui.preferences.XMLSyntaxPreferencePage">
-      </page>
-   </extension>
-
- <extension
-         point="org.eclipse.core.filebuffers.documentSetup">
-      <participant
-            extensions="xml,xsd"
-            class="net.sourceforge.phpeclipse.xml.ui.internal.editor.XMLDocumentSetupParticipant">
-      </participant>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="dtd"
-            class="net.sourceforge.phpeclipse.xml.ui.internal.text.DTDDocumentProvider"
-            id="net.sourceforge.phpeclipse.xml.ui.internal.text.DTDDocumentProvider">
-      </provider>
-      <provider
-            extensions="xml,xsd"
-            class="net.sourceforge.phpeclipse.xml.ui.internal.editor.XMLDocumentProvider"
-            id="net.sourceforge.phpeclipse.xml.ui.internal.editor.XMLDocumentProvider">
-      </provider>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            name="%dtdEditorName"
-            icon="icons/basic/obj16/xml.png"
-            extensions="dtd"
-            contributorClass="net.sourceforge.phpeclipse.xml.ui.internal.editor.XMLEditorActionContributor"
-            class="net.sourceforge.phpeclipse.xml.ui.internal.editor.DTDEditor"
-            id="net.sourceforge.phpeclipse.xml.ui.internal.editor.DTDEditor">
-      </editor>
-      <editor
-            name="%xmlEditorName"
-            icon="icons/basic/obj16/xml.png"
-            extensions="xml,xsd"
-            contributorClass="net.sourceforge.phpeclipse.xml.ui.internal.editor.XMLEditorActionContributor"
-            class="net.sourceforge.phpeclipse.xml.ui.internal.editor.XMLEditor"
-            id="net.sourceforge.phpeclipse.xml.ui.internal.editor.XMLEditor">
-      </editor>
-   </extension>
-   <extension
-         point="org.eclipse.compare.contentMergeViewers">
-      <viewer
-            extensions="dtd"
-            class="net.sourceforge.phpeclipse.xml.ui.internal.compare.DTDMergeViewerCreator"
-            id="net.sourceforge.phpeclipse.xml.ui.internal.compare.DTDMergeViewerCreator">
-      </viewer>
-      <viewer
-            extensions="xml,xsd"
-            class="net.sourceforge.phpeclipse.xml.ui.internal.compare.XMLMergeViewerCreator"
-            id="net.sourceforge.phpeclipse.xml.ui.internal.compare.XMLMergeViewerCreator">
-      </viewer>
-   </extension>
-   <extension
-         point="org.eclipse.team.core.fileTypes">
-      <fileTypes
-            type="text"
-            extension="dtd">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="xml">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="xsd">
-      </fileTypes>
-   </extension>
-   -->
-
 </plugin>
diff --git a/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..4f4afa5
--- /dev/null
+++ b/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF
@@ -0,0 +1,111 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: net.sourceforge.phpeclipse; singleton:=true
+Bundle-Version: 1.1.9
+Bundle-ClassPath: phpeclipse.jar
+Bundle-Activator: net.sourceforge.phpeclipse.PHPeclipsePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: net.sourceforge.phpdt.core,
+ net.sourceforge.phpdt.core.compiler,
+ net.sourceforge.phpdt.core.dom,
+ net.sourceforge.phpdt.core.formatter,
+ net.sourceforge.phpdt.core.jdom,
+ net.sourceforge.phpdt.core.search,
+ net.sourceforge.phpdt.corext.refactoring.nls,
+ net.sourceforge.phpdt.internal.codeassist,
+ net.sourceforge.phpdt.internal.codeassist.impl,
+ net.sourceforge.phpdt.internal.compiler,
+ net.sourceforge.phpdt.internal.compiler.ast,
+ net.sourceforge.phpdt.internal.compiler.batch,
+ net.sourceforge.phpdt.internal.compiler.codegen,
+ net.sourceforge.phpdt.internal.compiler.env,
+ net.sourceforge.phpdt.internal.compiler.flow,
+ net.sourceforge.phpdt.internal.compiler.impl,
+ net.sourceforge.phpdt.internal.compiler.lookup,
+ net.sourceforge.phpdt.internal.compiler.parser,
+ net.sourceforge.phpdt.internal.compiler.problem,
+ net.sourceforge.phpdt.internal.compiler.util,
+ net.sourceforge.phpdt.internal.core,
+ net.sourceforge.phpdt.internal.core.builder,
+ net.sourceforge.phpdt.internal.core.jdom,
+ net.sourceforge.phpdt.internal.core.util,
+ net.sourceforge.phpdt.internal.corext,
+ net.sourceforge.phpdt.internal.corext.codemanipulation,
+ net.sourceforge.phpdt.internal.corext.phpdoc,
+ net.sourceforge.phpdt.internal.corext.refactoring.util,
+ net.sourceforge.phpdt.internal.corext.template,
+ net.sourceforge.phpdt.internal.corext.template.php,
+ net.sourceforge.phpdt.internal.corext.textmanipulation,
+ net.sourceforge.phpdt.internal.corext.util,
+ net.sourceforge.phpdt.internal.formatter,
+ net.sourceforge.phpdt.internal.formatter.align,
+ net.sourceforge.phpdt.internal.formatter.impl,
+ net.sourceforge.phpdt.internal.ui,
+ net.sourceforge.phpdt.internal.ui.actions,
+ net.sourceforge.phpdt.internal.ui.dialogs,
+ net.sourceforge.phpdt.internal.ui.dnd,
+ net.sourceforge.phpdt.internal.ui.filters,
+ net.sourceforge.phpdt.internal.ui.phpdocexport,
+ net.sourceforge.phpdt.internal.ui.preferences,
+ net.sourceforge.phpdt.internal.ui.text,
+ net.sourceforge.phpdt.internal.ui.text.comment,
+ net.sourceforge.phpdt.internal.ui.text.folding,
+ net.sourceforge.phpdt.internal.ui.text.java,
+ net.sourceforge.phpdt.internal.ui.text.java.hover,
+ net.sourceforge.phpdt.internal.ui.text.link,
+ net.sourceforge.phpdt.internal.ui.text.phpdoc,
+ net.sourceforge.phpdt.internal.ui.text.spelling,
+ net.sourceforge.phpdt.internal.ui.text.spelling.engine,
+ net.sourceforge.phpdt.internal.ui.text.template,
+ net.sourceforge.phpdt.internal.ui.text.template.contentassist,
+ net.sourceforge.phpdt.internal.ui.text.template.preferences,
+ net.sourceforge.phpdt.internal.ui.util,
+ net.sourceforge.phpdt.internal.ui.viewsupport,
+ net.sourceforge.phpdt.internal.ui.wizards,
+ net.sourceforge.phpdt.internal.ui.wizards.dialogfields,
+ net.sourceforge.phpdt.ltk.core,
+ net.sourceforge.phpdt.ltk.ui,
+ net.sourceforge.phpdt.ltk.ui.actions,
+ net.sourceforge.phpdt.ltk.ui.wizards,
+ net.sourceforge.phpdt.ui,
+ net.sourceforge.phpdt.ui.actions,
+ net.sourceforge.phpdt.ui.text,
+ net.sourceforge.phpdt.ui.text.folding,
+ net.sourceforge.phpdt.ui.text.java.hover,
+ net.sourceforge.phpdt.ui.wizards,
+ net.sourceforge.phpeclipse,
+ net.sourceforge.phpeclipse.actions,
+ net.sourceforge.phpeclipse.builder,
+ net.sourceforge.phpeclipse.obfuscator,
+ net.sourceforge.phpeclipse.obfuscator.export,
+ net.sourceforge.phpeclipse.phpeditor,
+ net.sourceforge.phpeclipse.phpeditor.actions,
+ net.sourceforge.phpeclipse.phpeditor.php,
+ net.sourceforge.phpeclipse.phpeditor.util,
+ net.sourceforge.phpeclipse.preferences,
+ net.sourceforge.phpeclipse.wizards,
+ net.sourceforge.phpeclipse.wizards.html
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.ui.console,
+ org.eclipse.core.resources,
+ org.eclipse.search,
+ org.eclipse.debug.ui,
+ org.eclipse.core.filebuffers,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.ui.editors,
+ org.eclipse.team.core,
+ org.eclipse.swt,
+ org.eclipse.search,
+ net.sourceforge.phpeclipse.webbrowser,
+ net.sourceforge.phpeclipse.externaltools,
+ net.sourceforge.phpeclipse.ui,
+ net.sourceforge.phpeclipse.xml.ui,
+ org.eclipse.ltk.core.refactoring,
+ org.eclipse.ltk.ui.refactoring
+Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse/plugin.properties b/net.sourceforge.phpeclipse/plugin.properties
index bb7ee88..6b4c0dd 100644
--- a/net.sourceforge.phpeclipse/plugin.properties
+++ b/net.sourceforge.phpeclipse/plugin.properties
@@ -2,7 +2,7 @@
 #
 #########################################
 pluginName=PHPEclipse Tools Core
-providerName=www.phpeclipse.de
+providerName=PHPEclipse project team
 naturePHP.name=PHP Project
 elementFiltersName=PHPElement Filters
 phpProblemName=PHP Problem
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 9305a3a..4de2585 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -1,46 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse"
-   name="%pluginName"
-   version="1.1.9"
-   provider-name="%providerName"
-   class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
-
-   <runtime>
-	  <library name="phpeclipse.jar">
-		<export name="*"/>
-	  </library>
- <!--     <library name="lib/hsqldb.jar"/> -->
- <!--     <library name="lib/xstream-1.0.2.jar" /> -->
-   </runtime>
-   <requires>
-	  <import plugin="org.eclipse.core.runtime"/>
-	  <import plugin="org.eclipse.ui"/>
-	  <import plugin="org.eclipse.ui.console"/>
-	  <import plugin="org.eclipse.core.resources"/>
-	  <import plugin="org.eclipse.search"/>
-	  <import plugin="org.eclipse.debug.ui"/>
-	  <import plugin="org.eclipse.core.filebuffers"/>
-	  <import plugin="org.eclipse.jface.text"/>
-	  <import plugin="org.eclipse.ui.workbench.texteditor"/>
-	  <import plugin="org.eclipse.ui.ide"/>
-	  <import plugin="org.eclipse.ui.views"/>
-	  <import plugin="org.eclipse.ui.editors"/>
-	  <import plugin="org.eclipse.team.core"/>
-	  <import plugin="org.eclipse.swt"/>
-	  <import plugin="org.eclipse.search"/>
-  <!--    <import plugin="net.sourceforge.phpeclipse.quantum.sql"/>  -->
-   <!--   <import plugin="com.quantum.Quantum"/>  -->
-	  <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
-	  <import plugin="net.sourceforge.phpeclipse.externaltools"/>
-	  <import plugin="net.sourceforge.phpeclipse.ui"/>
-	  <import plugin="net.sourceforge.phpeclipse.xml.ui"/>
-	  <import plugin="org.eclipse.ltk.core.refactoring"/>
-	  <import plugin="org.eclipse.ltk.ui.refactoring"/>
-   </requires>
- 
-   <extension
+<?eclipse version="3.2"?>
+<plugin>
+    <extension
 		 id="phpnature"
 		 name="%naturePHP.name"
 		 point="org.eclipse.core.resources.natures">
@@ -227,29 +188,8 @@
 			Create a new PHP project.
 		 </description>
 	  </wizard>
- <!-- 	 <wizard
-		id="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
-		name="%NewPHPClass.label"
-		class="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
-		category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-		icon="icons/ctool16/newclass_wiz.gif">
-		<description>%NewPHPClass.description</description>
-	</wizard>      -->
-<!--
-<this wizard replaces it as it works - maybe not as pretty but still>
 
 	  <wizard
-			name="%newWizardPHPProject.name"
-			icon="icons/obj16/php.gif"
-			category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-			class="net.sourceforge.phpeclipse.wizards.TempnewPHPProject"
-			project="true"
-			id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation">
-		 <description>
-			Create a new PHP project.
-		 </description>
-	  </wizard> -->
-	  <wizard
 			name="%newWizardPHPFile.name"
 			icon="icons/obj16/phpedit.gif"
 			category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -289,26 +229,6 @@
    </extension>
    <extension
 		 point="org.eclipse.ui.propertyPages">
-<!--      <page
-			objectClass="org.eclipse.core.resources.IProject"
-			name="%propertyPagePHPProject.name"
-			class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
-			id="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage">
-		 <filter
-			   name="nature"
-			   value="net.sourceforge.phpeclipse.phpnature">
-		 </filter>
-	  </page>
-	  <page
-			objectClass="org.eclipse.core.resources.IProject"
-			name="PHP Project Settings"
-			class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
-			id="net.sourceforge.phpeclipse.preferences.project.PHPMiscProjectPreferences">
-		 <filter
-			   name="nature"
-			   value="net.sourceforge.phpeclipse.phpnature">
-		 </filter>
-	  </page> -->
 	  <page
          class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPropertyPage"
          icon="icons/obj16/php.png"
@@ -353,22 +273,7 @@
 			   value="net.sourceforge.phpeclipse.phpnature">
 		 </filter>
 	  </page>
-	 <!--  <page
-			objectClass="org.eclipse.core.resources.IFile"
-			name="PHP File Settings"
-			class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
-			id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
-	  </page> -->
    </extension>
-<!--   <extension
-		 point="org.eclipse.ui.views">
-	  <view
-			name="%viewPHPResources.name"
-			icon="icons/obj16/php.gif"
-			class="net.sourceforge.phpeclipse.resourcesview.PHPResourcesView"
-			id="net.sourceforge.phpeclipse.resourcesview.ViewPHPResources">
-	  </view>
-   </extension> -->
    <extension
 		 point="org.eclipse.ui.editors">
 	  <editor
@@ -383,26 +288,6 @@
 			   contentTypeId="net.sourceforge.phpeclipse.phpSource"
 			/>
 	  </editor>
- <!--     <editor
-			name="%phpEditorName"
-			default="true"
-			icon="icons/obj16/htmledit.gif"
-			extensions="htm,html,xhtml"
-			contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-			symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
-			id="net.sourceforge.phpeclipse.PHPUnitEditor">
-	  </editor> -->
-  <!--    <editor
-			name="%phpEditorName"
-			default="true"
-			icon="icons/obj16/htmledit.gif"
-			extensions="tpl"
-			contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-			symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
-			id="net.sourceforge.phpeclipse.PHPUnitEditor">
-	  </editor> -->
    </extension>
 	  <extension
 		 point="org.eclipse.ui.fontDefinitions">
@@ -567,50 +452,6 @@
 <!-- =========================================================================== -->
 <!-- PHP Editor Action Definition IDs -->
 <!-- =========================================================================== -->
-<!--   <extension
-		 point="org.eclipse.ui.actionDefinitions">
-
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal">
-	  </actionDefinition>
-
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.phpeditor.Comment">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.phpeditor.Format">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.ui.edit.text.php.show.next.problem">
-	  </actionDefinition>
-	  <actionDefinition
-			id="net.sourceforge.phpeclipse.ui.edit.text.php.show.previous.problem">
-	  </actionDefinition>
-   </extension> -->
-<!--   <extension
-		 point="org.eclipse.ui.acceleratorSets">
-	  <acceleratorSet
-			scopeId="org.eclipse.ui.textEditorScope"
-			configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
-		 <accelerator
-			   key="Ctrl+/"
-			   id="net.sourceforge.phpdt.ui.actions.comment">
-		 </accelerator>
-		 <accelerator
-			   key="Ctrl+\\"
-			   id="net.sourceforge.phpdt.ui.actions.uncomment">
-		 </accelerator>
-	  </acceleratorSet>
-   </extension> -->
 
    <extension
 		 point="org.eclipse.ui.popupMenus">
@@ -725,16 +566,6 @@
 		 </action>
 	  </objectContribution>
 
-  <!--    <viewerContribution
-			targetID="#PHPEditorContext"
-			id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
-		 <action
-			   label="Open Quantum SQL Table View"
-			   class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
-			   menubarPath="additions"
-			   id="net.sourceforge.phpeclipse.actions.opensqltable">
-		 </action>
-	  </viewerContribution> -->
 	  <viewerContribution
 			targetID="#PHPEditorContext"
 			id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
@@ -774,14 +605,6 @@
 				menubarPath="additions"
 				id="net.sourceforge.phpdt.ltk.ui.actions.RenameLocalVariable"/>
 	  </viewerContribution>
-  <!--    <viewerContribution
-		targetID="#PHPEditorContext"
-		id="net.sourceforge.phpdt.ltk.renamePHPIdentifier">
-		<action label="Rename PHP Identifier"
-				class="net.sourceforge.phpdt.ltk.ui.actions.RenamePHPIdentifier"
-				menubarPath="additions"
-				id="net.sourceforge.phpdt.ltk.ui.actions.RenamePHPIdentifier"/>
-	  </viewerContribution> -->
 	  <viewerContribution
 			targetID="#PHPRulerContext"
 			id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
@@ -1003,14 +826,6 @@
 			contentTypeId="net.sourceforge.phpeclipse.phpSource"
 			class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
 	  </participant>
-   <!--   <participant
-			extensions="html,xml"
-			class="net.sourceforge.phpeclipse.phpeditor.HTMLDocumentSetupParticipant">
-	  </participant>
-	  <participant
-			extensions="tpl"
-			class="net.sourceforge.phpeclipse.phpeditor.SmartyDocumentSetupParticipant">
-	  </participant> -->
    </extension>
    <extension
 		 id="net.sourceforge.phpeclipse.JavaDocumentFactory"
@@ -1024,12 +839,6 @@
 
    <extension
 		 point="org.eclipse.ui.preferencePages">
-   <!--     <page
-			name="PHP"
-			category="net.sourceforge.phpeclipse.ui.preferencePage"
-			class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
-			id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
-	  </page> -->
 	  <page name="PHP"
 			category="net.sourceforge.phpeclipse.ui.preferencePage"
 			class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
@@ -1041,36 +850,6 @@
 			class="net.sourceforge.phpdt.internal.ui.preferences.CodeTemplatePreferencePage"
 			id="net.sourceforge.phpeclipse.preference.CodeTemplatePreferencePage">
 	  </page>
-  <!--    <page
-			name="Members Sort Order"
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			class="net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferencePage"
-			id="net.sourceforge.phpeclipse.preference.MembersOrderPreferencePage">
-	  </page>
-	  <page
-			name="PHP External Parser Command"
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
-			id="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage">
-	  </page>
-	 <page
-			name="Editor2"
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
-			id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
-	  </page>
-	  <page
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			name="PHP Project Defaults"
-			class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
-			id="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences">
-	  </page>
-	  <page
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			name="PHP Browser Preview"
-			class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
-			id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
-	  </page> -->
 	  <page
 			name="%compilerOptionsPrefName"
 			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
@@ -1100,18 +879,6 @@
 			class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"
 			id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
 	  </page>
-  <!--      <page
-			name="%templatePageName"
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
-			id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
-	  </page>
-	  <page
-			name="Language Settings"
-			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-			class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
-			id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
-	  </page> -->
 	  <page
 			name="%spellingPrefName"
 			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
@@ -1123,111 +890,8 @@
 			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
 			class="net.sourceforge.phpdt.internal.ui.preferences.MarkOccurrencesPreferencePage"
 			id="net.sourceforge.phpdt.internal.ui.preferences.MarkOccurrencesPreferencePage">
-  <!--       <keywordReference id="org.eclipse.jdt.ui.markoccurrences"/> -->
 	  </page>
    </extension>
- <!--  <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="php,php3,php4,php5,phtml,inc,module"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%php3FileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%php4FileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%php5FileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%moduleFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%incFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%phtmlFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-  <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%htmlFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%htmFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="xhtml"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension> -->
- <!--  <extension
-		 point="org.eclipse.ui.editors.documentProviders">
-	  <provider
-			extensions="%tplFileExtension"
-			class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-			id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-	  </provider>
-   </extension>
-   <extension
-		 point="org.eclipse.ui.views">
-	  <category
-			name="%viewCategoryName"
-			id="net.sourceforge.phpeclipse.views.category">
-	  </category>
-	  <view
-			name="%phpConsoleView"
-			icon="icons/obj16/php.gif"
-			category="net.sourceforge.phpeclipse.views.category"
-			class="net.sourceforge.phpeclipse.views.PHPConsole"
-			id="net.sourceforge.phpeclipse.views.phpconsoleview">
-	  </view>
-   </extension> -->
 
 <!-- external tools -->
 <!-- extension point definitions -->
@@ -1238,39 +902,6 @@
 	<extension-point id="refreshVariables" name="%ExtPoint.refreshVariables"/>
 
 <!-- Extensions -->
-	<!--<extension point="org.eclipse.ui.actionSets">
-		<actionSet
-			id="net.sourceforge.phpdt.externaltools.ExternalToolsSet"
-			label="%ActionSet.externalTools"
-			visible="true">
-			<menu id="org.eclipse.ui.run"
-				label="%Menu.run"
-				path="additions">
-				<separator name="ExternalToolsGroup"/>
-			</menu>
-			<action
-				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu"
-				label="%Action.externalTools"
-				menubarPath="org.eclipse.ui.run/ExternalToolsGroup"
-				disabledIcon="icons/externaltools/full/dtool16/external_tools.gif"
-				icon="icons/externaltools/full/etool16/external_tools.gif"
-				hoverIcon="icons/externaltools/full/ctool16/external_tools.gif"
-				pulldown="true"
-				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action>
-			<action
-				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateToolbar"
-				label="%Action.externalTools"
-				toolbarPath="Normal/additions"
-				disabledIcon="icons/externaltools/full/dtool16/external_tools.gif"
-				icon="icons/externaltools/full/etool16/external_tools.gif"
-				hoverIcon="icons/externaltools/full/ctool16/external_tools.gif"
-				tooltip="%Action.externalToolsTip"
-				pulldown="true"
-				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action>
-		</actionSet>
-	</extension> -->
 
 	<extension
 		point= "net.sourceforge.phpeclipse.foldingStructureProviders">
@@ -1523,12 +1154,6 @@
 			commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
 			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
 	  </key>
-   <!--   <key
-			sequence=""
-			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
-			commandId="net.sourceforge.phpdt.ui.edit.text.java.show.next.problem"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-	  </key> -->
 	  <key
 			sequence="Ctrl+Shift+P"
 			contextId="net.sourceforge.phpdt.ui.phpEditorScope"