Some serious cleanup on manifests, plugin.xml, build.properties and plugin.properties...

diff --git a/net.sourceforge.phpeclipse.core/build.properties b/net.sourceforge.phpeclipse.core/build.properties
index 1f1c94c..8263a8b 100644 (file)
--- a/net.sourceforge.phpeclipse.core/build.properties
+++ b/net.sourceforge.phpeclipse.core/build.properties
@@ -1,5 +1,12 @@
 source.webcore.jar = src/
 output.webcore.jar = bin/
 bin.includes = plugin.xml,\
-               webcore.jar
-src.includes = src/
\ No newline at end of file
+               webcore.jar,\
+               META-INF/
+src.includes = src/,\
+               .classpath,\
+               .cvsignore,\
+               .project,\
+               META-INF/,\
+               build.properties
+

diff --git a/net.sourceforge.phpeclipse.debug.core/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.debug.core/META-INF/MANIFEST.MF
index 1f0be88..450ab69 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.core/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.debug.core/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@ 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
+ net.sourceforge.phpdt.internal.debug.core;x-internal:=true,
+ net.sourceforge.phpdt.internal.debug.core.breakpoints;x-internal:=true,
+ net.sourceforge.phpdt.internal.debug.core.model;x-internal:=true,
+ net.sourceforge.phpdt.internal.debug.core.watch;x-internal:=true
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,

diff --git a/net.sourceforge.phpeclipse.debug.core/build.properties b/net.sourceforge.phpeclipse.debug.core/build.properties
index 445bbf6..0609b09 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.core/build.properties
+++ b/net.sourceforge.phpeclipse.debug.core/build.properties
@@ -1,9 +1,19 @@
 source.core.jar = src/
 bin.includes = core.jar,\
-               .classpath,\
-               .project,\
                .template,\
                os/,\
                plugin.properties,\
-               plugin.xml
-src.includes = src/ 
\ No newline at end of file
+               plugin.xml,\
+               META-INF/,\
+               icons/
+src.includes = src/,\
+               plugin.xml,\
+               plugin.properties,\
+               icons/,\
+               build.properties,\
+               META-INF/,\
+               .template,\
+               .project,\
+               .cvsignore,\
+               .classpath
+

diff --git a/net.sourceforge.phpeclipse.debug.core/plugin.properties b/net.sourceforge.phpeclipse.debug.core/plugin.properties
index e0e0212..fd68cb9 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.core/plugin.properties
+++ b/net.sourceforge.phpeclipse.debug.core/plugin.properties
@@ -1,7 +1,4 @@
 Plugin.name=PHPeclipse Debug Core
 
-views.category.name = PHPeclipse Debug Core
-views.errorLog.name= PHP Debug Log
 
-ViewCommand.logView.name= PHP Debug Log
-ViewCommand.logView.description= Show the PHP Debug Log
\ No newline at end of file
+

diff --git a/net.sourceforge.phpeclipse.debug.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.debug.ui/META-INF/MANIFEST.MF
index 36a0a26..1dadf65 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.debug.ui/META-INF/MANIFEST.MF
@@ -8,11 +8,11 @@ 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
+ net.sourceforge.phpdt.internal.debug.ui;x-internal:=true,
+ net.sourceforge.phpdt.internal.debug.ui.actions;x-internal:=true,
+ net.sourceforge.phpdt.internal.debug.ui.launcher;x-internal:=true,
+ net.sourceforge.phpdt.internal.debug.ui.preferences;x-internal:=true,
+ net.sourceforge.phpdt.internal.debug.ui.properties;x-internal:=true
 Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.jface.text,
  org.eclipse.ui.workbench.texteditor,
@@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.ui.ide,
  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

diff --git a/net.sourceforge.phpeclipse.debug.ui/build.properties b/net.sourceforge.phpeclipse.debug.ui/build.properties
index 0ff7776..1cc0067 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/build.properties
+++ b/net.sourceforge.phpeclipse.debug.ui/build.properties
@@ -3,5 +3,16 @@ bin.includes = debug.jar,\
                plugin.properties,\
                plugin.xml,\
                icons/,\
-               .template
-src.includes = src/ 
\ No newline at end of file
+               .template,\
+               META-INF/
+src.includes = src/,\
+               plugin.xml,\
+               plugin.properties,\
+               icons/,\
+               build.properties,\
+               META-INF/,\
+               .template,\
+               .project,\
+               .cvsignore,\
+               .classpath
+

diff --git a/net.sourceforge.phpeclipse.debug.ui/plugin.properties b/net.sourceforge.phpeclipse.debug.ui/plugin.properties
index 8003380..41b4400 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/plugin.properties
+++ b/net.sourceforge.phpeclipse.debug.ui/plugin.properties
@@ -1,19 +1,15 @@
 
 Plugin.name=PHPEclipse Debug UI
 
-PreferencePage.PHPBase.name=PHP
 PreferencePage.PHPInterpreter.name=Installed Interpreters
 
 LaunchShortcut.PHP.label=PHP Application
 
-DebugActionSet.label=PHP Debug
-RunMenu.label=&Run
 
-BreakpoingActionSet.label=PHP Breakpoints
 # GlobalManageBreakpointAction.label=Toggle Line Breakpoint (PHP)
 AddBreakpoint.label=Toggle DBG Breakpoint
 
 Context.Debugging.name=Debugging PHP
 Context.Debugging.description=Debugging PHP-Scripts
 DebugHover.description=Shows the value of the selected variable.
-DebugHover.label=debug variable hover
\ No newline at end of file
+DebugHover.label=debug variable hover

diff --git a/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF
index d11a190..4d6c028 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF
@@ -9,11 +9,11 @@ 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.internal.dialog;x-internal:=true,
+ net.sourceforge.phpdt.externaltools.internal.model;x-internal:=true,
+ net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations;x-internal:=true,
+ net.sourceforge.phpdt.externaltools.internal.registry;x-internal:=true,
+ net.sourceforge.phpdt.externaltools.internal.ui;x-internal:=true,
  net.sourceforge.phpdt.externaltools.launchConfigurations,
  net.sourceforge.phpdt.externaltools.model,
  net.sourceforge.phpdt.externaltools.preferences,

diff --git a/net.sourceforge.phpeclipse.externaltools/build.properties b/net.sourceforge.phpeclipse.externaltools/build.properties
index 2f07a9a..6f5db14 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/build.properties
+++ b/net.sourceforge.phpeclipse.externaltools/build.properties
@@ -2,7 +2,17 @@ source.externaltools.jar = src/
 output.externaltools.jar = bin/
 bin.includes = plugin.xml,\
                externaltools.jar,\
-               icons/
+               icons/,\
+               META-INF/,\
+               plugin.properties,\
+               prefs/
 src.includes = src/,\
                build.properties,\
-               icons/
+               icons/,\
+               plugin.xml,\
+               plugin.properties,\
+               .classpath,\
+               .cvsignore,\
+               .project,\
+               META-INF/,\
+               prefs/

diff --git a/net.sourceforge.phpeclipse.externaltools/plugin.properties b/net.sourceforge.phpeclipse.externaltools/plugin.properties
index 3a9fe73..719f8ee 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/plugin.properties
+++ b/net.sourceforge.phpeclipse.externaltools/plugin.properties
@@ -1,32 +1,8 @@
-LaunchConfigurationTypePHPApplication.name=PHP Application
 
 Program.externalTools=PHP Tools
 ExtPoint.configurationDuplicationMaps = Launch Configuration Duplication Maps
-ExtPoint.toolTypes = External Tool Types
 ExtPoint.argumentVariables  = Argument Variables
 ExtPoint.directoryVariables = Directory Variables
 ExtPoint.fileVariables = File Variables
 ExtPoint.refreshVariables = Refresh Scope Variables
-ExternalToolsLaunchGroup.label = &External Tools
-ToolType.programName = Program
-ToolType.programDescription = An external tool that runs an application, a batch file, etc.
-Menu.run = &Run
-ActionSet.externalTools = External Tools
-Action.externalTools = &External Tools
-Action.externalToolsTip = Run Last Tool
-PropertyPage.main = Main
-PropertyPage.option = Options
-PropertyPage.refresh = Refresh Scope
-PropertyPage.antTargets = Targets
-PropertyPage.externalToolsBuilders = PHP Launch Builders
-CategoryView.externalTools = PHP Launchers
-CategoryNewWizard.externalTools = PHP Launchers
-NewWizard.programName = Program
-NewWizard.programDescription = Create an external tool to run an application, a batch file, etc.
-Builder.externalTools = Integrated PHP Launcher Builder
-View.externalToolView = PHP Launchers
-View.logConsole = Log Console
-PreferencePage.externalToolsPreferences = PHP Launchers
-PreferencePage.antConsolePreferences = Console
-PreferencePage.antRuntimePreferences = Runtime
 

diff --git a/net.sourceforge.phpeclipse.feature.core/build.properties b/net.sourceforge.phpeclipse.feature.core/build.properties
index 9f3c1db..d09bfad 100644 (file)
--- a/net.sourceforge.phpeclipse.feature.core/build.properties
+++ b/net.sourceforge.phpeclipse.feature.core/build.properties
@@ -5,4 +5,8 @@ bin.includes = feature.xml,\
 src.includes = .project,\
                build.properties,\
                feature.xml,\
-               phpeclipse.jpeg
+               phpeclipse.jpeg,\
+               build.xml,\
+               build_export.xml,\
+               cpl-v10.html,\
+               license.html

diff --git a/net.sourceforge.phpeclipse.feature.core/feature.xml b/net.sourceforge.phpeclipse.feature.core/feature.xml
index b11f615..0ffdb1f 100644 (file)
--- a/net.sourceforge.phpeclipse.feature.core/feature.xml
+++ b/net.sourceforge.phpeclipse.feature.core/feature.xml
@@ -3,7 +3,7 @@
       id="net.sourceforge.phpeclipse.core"
       label="net.sourceforge.phpeclipse.core"
       version="1.1.2"
-      provider-name="www.phpeclipse.de"
+      provider-name="PHPEclipse project team"
       image="phpeclipse.jpeg">
 
    <install-handler/>
@@ -211,17 +211,4 @@ b) in the case of each subsequent Contributor:&lt;/FONT&gt;&lt;/UL&gt;
          download-size="0"  
          install-size="0"
          version="1.1.2"/>
-
-   <plugin
-         id="net.sourceforge.phpeclipse.news"
-         download-size="0"
-         install-size="0"
-         version="1.1.2"/>
-         
-   <plugin
-         id="net.sourceforge.phpeclipse.wiki"
-         download-size="0"
-         install-size="0"
-         version="1.1.2"/>
-
 </feature>

diff --git a/net.sourceforge.phpeclipse.feature/build.properties b/net.sourceforge.phpeclipse.feature/build.properties
index 9f3c1db..a868e52 100644 (file)
--- a/net.sourceforge.phpeclipse.feature/build.properties
+++ b/net.sourceforge.phpeclipse.feature/build.properties
@@ -5,4 +5,8 @@ bin.includes = feature.xml,\
 src.includes = .project,\
                build.properties,\
                feature.xml,\
-               phpeclipse.jpeg
+               phpeclipse.jpeg,\
+               license.html,\
+               cpl-v10.html,\
+               build_export.xml,\
+               .cvsignore

diff --git a/net.sourceforge.phpeclipse.feature/feature.xml b/net.sourceforge.phpeclipse.feature/feature.xml
index 6547d27..2835ce1 100644 (file)
--- a/net.sourceforge.phpeclipse.feature/feature.xml
+++ b/net.sourceforge.phpeclipse.feature/feature.xml
@@ -3,17 +3,16 @@
       id="net.sourceforge.phpeclipse"
       label="PHPeclipse"
       version="1.1.9"
-      provider-name="www.phpeclipse.de"
-      image="phpeclipse.jpeg"
-      primary="true">
+      provider-name="PHpEclipse project team"
+      image="phpeclipse.jpeg">
    <install-handler/>
 
-   <description url="http://www.phpeclipse.de">
+   <description url="http://www.phpeclipse.net">
       PHPeclipse - PHP development tools.
    </description>
 
-   <copyright url="[Enter Copyright URL here.]">
-      PHPeclipse.de Software User Agreement
+   <copyright>
+      PHPeclipse Software User Agreement
 
 Usage Of Content
 PHPECLIPSE.DE MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
@@ -239,12 +238,4 @@ This Agreement is governed by the laws of the State of New York and the intellec
          download-size="0"
          install-size="0"
          version="1.1.9"/>
-
-   <plugin
-         id="org.eclipse.pde.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>

diff --git a/net.sourceforge.phpeclipse.launching/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.launching/META-INF/MANIFEST.MF
index 4c65104..ff25e77 100644 (file)
--- a/net.sourceforge.phpeclipse.launching/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.launching/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ 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
+Export-Package: net.sourceforge.phpdt.internal.launching;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,

diff --git a/net.sourceforge.phpeclipse.launching/build.properties b/net.sourceforge.phpeclipse.launching/build.properties
index 6948c1e..ee0810d 100644 (file)
--- a/net.sourceforge.phpeclipse.launching/build.properties
+++ b/net.sourceforge.phpeclipse.launching/build.properties
@@ -1,9 +1,18 @@
 source.launch.jar = src/
 bin.includes = plugin.xml,\
                plugin.properties,\
+               .template,\
+               cpl-v10.html,\
+               launch.jar,\
+               META-INF/
+src.includes = src/,\
                .classpath,\
+               .cvsignore,\
                .project,\
                .template,\
+               META-INF/,\
+               build.properties,\
                cpl-v10.html,\
-               launch.jar
-src.includes = src/
\ No newline at end of file
+               plugin.properties,\
+               plugin.xml
+

diff --git a/net.sourceforge.phpeclipse.nl1/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.nl1/META-INF/MANIFEST.MF
index b9f6111..1d2e2ac 100644 (file)
--- a/net.sourceforge.phpeclipse.nl1/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.nl1/META-INF/MANIFEST.MF
@@ -7,5 +7,16 @@ 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
+Export-Package: net.sourceforge.phpdt.externaltools.internal.model;x-internal:=true,
+ net.sourceforge.phpdt.externaltools.launchConfigurations,
+ net.sourceforge.phpdt.internal.corext;x-internal:=true,
+ net.sourceforge.phpdt.internal.corext.template;x-internal:=true,
+ net.sourceforge.phpdt.internal.corext.template.php;x-internal:=true,
+ net.sourceforge.phpdt.internal.corext.textmanipulation;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.actions;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.preferences;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.link;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.wizards;x-internal:=true,
+ net.sourceforge.phpeclipse.preferences,
+ net.sourceforge.phpeclipse.wizards

diff --git a/net.sourceforge.phpeclipse.nl1/build.properties b/net.sourceforge.phpeclipse.nl1/build.properties
index 88fae7a..4b71575 100644 (file)
--- a/net.sourceforge.phpeclipse.nl1/build.properties
+++ b/net.sourceforge.phpeclipse.nl1/build.properties
@@ -1,4 +1,13 @@
 source.nl1.jar = src/
 bin.includes = fragment.xml,\
                *.jar,\
-               nl1.jar
+               nl1.jar,\
+               META-INF/,\
+               src/
+src.includes = .classpath,\
+               .project,\
+               .template,\
+               META-INF/,\
+               build.properties,\
+               build.xml,\
+               src/

diff --git a/net.sourceforge.phpeclipse.phphelp.nl1/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.phphelp.nl1/META-INF/MANIFEST.MF
index 296558c..e4fdbc9 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp.nl1/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.phphelp.nl1/META-INF/MANIFEST.MF
@@ -7,5 +7,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
+Export-Package: net.sourceforge.phpdt.phphelp

diff --git a/net.sourceforge.phpeclipse.phphelp/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.phphelp/META-INF/MANIFEST.MF
index 62fc871..db8b959 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.phphelp/META-INF/MANIFEST.MF
@@ -15,11 +15,10 @@ Export-Package: net.sourceforge.phpdt.httpquery,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,
+ org.eclipse.ui.editors,
  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/build.properties b/net.sourceforge.phpeclipse.phphelp/build.properties
index 28c6c9d..2d1013e 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/build.properties
+++ b/net.sourceforge.phpeclipse.phphelp/build.properties
@@ -3,15 +3,19 @@ bin.includes = phphelp.jar,\
                phphelp.xml,\
                plugin.properties,\
                plugin.xml,\
-               .classpath,\
                doc.zip,\
-               cpl-v10.html
+               cpl-v10.html,\
+               META-INF/,\
+               .template
 src.includes = src/,\
                .cvsignore,\
                .project,\
                .template,\
                .classpath,\
                build.properties,\
-               build.xml,\
                plugin.properties,\
-               plugin.xml
+               plugin.xml,\
+               META-INF/,\
+               cpl-v10.html,\
+               doc.zip,\
+               phphelp.xml

diff --git a/net.sourceforge.phpeclipse.phpunit/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.phpunit/META-INF/MANIFEST.MF
index 304a477..328d632 100644 (file)
--- a/net.sourceforge.phpeclipse.phpunit/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.phpunit/META-INF/MANIFEST.MF
@@ -8,13 +8,10 @@ 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"
+ org.eclipse.core.runtime.compatibility
 Eclipse-LazyStart: true
 Plugin-Class: net.sourceforge.phpeclipse.phpunit.PHPUnitPlugin
+Export-Package: net.sourceforge.phpeclipse.phpunit,
+ net.sourceforge.phpeclipse.phpunit.preferences,
+ net.sourceforge.phpeclipse.phpunit.reporthandling,
+ net.sourceforge.phpeclipse.phpunit.testpool

diff --git a/net.sourceforge.phpeclipse.phpunit/build.properties b/net.sourceforge.phpeclipse.phpunit/build.properties
index 00a0721..0369f19 100644 (file)
--- a/net.sourceforge.phpeclipse.phpunit/build.properties
+++ b/net.sourceforge.phpeclipse.phpunit/build.properties
@@ -2,7 +2,14 @@ source.phpunit.jar = src/
 bin.includes = plugin.xml,\
                *.jar,\
                phpunit.jar,\
-               icons/
+               icons/,\
+               META-INF/
 src.includes = src/,\
                build.properties,\
-               build.xml
+               build.xml,\
+               plugin.xml,\
+               icons/,\
+               .classpath,\
+               .cvsignore,\
+               .project,\
+               META-INF/

diff --git a/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF
index f9bbfae..1fbd4b2 100644 (file)
--- a/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.smarty.ui/META-INF/MANIFEST.MF
@@ -8,18 +8,17 @@ 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,
+ net.sourceforge.phpdt.smarty.ui.internal;x-internal:=true,
+ net.sourceforge.phpdt.smarty.ui.internal.editor;x-internal:=true,
+ net.sourceforge.phpdt.smarty.ui.internal.text;x-internal:=true
+Require-Bundle: org.eclipse.core.runtime,
  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
+ org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.jface.text,
+ net.sourceforge.phpeclipse.ui,
+ net.sourceforge.phpeclipse.xml.ui
 Eclipse-LazyStart: true

diff --git a/net.sourceforge.phpeclipse.smarty.ui/build.properties b/net.sourceforge.phpeclipse.smarty.ui/build.properties
index 3d300c3..1baa8d9 100644 (file)
--- a/net.sourceforge.phpeclipse.smarty.ui/build.properties
+++ b/net.sourceforge.phpeclipse.smarty.ui/build.properties
@@ -1,11 +1,17 @@
 bin.includes = plugin.xml,\
                icons/,\
                cpl-v10.html,\
-               smartyui.jar
+               smartyui.jar,\
+               META-INF/
 src.includes = src/,\
                .classpath,\
                .cvsignore,\
-               .project
+               .project,\
+               META-INF/,\
+               build.properties,\
+               cpl-v10.html,\
+               icons/,\
+               plugin.xml
 jars.compile.order = smartyui.jar
 source.smartyui.jar = src/
 output.smartyui.jar = bin/

diff --git a/net.sourceforge.phpeclipse.smarty.ui/plugin.xml b/net.sourceforge.phpeclipse.smarty.ui/plugin.xml
index f29783d..467d91e 100644 (file)
--- a/net.sourceforge.phpeclipse.smarty.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.smarty.ui/plugin.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
 <plugin>
-
    <extension
          point="org.eclipse.ui.editors">
       <editor

diff --git a/net.sourceforge.phpeclipse.tests/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.tests/META-INF/MANIFEST.MF
index a5527ca..5decd51 100644 (file)
--- a/net.sourceforge.phpeclipse.tests/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.tests/META-INF/MANIFEST.MF
@@ -8,14 +8,13 @@ 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
+Export-Package: net.sourceforge.phpdt.core.tests.util,
+ net.sourceforge.phpeclipse.example.outline,
+ net.sourceforge.phpeclipse.phpeditor.php.test,
+ net.sourceforge.phpeclipse.tests.parser

diff --git a/net.sourceforge.phpeclipse.tests/build.properties b/net.sourceforge.phpeclipse.tests/build.properties
index cdebf23..6297c21 100644 (file)
--- a/net.sourceforge.phpeclipse.tests/build.properties
+++ b/net.sourceforge.phpeclipse.tests/build.properties
@@ -1 +1,15 @@
+jars.compile.order = coretests.jar
 source.coretests.jar = src/
+output.coretests.jar = bin/
+bin.includes = coretests.jar,\
+               META-INF/,\
+               plugin.xml,\
+               test.php
+src.includes = test.php,\
+               src/,\
+               plugin.xml,\
+               build.properties,\
+               META-INF/,\
+               .template,\
+               .project,\
+               .classpath

diff --git a/net.sourceforge.phpeclipse.tests/plugin.xml b/net.sourceforge.phpeclipse.tests/plugin.xml
index b3ca49b..e87d50b 100644 (file)
--- a/net.sourceforge.phpeclipse.tests/plugin.xml
+++ b/net.sourceforge.phpeclipse.tests/plugin.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
 <plugin>
-
    <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
index 3075690..38dc60e 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ 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.internal;x-internal:=true,
  net.sourceforge.phpeclipse.ui.overlaypages,
  net.sourceforge.phpeclipse.ui.preferences,
  net.sourceforge.phpeclipse.ui.templates.preferences,

diff --git a/net.sourceforge.phpeclipse.ui/build.properties b/net.sourceforge.phpeclipse.ui/build.properties
index 792fcb5..0c21e10 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/build.properties
+++ b/net.sourceforge.phpeclipse.ui/build.properties
@@ -3,9 +3,18 @@ bin.includes = plugin.xml,\
                icons/,\
                plugin.properties,\
                templates/,\
-               ui.jar
+               ui.jar,\
+               .project,\
+               META-INF/
 source.ui.jar = src/
 src.includes = src/,\
                .classpath,\
                .cvsignore,\
-               .project
+               .project,\
+               templates/,\
+               plugin.xml,\
+               plugin.properties,\
+               icons/,\
+               cpl-v10.html,\
+               build.properties,\
+               META-INF/

diff --git a/net.sourceforge.phpeclipse.ui/plugin.properties b/net.sourceforge.phpeclipse.ui/plugin.properties
index b40847d..6bb4bfe 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/plugin.properties
+++ b/net.sourceforge.phpeclipse.ui/plugin.properties
@@ -8,17 +8,16 @@
 # Contributors:
 #     Christopher Lenz - initial english resources
 # 
-# $Id: plugin.properties,v 1.3 2006-10-17 19:42:23 pombredanne Exp $
+# $Id: plugin.properties,v 1.4 2006-10-21 23:05:18 pombredanne Exp $
 #
 
 pluginName = Web Development Tools UI
 providerName= PHPEclipse project team
 
 preferencePageName = PHPeclipse Web Development
-viewCategoryName = PHPeclipse Web Development
 
 
 templates.contextType.xml=xml
 templates.contextType.html=html
 templates.contextType.smarty=smarty
-templates.contextType.javascript=javascript
\ No newline at end of file
+templates.contextType.javascript=javascript

diff --git a/net.sourceforge.phpeclipse.ui/plugin.xml b/net.sourceforge.phpeclipse.ui/plugin.xml
index cdcea3e..d66b8fc 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.ui/plugin.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
 <plugin>
-
    <extension
          point="org.eclipse.ui.preferencePages">
       <page

diff --git a/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF
index b07ef0b..2933a30 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Activator: net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUIPlu
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: net.sourceforge.phpeclipse.webbrowser,
- net.sourceforge.phpeclipse.webbrowser.internal,
+ net.sourceforge.phpeclipse.webbrowser.internal;x-internal:=true,
  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",

diff --git a/net.sourceforge.phpeclipse.webbrowser/build.properties b/net.sourceforge.phpeclipse.webbrowser/build.properties
index ccd2fde..b027678 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/build.properties
+++ b/net.sourceforge.phpeclipse.webbrowser/build.properties
@@ -4,13 +4,20 @@ bin.includes = plugin.xml,\
                icons/,\
                home/,\
                defaultBrowsers.xml,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/,\
+               schema/
 src.includes = schema/,\
                build.properties,\
                src/,\
                .classpath,\
                .cvsignore,\
                .project,\
-               plugin.properties
+               plugin.properties,\
+               plugin.xml,\
+               icons/,\
+               home/,\
+               defaultBrowsers.xml,\
+               META-INF/
 source.webbrowser.jar = src/
 output.webbrowser.jar = bin/

diff --git a/net.sourceforge.phpeclipse.webbrowser/plugin.properties b/net.sourceforge.phpeclipse.webbrowser/plugin.properties
index a23bc71..d5761b0 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/plugin.properties
+++ b/net.sourceforge.phpeclipse.webbrowser/plugin.properties
@@ -7,36 +7,14 @@ extensionPointURLMap=URL Map
 extensionPointFavorites=Favorite URLs
 
 # --- Internal Web Browser ---
-internalWebBrowserName=PHP Web Browser
 viewWebBrowserTitle=PHP Web Browser
 
 # Actions
-actionWebBrowserGo=Go to the selected URL
-actionWebBrowserBack=Back to the previous page
-actionWebBrowserForward=Forward to the next page
-actionWebBrowserStop=Stop loading the current page
-actionWebBrowserRefresh=Refresh the current page
-actionWebBrowserPrint=Print the current page
-actionWebBrowserFavorites=Favorites
-actionWebBrowserNoFavorites=No Favorites
-actionWebBrowserOrganizeFavorites=Organize Favorites...
 
 # Status text
-webBrowserStatusUninitialized=Not ready
-webBrowserStatusLoading=Loading...
-webBrowserStatusLoaded=Ready
-webBrowserStatusInteractive=Loading...
-webBrowserStatusComplete=Done
 
 # message if a resource is deleted
-dialogResourceDeletedTitle=Web Resource Deleted
-dialogResourceDeletedMessage=The file {0} initially opened in the Web Browser has been deleted from the file system. Do you want to ignore the deletion or close the Web Browser?
-dialogResourceDeletedIgnore=Ignore
 
-dialogOrganizeFavoritesTitle=Organize Favorites
-dialogOrganizeFavoritesMessage=Organize favorite URLs below. Select the name or URL to edit.
-dialogOrganizeFavoritesName=Name
-dialogOrganizeFavoritesURL=URL
 
 # --------------- Action Sets (toolbar icon groups) ---------------
 
@@ -48,51 +26,10 @@ actionSetSwitchBrowser=Web Browser
 # --------------- Preferences ---------------
 
 # Name of the preference pages
-preferenceInternetTitle=Internet
-preferenceInternetDescription=General internet settings are available in the contained preference pages.
 preferenceWebBrowserTitle=Browser Configurations 
-preferenceWebBrowserTitleLong=Installed Web Browsers
-preferenceWebBrowserDescription=Add, remove, or edit installed Web browsers.\nThe selected Web browser will be used whenever Web pages are opened.
 
 # Web Browser preferences
-prefUseInternalBrowser=Use the &internal Web Browser
-prefBrowserNewPage=&Open a new page for each request
-prefUseExternalBrowser=Use e&xternal Web Browser
 
-errorDialogTitle=Error
-errorCouldNotLaunchWebBrowser=Could not launch external Web Browser for {0}. Check the Web Browser preferences.
-errorNoBrowser=Could not open a Web browser because there are none configured. Check the Web Browser preferences.
 
-browserList=Installed &Web Browsers:
-add=&Add...
-edit=&Edit...
-remove=&Remove
-search=&Search...
-createBrowser=Add Installed Web Browser
-editInternalBrowser=Internal Web Browser
-editExternalBrowser=Edit Installed Web Browser
-clearURLHistory=Clear URL history when exiting workbench
-clearURLHistoryNow=Clear URL History Now
-name=&Name:
-location=&Location:
-parameters=&Parameters:
-parametersMessage=(Use {0} to include the URL)
-browse=&Browse...
-browseMessage=Specify the location of the Web Browser executable
-errorCouldNotLaunchInternalWebBrowser=Could not launch internal Web Browser. Please set an external browser in the Browser preferences.
-searchingTaskName=Searching for Web browsers...
-searching=Found {0} - Searching {1}
-searchingNoneFound=No Web browsers were found.
-selectDirectory=Select a directory to search for Web browsers:
-directoryDialogTitle=Directory Selection
-locationInvalid=The location value is not a valid path name.
 
-browserInternetExplorer=Internet Explorer
-browserNetscape4=Netscape Communicator v4.x
-browserNetscape7=Netscape v7.x
-browserNetscape=Netscape
-browserMozilla=Mozilla
-browserOpera=Opera
-browserKonqueror=Konqueror
-browserGaleon=Galeon
-browserExternal=External Browser
\ 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 76828d3..4ecc2dc 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.xdebug.core/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-Name: XDebug Core
-Bundle-SymbolicName: net.sourceforge.phpeclipse.xdebug.core; singleton=true
+Bundle-SymbolicName: net.sourceforge.phpeclipse.xdebug.core;singleton:=true
 Bundle-Version: 0.0.1
 Bundle-ClassPath: core.jar
 Bundle-Activator: net.sourceforge.phpeclipse.xdebug.core.XDebugCorePlugin
@@ -9,9 +9,12 @@ 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
+ org.eclipse.core.resources
 Provide-Package: net.sourceforge.phpeclipse.xdebug.core,
  net.sourceforge.phpeclipse.xdebug.php.launching,
  net.sourceforge.phpeclipse.xdebug.php.model
 Eclipse-LazyStart: true
+Export-Package: net.sourceforge.phpeclipse.xdebug.core,
+ net.sourceforge.phpeclipse.xdebug.php.launching,
+ net.sourceforge.phpeclipse.xdebug.php.model
+Bundle-ManifestVersion: 2

diff --git a/net.sourceforge.phpeclipse.xdebug.core/build.properties b/net.sourceforge.phpeclipse.xdebug.core/build.properties
index 2ef0d6b..6132541 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.core/build.properties
+++ b/net.sourceforge.phpeclipse.xdebug.core/build.properties
@@ -3,3 +3,9 @@ output.core.jar = bin/
 bin.includes = META-INF/,\
                core.jar,\
                plugin.xml
+src.includes = src/,\
+               plugin.xml,\
+               build.properties,\
+               META-INF/,\
+               .project,\
+               .classpath

diff --git a/net.sourceforge.phpeclipse.xdebug.ui/build.properties b/net.sourceforge.phpeclipse.xdebug.ui/build.properties
index b0f84a5..4f6be16 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.ui/build.properties
+++ b/net.sourceforge.phpeclipse.xdebug.ui/build.properties
@@ -4,4 +4,10 @@ bin.includes = META-INF/,\
                .,\
                icons/,\
                plugin.xml
-src.includes = src/
+src.includes = src/,\
+               plugin.xml,\
+               icons/,\
+               build.properties,\
+               META-INF/,\
+               .project,\
+               .classpath

diff --git a/net.sourceforge.phpeclipse.xml.core/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xml.core/META-INF/MANIFEST.MF
index 6792f99..6ab4971 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.core/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.xml.core/META-INF/MANIFEST.MF
@@ -1,17 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: net.sourceforge.phpeclipse.xml.core; singleton=true
+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,
+Export-Package: net.sourceforge.phpeclipse.xml.core.internal.model;x-internal:=true,
+ net.sourceforge.phpeclipse.xml.core.internal.parser;x-internal:=true,
  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/build.properties b/net.sourceforge.phpeclipse.xml.core/build.properties
index ab84e0e..930aaa4 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.core/build.properties
+++ b/net.sourceforge.phpeclipse.xml.core/build.properties
@@ -1,9 +1,13 @@
-bin.includes = plugin.xml,\
-               xmlcore.jar,\
+bin.includes = xmlcore.jar,\
                cpl-v10.html,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/
 source.xmlcore.jar = src/
 src.includes = src/,\
                .classpath,\
                .cvsignore,\
-               .project
+               .project,\
+               plugin.properties,\
+               cpl-v10.html,\
+               build.properties,\
+               META-INF/

diff --git a/net.sourceforge.phpeclipse.xml.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.xml.ui/META-INF/MANIFEST.MF
index 001b8e7..a19005b 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.xml.ui/META-INF/MANIFEST.MF
@@ -8,21 +8,19 @@ 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.internal.compare;x-internal:=true,
+ net.sourceforge.phpeclipse.xml.ui.internal.editor;x-internal:=true,
+ net.sourceforge.phpeclipse.xml.ui.internal.outline;x-internal:=true,
+ net.sourceforge.phpeclipse.xml.ui.internal.preferences;x-internal:=true,
+ net.sourceforge.phpeclipse.xml.ui.internal.text;x-internal:=true,
  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,

diff --git a/net.sourceforge.phpeclipse.xml.ui/build.properties b/net.sourceforge.phpeclipse.xml.ui/build.properties
index 9576bf4..a223cd4 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.ui/build.properties
+++ b/net.sourceforge.phpeclipse.xml.ui/build.properties
@@ -2,9 +2,16 @@ bin.includes = plugin.xml,\
                icons/,\
                cpl-v10.html,\
                plugin.properties,\
-               xmlui.jar
+               xmlui.jar,\
+               META-INF/
 source.xmlui.jar = src/
 src.includes = src/,\
                .classpath,\
                .project,\
-               .cvsignore
+               .cvsignore,\
+               plugin.xml,\
+               plugin.properties,\
+               icons/,\
+               cpl-v10.html,\
+               build.properties,\
+               META-INF/

diff --git a/net.sourceforge.phpeclipse.xml.ui/plugin.properties b/net.sourceforge.phpeclipse.xml.ui/plugin.properties
index d184fa9..5526125 100644 (file)
--- a/net.sourceforge.phpeclipse.xml.ui/plugin.properties
+++ b/net.sourceforge.phpeclipse.xml.ui/plugin.properties
@@ -8,16 +8,12 @@
 # Contributors:
 #     Christopher Lenz - initial english resources
 # 
-# $Id: plugin.properties,v 1.4 2006-10-17 19:42:02 pombredanne Exp $
+# $Id: plugin.properties,v 1.5 2006-10-21 23:05:29 pombredanne Exp $
 #
 
 pluginName = PHPeclipse Web Development Tools XML UI
 providerName= PHPEclipse project team
 
-xmlEditorName = XML Editor
-dtdEditorName = DTD Editor
 
-xmlEditorPreferencePageName = HTML in PHP Editor
 
-templates.xml.contextType.name = XML Context
-templates.html.contextType.name = HTML Context
\ No newline at end of file
+

diff --git a/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF
index 4f4afa5..8b08c9d 100644 (file)
--- a/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF
@@ -14,57 +14,57 @@ Export-Package: net.sourceforge.phpdt.core,
  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.internal.codeassist;x-internal:=true,
+ net.sourceforge.phpdt.internal.codeassist.impl;x-internal:=true,
+ net.sourceforge.phpdt.internal.compiler;x-internal:=true,
+ net.sourceforge.phpdt.internal.compiler.ast;x-internal:=true,
+ net.sourceforge.phpdt.internal.compiler.batch;x-internal:=true,
+ net.sourceforge.phpdt.internal.compiler.codegen;x-internal:=true,
+ net.sourceforge.phpdt.internal.compiler.env;x-internal:=true,
+ net.sourceforge.phpdt.internal.compiler.flow;x-internal:=true,
+ net.sourceforge.phpdt.internal.compiler.impl;x-internal:=true,
+ net.sourceforge.phpdt.internal.compiler.lookup;x-internal:=true,
+ net.sourceforge.phpdt.internal.compiler.parser;x-internal:=true,
+ net.sourceforge.phpdt.internal.compiler.problem;x-internal:=true,
+ net.sourceforge.phpdt.internal.compiler.util;x-internal:=true,
+ net.sourceforge.phpdt.internal.core;x-internal:=true,
+ net.sourceforge.phpdt.internal.core.builder;x-internal:=true,
+ net.sourceforge.phpdt.internal.core.jdom;x-internal:=true,
+ net.sourceforge.phpdt.internal.core.util;x-internal:=true,
+ net.sourceforge.phpdt.internal.corext;x-internal:=true,
+ net.sourceforge.phpdt.internal.corext.codemanipulation;x-internal:=true,
+ net.sourceforge.phpdt.internal.corext.phpdoc;x-internal:=true,
+ net.sourceforge.phpdt.internal.corext.refactoring.util;x-internal:=true,
+ net.sourceforge.phpdt.internal.corext.template;x-internal:=true,
+ net.sourceforge.phpdt.internal.corext.template.php;x-internal:=true,
+ net.sourceforge.phpdt.internal.corext.textmanipulation;x-internal:=true,
+ net.sourceforge.phpdt.internal.corext.util;x-internal:=true,
+ net.sourceforge.phpdt.internal.formatter;x-internal:=true,
+ net.sourceforge.phpdt.internal.formatter.align;x-internal:=true,
+ net.sourceforge.phpdt.internal.formatter.impl;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.actions;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.dialogs;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.dnd;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.filters;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.phpdocexport;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.preferences;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.comment;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.folding;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.java;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.java.hover;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.link;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.phpdoc;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.spelling;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.spelling.engine;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.template;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.template.contentassist;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.text.template.preferences;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.util;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.viewsupport;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.wizards;x-internal:=true,
+ net.sourceforge.phpdt.internal.ui.wizards.dialogfields;x-internal:=true,
  net.sourceforge.phpdt.ltk.core,
  net.sourceforge.phpdt.ltk.ui,
  net.sourceforge.phpdt.ltk.ui.actions,
@@ -93,14 +93,12 @@ Require-Bundle: org.eclipse.core.runtime,
  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,

diff --git a/net.sourceforge.phpeclipse/build.properties b/net.sourceforge.phpeclipse/build.properties
index 3d5509f..bf86075 100644 (file)
--- a/net.sourceforge.phpeclipse/build.properties
+++ b/net.sourceforge.phpeclipse/build.properties
@@ -5,7 +5,31 @@ bin.includes = phpeclipse.jar,\
                plugin.properties,\
                plugin.xml,\
                cpl-v10.html,\
-               templates/
+               templates/,\
+               META-INF/,\
+               TODO,\
+               about.ini,\
+               .template,\
+               phpeclipse16.gif,\
+               phpeclipse32.gif,\
+               prefs/
 src.includes = src/,\
-               icons/
+               icons/,\
+               .classpath,\
+               .cvsignore,\
+               .project,\
+               .template,\
+               META-INF/,\
+               TODO,\
+               about.ini,\
+               build.properties,\
+               cpl-v10.html,\
+               install.txt,\
+               phpeclipse16.gif,\
+               phpeclipse32.gif,\
+               prefs/,\
+               plugin.xml,\
+               plugin.properties,\
+               templates/,\
+               test/
 output.phpeclipse.jar = bin/

diff --git a/net.sourceforge.phpeclipse/classpath_windows_eclipse_2.0.0.bak b/net.sourceforge.phpeclipse/classpath_windows_eclipse_2.0.0.bak
deleted file mode 100644 (file)
index 217e3f9..0000000
--- a/net.sourceforge.phpeclipse/classpath_windows_eclipse_2.0.0.bak
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-    <classpathentry kind="src" path="src/"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_2.0.0/resources.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_SOURCE/org.eclipse.core.resources_2.0.0/resourcessrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui_2.0.0/workbench.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_SOURCE/org.eclipse.ui_2.0.0/workbenchsrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.win32_2.0.0/workbenchwin32.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_WIN32_SOURCE/org.eclipse.ui.win32_2.0.0/workbenchwin32src.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.swt.win32_2.0.0/ws/win32/swt.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_WIN32_SOURCE/org.eclipse.swt.win32_2.0.0/ws/win32/swtsrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.help_2.0.0/help.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_SOURCE/org.eclipse.help_2.0.0/helpsrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.debug.ui_2.0.0/dtui.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_SOURCE/org.eclipse.debug.ui_2.0.0/dtuisrc.zip"/>\r
-    <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.3/xmlParserAPIs.jar"/>\r
-    <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.3/xercesImpl.jar"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_2.0.0/runtime.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_SOURCE/org.eclipse.core.runtime_2.0.0/runtimesrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_2.0.0/boot.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_SOURCE/org.eclipse.core.boot_2.0.0/bootsrc.zip"/>\r
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>\r
-    <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.junit_3.7.0/junit.jar"/>\r
-    <classpathentry kind="output" path="bin"/>\r
-</classpath>\r

diff --git a/net.sourceforge.phpeclipse/classpath_windows_eclipse_2.1.0.bak b/net.sourceforge.phpeclipse/classpath_windows_eclipse_2.1.0.bak
deleted file mode 100644 (file)
index d0147e7..0000000
--- a/net.sourceforge.phpeclipse/classpath_windows_eclipse_2.1.0.bak
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-    <classpathentry kind="src" path="src/"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_2.1.0/resources.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_2.1.0/resourcessrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui_2.1.0/ui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_2.1.0/uisrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.swt.win32_2.1.0/ws/win32/swt.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.swt.win32_2.1.0/ws/win32/swtsrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.text_2.1.0/text.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_2.1.0/textsrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.jface_2.1.0/jface.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_2.1.0/jfacesrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_2.1.0/jfacetext.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_2.1.0/jfacetextsrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.views_2.1.0/views.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_2.1.0/viewssrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_2.1.0/workbench.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_2.1.0/workbenchsrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.win32_2.1.0/workbenchwin32.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.ui.win32_2.1.0/workbenchwin32src.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench.texteditor_2.1.0/texteditor.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench.texteditor_2.1.0/texteditorsrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui.editors_2.1.0/editors.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.editors_2.1.0/editorssrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.help_2.1.0/help.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.help_2.1.0/helpsrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.debug.ui_2.1.0/dtui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.debug.ui_2.1.0/dtuisrc.zip"/>\r
-    <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.7/xmlParserAPIs.jar"/>\r
-    <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.7/xercesImpl.jar"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_2.1.0/runtime.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_2.1.0/runtimesrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_2.1.0/boot.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.boot_2.1.0/bootsrc.zip"/>\r
-    <classpathentry kind="var"\r
-        path="ECLIPSE_HOME/plugins/org.junit_3.8.1/junit.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.junit_3.8.1/junitsrc.zip"/>\r
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>\r
-    <classpathentry kind="output" path="bin"/>\r
-</classpath>
\ No newline at end of file

diff --git a/net.sourceforge.phpeclipse/plugin.properties b/net.sourceforge.phpeclipse/plugin.properties
index 6b4c0dd..4cada84 100644 (file)
--- a/net.sourceforge.phpeclipse/plugin.properties
+++ b/net.sourceforge.phpeclipse/plugin.properties
@@ -10,19 +10,14 @@ transientPHPProblemName=Transient PHP Problem
 phpTaskName=PHP Task
 phpSourceName=PHP Source File
 
-viewCategoryName = PHPeclipse Web Development
 phpEditorTextHoversName=PHP Editor Text Hovers
 
 perspectivePHP.name=PHP
-perspectiveHTML.name=HTML
-viewPHPResources.name=PHP Resources
 
 newWizardCategory.name=PHP
 newWizardPHPProject.name=PHP Project
 newWizardPHPFile.name=PHP File
 newWizardHTMLFile.name=HTML file
-NewPHPClass.label= Class
-NewPHPClass.description=Create a PHP class
 
 OpenActionSet.label=Open Declaration/Include
 OpenActionSet.description=Open a PHP Declaration or Include
@@ -30,7 +25,6 @@ OpenDeclaration=Open Declaration/Include
 ExportWizards.Obfuscator = Obfuscate PHP Project to File system
 ExportWizards.ObfuscatorDescription = Obfuscate PHP resources to the local file system
 
-propertyPagePHPProject.name=PHP Project Properties
 
 compilerPageName=PHP Parser
 todoPageName=PHP Task Tags
@@ -46,18 +40,6 @@ editorMarkOccurrencesPage= Mark Occurrences
 # Extension point names
 #
 phpEditorName=PHP Editor
-phpConsoleView=PHP Console
-phpFileExtension=php
-php3FileExtension=php3
-php4FileExtension=php4
-php5FileExtension=php5
-moduleFileExtension=module
-incFileExtension=inc
-phtmlFileExtension=phtml
-htmlFileExtension=html
-htmFileExtension=htm
-xmlFileExtension=xml
-tplFileExtension=tpl
 
 javaDocumentFactory=PHP Document Factory
 javaDocumentSetupParticipant=PHP Document Setup Participant
@@ -80,7 +62,6 @@ AddBookmark.tooltip=Add Bookmark...
 
 AddTask.label=Add &Task
 AddTask.tooltip=Add Task...
-php.menu.label=&Source
 
 ##########################################################################
 # Coding Action set
@@ -109,48 +90,27 @@ ShiftLeftAction.label= S&hift Left
 
 FormatAction.label= F&ormat@Ctrl+Shift+F
 
-AddImportAction.label= A&dd Import@Ctrl+Shift+M
 
-OrganizeImportsAction.label= Or&ganize Imports@Ctrl+Shift+O
 
-SurroundWithTryCatchAction.label= Surround with &try/catch block
 
-OverrideMethodsAction.label= O&verride/Implement Methods...
 
-GenerateGetterSetterAction.label= Gene&rate Getter and Setter...
 
-AddConstructorFromSuperclassAction.label= Add &Constructor from Superclass
 
-AddJavaDocCommentAction.label= Add &PHPdoc Comment
 
-FindStringsToExternalizeAction.label= &Find Strings to Externalize...
 
-ExternalizeStringsAction.label= &Externalize Strings...
 
-ConvertLineDelimitersActions.label= Co&nvert Line Delimiters To
-ConvertLineDelimitersToWindowsAction.label= &Windows
-ConvertLineDelimitersToUNIXAction.label= &UNIX
-ConvertLineDelimitersToMacAction.label= &Mac
 
 ##########################################################################
 # Javadoc Support
 ##########################################################################
-PHPDocWizard.name= PHPDoc
-PHPDocWizard.description=Generate PHPDoc
-PHPDoc.preferencePageName= PHPDoc
-CreatePHPDocAction.label= Run PHPDoc &Wizard...
-CreatePHPDocAction.tooltip= Run PHPDoc Wizard
 
 ##########################################################################
 # PHP Working Set Support
 ##########################################################################
-PHPWorkingSetPage.name= PHP
 
 
 sourceHover= Source
 sourceHoverDescription= Shows the source of the selected element.
-javadocHover= PHPdoc
-javadocHoverDescription= Shows the PHPdoc of the selected element.
 sequentialHover= Combined Hover
 sequentialHoverDescription= Tries the hovers in the sequence listed in the table below this one and uses the one which fits best for the selected element and the current context.
 annotationHover= Annotation Description
@@ -168,17 +128,12 @@ category.source.description= PHP Source Actions
 context.editingPHPSource.name= Editing PHP Source
 context.editingPHPSource.description= Editing PHP Source Context
 
-scope.javaEditor.name=PHP Editor
 
 ##########################################################################
 # Action Definitions
 ##########################################################################
 #--- Edit menu
-ActionDefinition.show.outline.name= Show Outline
-ActionDefinition.show.outline.description= Open the outline for the editor input
 
-ActionDefinition.open.structure.name= Open Structure
-ActionDefinition.open.structure.description= Show the structure of the selected element
 
 ActionDefinition.gotoNextMember.name= Go to Next Member
 ActionDefinition.gotoNextMember.description= Move the caret to the next member of the compilation unit
@@ -186,29 +141,13 @@ ActionDefinition.gotoNextMember.description= Move the caret to the next member o
 ActionDefinition.gotoPreviousMember.name= Go to Previous Member
 ActionDefinition.gotoPreviousMember.description= Move the caret to the previous member of the compilation unit
 
-ActionDefinition.selectEnclosing.name= Select Enclosing Element
-ActionDefinition.selectEnclosing.description= Expand selection to include enclosing element
 
-ActionDefinition.selectNext.name= Select Next Element
-ActionDefinition.selectNext.description= Expand selection to include next sibling
 
-ActionDefinition.selectPrevious.name= Select Previous Element
-ActionDefinition.selectPrevious.description= Expand selection to include previous sibling
 
-ActionDefinition.selectLast.name= Restore Last Selection
-ActionDefinition.selectLast.description= Restore last selection
 
-ActionDefinition.contentAssistProposals.name= Content Assist
-ActionDefinition.contentAssistProposals.description= Content Assist
 
-ActionDefinition.contentAssistContextInformation.name= Parameter Hints
-ActionDefinition.contentAssistContextInformation.description= Show Method Parameter Hints
 
-ActionDefinition.correctionAssistProposals.name= Quick Fix
-ActionDefinition.correctionAssistProposals.description= Quick Fix
 
-ActionDefinition.showJavadoc.name= Show Tooltip Description
-ActionDefinition.showJavadoc.description= Shows the tooltip description for the element at the cursor
 
 #--- Source menu
 ActionDefinition.comment.name= Comment
@@ -229,147 +168,55 @@ ActionDefinition.removeBlockComment.description= Remove the block comment enclos
 ActionDefinition.format.name= Format
 ActionDefinition.format.description= Format the selected text
 
-ActionDefinition.addImport.name= Add Import
-ActionDefinition.addImport.description= Create import statement on selection
 
-ActionDefinition.organizeImports.name= Organize Imports
-ActionDefinition.organizeImports.description= Evaluate all required imports and replace the current imports
 
-ActionDefinition.surroundWith.tryCatch.name= Surround with try/catch block
-ActionDefinition.surroundWith.tryCatch.description= Surround the selected text with a try/catch block
 
-ActionDefinition.overrideMethods.name= Override/Implement Methods
-ActionDefinition.overrideMethods.description= Override or implement methods from super types
 
-ActionDefinition.addUnimplementedConstructors.name= Add Constructors from Superclass
-ActionDefinition.addUnimplementedConstructors.description= Evaluate and add constructors from superclass
 
-ActionDefinition.findStringsToExternalize.name= Find Strings to Externalize
-ActionDefinition.findStringsToExternalize.description= Find strings that are not externalized
 
-ActionDefinition.externalizeStrings.name= Externalize Strings
-ActionDefinition.externalizeStrings.description= Find all string that are not externalized and puts them into a separate property file
 
-ActionDefinition.nextProblem.name= Go to Next Problem
-ActionDefinition.nextProblem.description= Go to next problem
 
-ActionDefinition.previousProblem.name= Go to Previous Problem
-ActionDefinition.previousProblem.description= Go to previous problem
 
 #--- Refactor menu
-ActionDefinition.refactorRedo.name= Redo
-ActionDefinition.refactorRedo.description= Redo the last refactoring
 
-ActionDefinition.refactorUndo.name= Undo
-ActionDefinition.refactorUndo.description= Undo the last refactoring
 
-ActionDefinition.pullUp.name= Pull Up
-ActionDefinition.pullUp.description= Move members to a superclass
 
-ActionDefinition.renameElement.name= Rename
-ActionDefinition.renameElement.description= Rename the selected element
 
-ActionDefinition.modifyMethodParameters.name= Change Method Signature
-ActionDefinition.modifyMethodParameters.description= Change method signature include parameter names and parameter order
 
-ActionDefinition.moveElement.name= Move
-ActionDefinition.moveElement.description= Move the selected element to a new location
 
-ActionDefinition.extractLocalVariable.name= Extract Local Variable
-ActionDefinition.extractLocalVariable.description= Extract an expression into a new local variable and uses the local instead
 
-ActionDefinition.extractConstant.name= Extract Constant
-ActionDefinition.extractConstant.description= Extract a constant into a new static field and uses the field instead
 
-ActionDefinition.inline.name= Inline
-ActionDefinition.inline.description= Inline a constant, local variable or method
 
-ActionDefinition.selfEncapsulateField.name= Self Encapsulate Field
-ActionDefinition.selfEncapsulateField.description= Create getting and setting methods for the field and use only those to access the field
 
-ActionDefinition.extractMethod.name= Extract Method
-ActionDefinition.extractMethod.description= Extract a set of statements or an expression into a new method and use the method instead
 
-ActionDefinition.extractInterface.name= Extract Interface
-ActionDefinition.extractInterface.description= Extract a set of members into a new interface and tries to use that interface instead
 
-ActionDefinition.moveInnerToTopLevel.name= Move to Top Level
-ActionDefinition.moveInnerToTopLevel.description= Convert an inner class to a top level class
 
-ActionDefinition.useSupertype.name= Use Supertype Where Possible
-ActionDefinition.useSupertype.description= Try to re-route the access via a supertype where possible
 
-ActionDefinition.promoteLocalVariable.name= Promote Local Variable to Field
-ActionDefinition.promoteLocalVariable.description= Convert a local variable into a field
 
-ActionDefinition.convertAnonymousToNested.name= Convert Anonymous to Nested
-ActionDefinition.convertAnonymousToNested.description= Convert an anonymous class to a nest class
 
 #--- Navigate menu
-ActionDefinition.openEditor.name= Open
-ActionDefinition.openEditor.description= Open an editor on the selected element
 
-ActionDefinition.openSuperImplementation.name= Open Super Implementation
-ActionDefinition.openSuperImplementation.description= Open the Implementation in the Super Type
 
-ActionDefinition.openExternalJavadoc.name= Open E&xternal PHPdoc
-ActionDefinition.openExternalJavadoc.description= Open the PHPdoc of the selected element in an external browser
 
-ActionDefinition.openTypeHierarchy.name= Open Type Hierarchy
-ActionDefinition.openTypeHierarchy.description= Open a type hierarchy on the selected element
 
-ActionDefinition.showInPackageView.name= Show in Package Explorer
-ActionDefinition.showInPackageView.description= Show the selected element in Package Explorer
 
-ActionDefinition.showInNavigatorView.name= Show in &Navigator View
-ActionDefinition.showInNavigatorView.description= Show the selected element in the Resource Navigator
 
 #--- Search menu
-ActionDefinition.referencesInWorkspace.name= Search References in Workspace
-ActionDefinition.referencesInWorkspace.description= Search for References to the Selected Element in the Workspace
 
-ActionDefinition.referencesInHierarchy.name= Search References in Hierarchy
-ActionDefinition.referencesInHierarchy.description= Search for References of the Selected Element in its Hierarchy
 
-ActionDefinition.referencesInWorkingSet.name= Search References in Working Set
-ActionDefinition.referencesInWorkingSet.description= Search for References to the Selected Element in a Working Set
 
-ActionDefinition.readAccessInworkspace.name= Search Read Access in Workspace
-ActionDefinition.readAccessInWorkspace.description= Search for Read References to the Selected Element in the Workspace
 
-ActionDefinition.readAccessInHierarchy.name= Search Read Access in Hierarchy
-ActionDefinition.readAccessInHierarchy.description= Search for Read References of the Selected Element in its Hierarchy
 
-ActionDefinition.readAccessInWorkingSet.name= Search Read Access in Working Set
-ActionDefinition.readAccessInWorkingSet.description= Search for Read References to the Selected Element in a Working Set
 
-ActionDefinition.writeAccessInWorkspace.name=Search Write Access in Workspace
-ActionDefinition.writeAccessInWorkspace.description= Search for Write References to the Selected Element in the Workspace
 
-ActionDefinition.writeAccessInHierarchy.name= Search Write Access in Hierarchy
-ActionDefinition.writeAccessInHierarchy.description= Search for Write References of the Selected Element in its Hierarchy
 
-ActionDefinition.writeAccessInWorkingSet.name= Search Write Access in Working Set
-ActionDefinition.writeAccessInWorkingSet.description= Search for Write References to the Selected Element in a Working Set
 
-ActionDefinition.declarationsInWorkspace.name= Search Declaration in Workspace
-ActionDefinition.declarationsInWorkspace.description= Search for Declarations of the Selected Element in the Workspace
 
-ActionDefinition.declarationsInHierarchy.name= Search Declaration in Hierarchy
-ActionDefinition.declarationsInHierarchy.description= Search for Declarations of the Selected Element in its Hierarchy
 
-ActionDefinition.declarationsInWorkingSet.name= Search Declaration in Working Set
-ActionDefinition.declarationsInWorkingSet.description= Search for Declarations of the Selected Element in a Working Set
 
-ActionDefinition.implementorsInWorkspace.name= Search Implementors in Workspace
-ActionDefinition.implementorsInWorkspace.description= Search for Implementors of the Selected Interface
 
-ActionDefinition.implementorsInWorkingSet.name= Search Implementors in Working Set
-ActionDefinition.implementorsInWorkingSet.description= Search for Implementors of the Selected Interface in a Working Set
 
 #---  miscellaenous
-ActionDefinition.togglePresentation.name= Show Source of Selected Element Only
-ActionDefinition.togglePresentation.description= Show Source of Selected Element Only
 
 ActionDefinition.indent.name=Correct Indentation
 ActionDefinition.indent.description=Correct Indentation
@@ -393,4 +240,4 @@ templates.html.contextType.name= html
 #--- folding
 foldingStructureProvidersExtensionPoint= Folding Structure Providers
 defaultFoldingStructureProviderName= Default PHP Folding
-Folding.label= F&olding
\ No newline at end of file
+Folding.label= F&olding