From 617269bbdabc2544d88fb23d7a521f6a6539ee6f Mon Sep 17 00:00:00 2001
From: axelcl <axelcl>
Date: Wed, 29 Dec 2004 21:30:33 +0000
Subject: [PATCH] misc

---
 .../net.sourceforge.phpeclipse.css.core/plugin.xml |    2 +-
 .../net.sourceforge.phpeclipse.css.ui/plugin.xml   |    2 +-
 .../net.sourceforge.phpeclipse.html.ui/plugin.xml  |    2 +-
 .../ui/internal/editor/HTMLEditorMessages.java     |    2 +-
 .../html/ui/internal/text/HTMLConfiguration.java   |    5 -
 .../net.sourceforge.phpeclipse.js.core/plugin.xml  |    2 +-
 .../net.sourceforge.phpeclipse.js.ui/plugin.xml    |    2 +-
 .../phpeclipse/js/ui/editors/JSEditorMessages.java |    2 +-
 .../build.properties                               |    2 +-
 .../build.xml                                      |  156 +++++++++++++++++
 .../plugin.xml                                     |    2 +-
 .../build.properties                               |    2 +-
 .../build.xml                                      |  176 ++++++++++++++++++++
 .../plugin.xml                                     |    4 +-
 net.sourceforge.phpeclipse.core/build.xml          |   24 ++--
 net.sourceforge.phpeclipse.core/plugin.xml         |    2 +-
 net.sourceforge.phpeclipse.feature/feature.xml     |   14 +-
 net.sourceforge.phpeclipse.feature/license.html    |   14 +-
 net.sourceforge.phpeclipse.phphelp/build.xml       |   35 ++--
 .../plugin.properties                              |    8 +
 net.sourceforge.phpeclipse.phphelp/plugin.xml      |   49 +++++-
 .../sourceforge/phpdt/phphelp/PHPHelpPlugin.java   |    2 +-
 .../phphelp/actions/PHPEclipseShowContextHelp.java |    2 +-
 .../phphelp/actions/PHPFunctionHelpResource.java   |    2 +-
 .../ui/internal/editor/SmartyEditorMessages.java   |    2 +-
 .../ui/internal/text/SmartyConfiguration.java      |    5 -
 .../smarty/ui/internal/text/SmartyTagRule.java     |    6 +-
 27 files changed, 451 insertions(+), 75 deletions(-)
 create mode 100644 archive/net.sourceforge.phpeclipse.monitor.core/build.xml
 create mode 100644 archive/net.sourceforge.phpeclipse.monitor.ui/build.xml

diff --git a/archive/net.sourceforge.phpeclipse.css.core/plugin.xml b/archive/net.sourceforge.phpeclipse.css.core/plugin.xml
index a18283f..fd6a598 100644
--- a/archive/net.sourceforge.phpeclipse.css.core/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.css.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.css.core"
    name="PHPeclipse Web Development Tools CSS Core"
-   version="1.1.1" 
+   version="1.1.2" 
    provider-name="WDTE Project/PHPeclipse.de"
    class="net.sourceforge.phpeclipse.css.core.CssCore">
 
diff --git a/archive/net.sourceforge.phpeclipse.css.ui/plugin.xml b/archive/net.sourceforge.phpeclipse.css.ui/plugin.xml
index ac3d48a..6cfcd5e 100644
--- a/archive/net.sourceforge.phpeclipse.css.ui/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.css.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.css.ui"
    name="%pluginName"
-   version="1.1.1"
+   version="1.1.2"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.css.ui.CssUI">
 
diff --git a/archive/net.sourceforge.phpeclipse.html.ui/plugin.xml b/archive/net.sourceforge.phpeclipse.html.ui/plugin.xml
index a092e3f..6f08492 100644
--- a/archive/net.sourceforge.phpeclipse.html.ui/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.html.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.html.ui"
    name="%pluginName"
-   version="1.1.1"
+   version="1.1.2"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.html.ui.HTMLUI">
    
diff --git a/archive/net.sourceforge.phpeclipse.html.ui/src/net/sourceforge/phpeclipse/html/ui/internal/editor/HTMLEditorMessages.java b/archive/net.sourceforge.phpeclipse.html.ui/src/net/sourceforge/phpeclipse/html/ui/internal/editor/HTMLEditorMessages.java
index 94c3dd0..92973e2 100644
--- a/archive/net.sourceforge.phpeclipse.html.ui/src/net/sourceforge/phpeclipse/html/ui/internal/editor/HTMLEditorMessages.java
+++ b/archive/net.sourceforge.phpeclipse.html.ui/src/net/sourceforge/phpeclipse/html/ui/internal/editor/HTMLEditorMessages.java
@@ -7,7 +7,7 @@ http://www.eclipse.org/legal/cpl-v10.html
 
 Contributors:
     IBM Corporation - Initial implementation
-    Klaus Hartlage - www.eclipseproject.de
+    www.phpeclipse.de
 **********************************************************************/
 package net.sourceforge.phpeclipse.html.ui.internal.editor;
 
diff --git a/archive/net.sourceforge.phpeclipse.html.ui/src/net/sourceforge/phpeclipse/html/ui/internal/text/HTMLConfiguration.java b/archive/net.sourceforge.phpeclipse.html.ui/src/net/sourceforge/phpeclipse/html/ui/internal/text/HTMLConfiguration.java
index 34ca886..5d96a99 100644
--- a/archive/net.sourceforge.phpeclipse.html.ui/src/net/sourceforge/phpeclipse/html/ui/internal/text/HTMLConfiguration.java
+++ b/archive/net.sourceforge.phpeclipse.html.ui/src/net/sourceforge/phpeclipse/html/ui/internal/text/HTMLConfiguration.java
@@ -17,11 +17,6 @@ import org.eclipse.jface.text.contentassist.IContentAssistant;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.ui.texteditor.ITextEditor;
 
-/**
- * @author khartlage
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
- */
 public class HTMLConfiguration extends XMLConfiguration {
   public HTMLConfiguration(XMLTextTools tools) {
     this(tools, null);
diff --git a/archive/net.sourceforge.phpeclipse.js.core/plugin.xml b/archive/net.sourceforge.phpeclipse.js.core/plugin.xml
index 0b8e60b..fc6bda8 100644
--- a/archive/net.sourceforge.phpeclipse.js.core/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.js.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.js.core"
    name="%pluginName"
-   version="1.1.1"
+   version="1.1.2"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.js.core.JSCorePlugin">
    
diff --git a/archive/net.sourceforge.phpeclipse.js.ui/plugin.xml b/archive/net.sourceforge.phpeclipse.js.ui/plugin.xml
index 8922d35..071f9f3 100644
--- a/archive/net.sourceforge.phpeclipse.js.ui/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.js.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.js.ui"
    name="%pluginName"
-   version="1.1.1"
+   version="1.1.2"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.js.ui.JSUIPlugin">
    
diff --git a/archive/net.sourceforge.phpeclipse.js.ui/src/net/sourceforge/phpeclipse/js/ui/editors/JSEditorMessages.java b/archive/net.sourceforge.phpeclipse.js.ui/src/net/sourceforge/phpeclipse/js/ui/editors/JSEditorMessages.java
index 5af638b..91398d4 100644
--- a/archive/net.sourceforge.phpeclipse.js.ui/src/net/sourceforge/phpeclipse/js/ui/editors/JSEditorMessages.java
+++ b/archive/net.sourceforge.phpeclipse.js.ui/src/net/sourceforge/phpeclipse/js/ui/editors/JSEditorMessages.java
@@ -7,7 +7,7 @@ http://www.eclipse.org/legal/cpl-v10.html
 
 Contributors:
     IBM Corporation - Initial implementation
-    Klaus Hartlage - www.eclipseproject.de
+    www.phpeclipse.de
 **********************************************************************/
 package net.sourceforge.phpeclipse.js.ui.editors;
 
diff --git a/archive/net.sourceforge.phpeclipse.monitor.core/build.properties b/archive/net.sourceforge.phpeclipse.monitor.core/build.properties
index 32a2141..89e82f8 100644
--- a/archive/net.sourceforge.phpeclipse.monitor.core/build.properties
+++ b/archive/net.sourceforge.phpeclipse.monitor.core/build.properties
@@ -7,4 +7,4 @@ jars.compile.order =
 src.includes = build.properties,\
                schema/
 output.monitorcore.jar = bin/
-source.monitorcore.jar = monitorcore/
+source.monitorcore.jar = src/
diff --git a/archive/net.sourceforge.phpeclipse.monitor.core/build.xml b/archive/net.sourceforge.phpeclipse.monitor.core/build.xml
new file mode 100644
index 0000000..1ac552c
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.monitor.core/build.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="net.sourceforge.phpeclipse.monitor.core" default="build.jars" basedir=".">
+
+	<property name="bootclasspath" value=""/>
+	<property name="basews" value="${ws}"/>
+	<property name="baseos" value="${os}"/>
+	<property name="basearch" value="${arch}"/>
+	<property name="basenl" value="${nl}"/>
+	<property name="javacFailOnError" value="false"/>
+	<property name="javacDebugInfo" value="on"/>
+	<property name="javacVerbose" value="true"/>
+	<property name="javacSource" value="1.3"/>
+	<property name="javacTarget" value="1.2"/>
+	<property name="compilerArg" value=""/>
+
+	<target name="init" depends="properties">
+		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
+			<isset property="buildTempFolder"/>
+		</condition>
+		<property name="pluginTemp" value="${basedir}"/>
+		<condition property="build.result.folder" value="${pluginTemp}/net.sourceforge.phpeclipse.monitor.core">
+			<isset property="buildTempFolder"/>
+		</condition>
+		<property name="build.result.folder" value="${basedir}"/>
+		<property name="temp.folder" value="${basedir}/temp.folder"/>
+		<property name="plugin.destination" value="${basedir}"/>
+	</target>
+
+	<target name="properties" if="eclipse.running">
+		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+	</target>
+
+	<target name="build.update.jar" depends="init" description="Build the plug-in: net.sourceforge.phpeclipse.monitor.core for an update site.">
+		<delete dir="${temp.folder}"/>
+		<mkdir dir="${temp.folder}"/>
+		<antcall target="build.jars"/>
+		<antcall target="gather.bin.parts">
+			<param name="destination.temp.folder" value="${temp.folder}/"/>
+		</antcall>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.monitor.core_1.1.2.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.monitor.core_1.1.2" filesonly="false" whenempty="skip" update="false"/>
+		<delete dir="${temp.folder}"/>
+	</target>
+
+	<target name="monitorcore.jar" depends="init" unless="monitorcore.jar" description="Create jar: monitorcore.jar.">
+		<delete dir="${temp.folder}/monitorcore.jar.bin"/>
+		<mkdir dir="${temp.folder}/monitorcore.jar.bin"/>
+		<!-- compile the source code -->
+		<javac destdir="${temp.folder}/monitorcore.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}"		>
+			<compilerarg line="${compilerArg}"/>
+			<classpath>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.runtime_3.0.1/runtime.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/core.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/console.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/osgi.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/resolver.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/defaultAdaptor.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/eclipseAdaptor.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui_3.0.1/ui.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.help_3.0.0/help.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.swt_3.0.1/ws/${basews}/swt.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.swt.win32_3.0.1/ws/${basews}/swt.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.swt.win32_3.0.1"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+				<pathelement path="../org.eclipse.ui.workbench/bin"/>
+				<pathelement path="../org.eclipse.ui.workbench/compatibility.jar"/>
+				<pathelement path="../org.eclipse.ui.workbench/workbench.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/workbench.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.expressions_3.0.0/expressions.jar"/>
+			</classpath>
+			<src path="src/"			/>
+			</javac>
+		<!-- Copy necessary resources -->
+		<copy todir="${temp.folder}/monitorcore.jar.bin" failonerror="true">
+			<fileset dir="src/" excludes="**/*.java, **/package.htm*"			/>
+		</copy>
+		<mkdir dir="${build.result.folder}"/>
+		<jar jarfile="${build.result.folder}/monitorcore.jar" basedir="${temp.folder}/monitorcore.jar.bin"/>
+		<delete dir="${temp.folder}/monitorcore.jar.bin"/>
+	</target>
+
+	<target name="monitorcoresrc.zip" depends="init" unless="monitorcoresrc.zip">
+		<mkdir dir="${build.result.folder}"/>
+		<zip zipfile="${build.result.folder}/monitorcoresrc.zip" filesonly="false" whenempty="skip" update="false">
+			<fileset dir="src/" includes="**/*.java"			/>
+		</zip>
+	</target>
+
+	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: net.sourceforge.phpeclipse.monitor.core.">
+		<available property="monitorcore.jar" file="${build.result.folder}/monitorcore.jar"/>
+		<antcall target="monitorcore.jar"/>
+	</target>
+
+	<target name="build.sources" depends="init">
+		<available property="monitorcoresrc.zip" file="${build.result.folder}/monitorcoresrc.zip"/>
+		<antcall target="monitorcoresrc.zip"/>
+	</target>
+
+	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.core_1.1.2"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.core_1.1.2" failonerror="true">
+			<fileset dir="${build.result.folder}" includes="monitorcore.jar"			/>
+		</copy>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.core_1.1.2" failonerror="true">
+			<fileset dir="${basedir}" includes="plugin.xml,*.jar,monitorcore.jar,plugin.properties,.options"			/>
+		</copy>
+	</target>
+
+	<target name="build.zips" depends="init">
+	</target>
+
+	<target name="gather.sources" depends="init" if="destination.temp.folder">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.core_1.1.2"/>
+		<copy file="${build.result.folder}/monitorcoresrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.core_1.1.2" failonerror="false"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.core_1.1.2" failonerror="false">
+			<fileset dir="${basedir}" includes="build.properties,schema/"			/>
+		</copy>
+	</target>
+
+	<target name="gather.logs" depends="init" if="destination.temp.folder">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.core_1.1.2"/>
+		<copy file="${temp.folder}/monitorcore.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.core_1.1.2" failonerror="false"/>
+	</target>
+
+	<target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse.monitor.core of all the zips, jars and logs created.">
+		<delete file="${build.result.folder}/monitorcore.jar"/>
+		<delete file="${build.result.folder}/monitorcoresrc.zip"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.monitor.core_1.1.2.jar"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.monitor.core_1.1.2.zip"/>
+		<delete dir="${temp.folder}"/>
+	</target>
+
+	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
+		<eclipse.convertPath fileSystemPath="C:/eclipse3/workspace/net.sourceforge.phpeclipse.monitor.core" property="resourcePath"/>
+		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
+	</target>
+
+	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: net.sourceforge.phpeclipse.monitor.core.">
+		<delete dir="${temp.folder}"/>
+		<mkdir dir="${temp.folder}"/>
+		<antcall target="build.jars"/>
+		<antcall target="build.sources"/>
+		<antcall target="gather.bin.parts">
+			<param name="destination.temp.folder" value="${temp.folder}/"/>
+		</antcall>
+		<antcall target="gather.sources">
+			<param name="destination.temp.folder" value="${temp.folder}/"/>
+		</antcall>
+		<delete>
+			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
+		</delete>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.monitor.core_1.1.2.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<delete dir="${temp.folder}"/>
+	</target>
+
+</project>
diff --git a/archive/net.sourceforge.phpeclipse.monitor.core/plugin.xml b/archive/net.sourceforge.phpeclipse.monitor.core/plugin.xml
index f536ed5..12c3cd9 100644
--- a/archive/net.sourceforge.phpeclipse.monitor.core/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.monitor.core/plugin.xml
@@ -3,7 +3,7 @@
 
 <plugin id="net.sourceforge.phpeclipse.monitor.core"
   name="%pluginName"
-  version="3.0.0"
+  version="1.1.2"
   provider-name="%providerName"
   class="net.sourceforge.phpdt.monitor.core.internal.MonitorPlugin">
 
diff --git a/archive/net.sourceforge.phpeclipse.monitor.ui/build.properties b/archive/net.sourceforge.phpeclipse.monitor.ui/build.properties
index 142800d..4aab033 100644
--- a/archive/net.sourceforge.phpeclipse.monitor.ui/build.properties
+++ b/archive/net.sourceforge.phpeclipse.monitor.ui/build.properties
@@ -7,4 +7,4 @@ jars.compile.order =
 src.includes = schema/,\
                build.properties
 output.monitorui.jar = bin/
-source.monitorui.jar = monitorui/
+source.monitorui.jar = src/
diff --git a/archive/net.sourceforge.phpeclipse.monitor.ui/build.xml b/archive/net.sourceforge.phpeclipse.monitor.ui/build.xml
new file mode 100644
index 0000000..be5c517
--- /dev/null
+++ b/archive/net.sourceforge.phpeclipse.monitor.ui/build.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="net.sourceforge.phpeclipse.monitor.ui" default="build.jars" basedir=".">
+
+	<property name="bootclasspath" value=""/>
+	<property name="basews" value="${ws}"/>
+	<property name="baseos" value="${os}"/>
+	<property name="basearch" value="${arch}"/>
+	<property name="basenl" value="${nl}"/>
+	<property name="javacFailOnError" value="false"/>
+	<property name="javacDebugInfo" value="on"/>
+	<property name="javacVerbose" value="true"/>
+	<property name="javacSource" value="1.3"/>
+	<property name="javacTarget" value="1.2"/>
+	<property name="compilerArg" value=""/>
+
+	<target name="init" depends="properties">
+		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
+			<isset property="buildTempFolder"/>
+		</condition>
+		<property name="pluginTemp" value="${basedir}"/>
+		<condition property="build.result.folder" value="${pluginTemp}/net.sourceforge.phpeclipse.monitor.ui">
+			<isset property="buildTempFolder"/>
+		</condition>
+		<property name="build.result.folder" value="${basedir}"/>
+		<property name="temp.folder" value="${basedir}/temp.folder"/>
+		<property name="plugin.destination" value="${basedir}"/>
+	</target>
+
+	<target name="properties" if="eclipse.running">
+		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+	</target>
+
+	<target name="build.update.jar" depends="init" description="Build the plug-in: net.sourceforge.phpeclipse.monitor.ui for an update site.">
+		<delete dir="${temp.folder}"/>
+		<mkdir dir="${temp.folder}"/>
+		<antcall target="build.jars"/>
+		<antcall target="gather.bin.parts">
+			<param name="destination.temp.folder" value="${temp.folder}/"/>
+		</antcall>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.monitor.ui_1.1.2.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.monitor.ui_1.1.2" filesonly="false" whenempty="skip" update="false"/>
+		<delete dir="${temp.folder}"/>
+	</target>
+
+	<target name="monitorui.jar" depends="init" unless="monitorui.jar" description="Create jar: monitorui.jar.">
+		<delete dir="${temp.folder}/monitorui.jar.bin"/>
+		<mkdir dir="${temp.folder}/monitorui.jar.bin"/>
+		<!-- compile the source code -->
+		<javac destdir="${temp.folder}/monitorui.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}"		>
+			<compilerarg line="${compilerArg}"/>
+			<classpath>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.runtime_3.0.1/runtime.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/core.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/console.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/osgi.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/resolver.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/defaultAdaptor.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/eclipseAdaptor.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources_3.0.1/resources.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources.win32_3.0.0/resources.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources.win32_3.0.0/resources-win32.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
+				<pathelement path="../org.eclipse.ui.ide/bin"/>
+				<pathelement path="../org.eclipse.ui.ide/ide.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/ide.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/workbenchwin32.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.help_3.0.0/help.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui_3.0.1/ui.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.swt_3.0.1/ws/${basews}/swt.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.swt.win32_3.0.1/ws/${basews}/swt.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.swt.win32_3.0.1"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+				<pathelement path="../org.eclipse.ui.workbench/bin"/>
+				<pathelement path="../org.eclipse.ui.workbench/compatibility.jar"/>
+				<pathelement path="../org.eclipse.ui.workbench/workbench.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/workbench.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.expressions_3.0.0/expressions.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.views_3.0.0/views.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.update.core_3.0.1/updatecore.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.update.core.win32_3.0.0/updatecore.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.update.ui_3.0.1/updateui.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.help.base_3.0.1/helpbase.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.apache.lucene_1.3.1/parser.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.apache.lucene_1.3.1/lucene-1.3-final.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.help.appserver_3.0.0/appserver.jar"/>
+				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.forms_3.0.0/forms.jar"/>
+				<pathelement path="../net.sourceforge.phpeclipse.monitor.core/bin"/>
+				<pathelement path="../net.sourceforge.phpeclipse.monitor.core/monitorcore.jar"/>
+			</classpath>
+			<src path="src/"			/>
+			</javac>
+		<!-- Copy necessary resources -->
+		<copy todir="${temp.folder}/monitorui.jar.bin" failonerror="true">
+			<fileset dir="src/" excludes="**/*.java, **/package.htm*"			/>
+		</copy>
+		<mkdir dir="${build.result.folder}"/>
+		<jar jarfile="${build.result.folder}/monitorui.jar" basedir="${temp.folder}/monitorui.jar.bin"/>
+		<delete dir="${temp.folder}/monitorui.jar.bin"/>
+	</target>
+
+	<target name="monitoruisrc.zip" depends="init" unless="monitoruisrc.zip">
+		<mkdir dir="${build.result.folder}"/>
+		<zip zipfile="${build.result.folder}/monitoruisrc.zip" filesonly="false" whenempty="skip" update="false">
+			<fileset dir="src/" includes="**/*.java"			/>
+		</zip>
+	</target>
+
+	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: net.sourceforge.phpeclipse.monitor.ui.">
+		<available property="monitorui.jar" file="${build.result.folder}/monitorui.jar"/>
+		<antcall target="monitorui.jar"/>
+	</target>
+
+	<target name="build.sources" depends="init">
+		<available property="monitoruisrc.zip" file="${build.result.folder}/monitoruisrc.zip"/>
+		<antcall target="monitoruisrc.zip"/>
+	</target>
+
+	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.ui_1.1.2"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.ui_1.1.2" failonerror="true">
+			<fileset dir="${build.result.folder}" includes="monitorui.jar"			/>
+		</copy>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.ui_1.1.2" failonerror="true">
+			<fileset dir="${basedir}" includes="plugin.xml,*.jar,monitorui.jar,plugin.properties,icons/"			/>
+		</copy>
+	</target>
+
+	<target name="build.zips" depends="init">
+	</target>
+
+	<target name="gather.sources" depends="init" if="destination.temp.folder">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.ui_1.1.2"/>
+		<copy file="${build.result.folder}/monitoruisrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.ui_1.1.2" failonerror="false"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.ui_1.1.2" failonerror="false">
+			<fileset dir="${basedir}" includes="schema/,build.properties"			/>
+		</copy>
+	</target>
+
+	<target name="gather.logs" depends="init" if="destination.temp.folder">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.ui_1.1.2"/>
+		<copy file="${temp.folder}/monitorui.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.monitor.ui_1.1.2" failonerror="false"/>
+	</target>
+
+	<target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse.monitor.ui of all the zips, jars and logs created.">
+		<delete file="${build.result.folder}/monitorui.jar"/>
+		<delete file="${build.result.folder}/monitoruisrc.zip"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.monitor.ui_1.1.2.jar"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.monitor.ui_1.1.2.zip"/>
+		<delete dir="${temp.folder}"/>
+	</target>
+
+	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
+		<eclipse.convertPath fileSystemPath="C:/eclipse3/workspace/net.sourceforge.phpeclipse.monitor.ui" property="resourcePath"/>
+		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
+	</target>
+
+	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: net.sourceforge.phpeclipse.monitor.ui.">
+		<delete dir="${temp.folder}"/>
+		<mkdir dir="${temp.folder}"/>
+		<antcall target="build.jars"/>
+		<antcall target="build.sources"/>
+		<antcall target="gather.bin.parts">
+			<param name="destination.temp.folder" value="${temp.folder}/"/>
+		</antcall>
+		<antcall target="gather.sources">
+			<param name="destination.temp.folder" value="${temp.folder}/"/>
+		</antcall>
+		<delete>
+			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
+		</delete>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.monitor.ui_1.1.2.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<delete dir="${temp.folder}"/>
+	</target>
+
+</project>
diff --git a/archive/net.sourceforge.phpeclipse.monitor.ui/plugin.xml b/archive/net.sourceforge.phpeclipse.monitor.ui/plugin.xml
index 285b1a5..f06c18a 100644
--- a/archive/net.sourceforge.phpeclipse.monitor.ui/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.monitor.ui/plugin.xml
@@ -3,7 +3,7 @@
 
 <plugin id="net.sourceforge.phpeclipse.monitor.ui"
   name="%pluginName"
-  version="3.0.0"
+  version="1.1.2"
   provider-name="%providerName"
   class="net.sourceforge.phpdt.monitor.ui.internal.MonitorUIPlugin">
 
@@ -13,7 +13,7 @@
   <import plugin="org.eclipse.ui.ide" version="3.0.0" match="equivalent"/>
   <import plugin="org.eclipse.ui.views" version="3.0.0" match="equivalent"/>
   <import plugin="org.eclipse.ui" version="3.0.0" match="equivalent"/>
-  <import plugin="net.sourceforge.phpeclipse.monitor.core" version="3.0.0" match="equivalent"/>
+  <import plugin="net.sourceforge.phpeclipse.monitor.core"/>
 </requires>
 
 <runtime>
diff --git a/net.sourceforge.phpeclipse.core/build.xml b/net.sourceforge.phpeclipse.core/build.xml
index c855bda..0743079 100644
--- a/net.sourceforge.phpeclipse.core/build.xml
+++ b/net.sourceforge.phpeclipse.core/build.xml
@@ -37,7 +37,7 @@
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
-		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.core_1.1.1.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.core_1.1.1" filesonly="false" whenempty="skip" update="false"/>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.core_1.1.2.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.core_1.1.2" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -86,11 +86,11 @@
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.1"/>
-		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.1" failonerror="true">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.2"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.2" failonerror="true">
 			<fileset dir="${build.result.folder}" includes="webcore.jar"			/>
 		</copy>
-		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.1" failonerror="true">
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.2" failonerror="true">
 			<fileset dir="${basedir}" includes="plugin.xml,webcore.jar"			/>
 		</copy>
 	</target>
@@ -99,23 +99,23 @@
 	</target>
 
 	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.1"/>
-		<copy file="${build.result.folder}/webcoresrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.1" failonerror="false"/>
-		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.1" failonerror="false">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.2"/>
+		<copy file="${build.result.folder}/webcoresrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.2" failonerror="false"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.2" failonerror="false">
 			<fileset dir="${basedir}" includes="src/"			/>
 		</copy>
 	</target>
 
 	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.1"/>
-		<copy file="${temp.folder}/webcore.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.1" failonerror="false"/>
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.2"/>
+		<copy file="${temp.folder}/webcore.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.core_1.1.2" failonerror="false"/>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse.core of all the zips, jars and logs created.">
 		<delete file="${build.result.folder}/webcore.jar"/>
 		<delete file="${build.result.folder}/webcoresrc.zip"/>
-		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.core_1.1.1.jar"/>
-		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.core_1.1.1.zip"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.core_1.1.2.jar"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.core_1.1.2.zip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -138,7 +138,7 @@
 		<delete>
 			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
 		</delete>
-		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.core_1.1.1.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.core_1.1.2.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
diff --git a/net.sourceforge.phpeclipse.core/plugin.xml b/net.sourceforge.phpeclipse.core/plugin.xml
index fc145ac..71df149 100644
--- a/net.sourceforge.phpeclipse.core/plugin.xml
+++ b/net.sourceforge.phpeclipse.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.core"
    name="PHPeclipse Web Development Tools Core"
-   version="1.1.1"
+   version="1.1.2"
    provider-name="WDTE Project/PHPeclipse"
    class="net.sourceforge.phpeclipse.core.WebCore">
 
diff --git a/net.sourceforge.phpeclipse.feature/feature.xml b/net.sourceforge.phpeclipse.feature/feature.xml
index f0e8217..39e773b 100644
--- a/net.sourceforge.phpeclipse.feature/feature.xml
+++ b/net.sourceforge.phpeclipse.feature/feature.xml
@@ -21,7 +21,7 @@ PHPECLIPSE.DE MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER
 Applicable Licenses
 Unless otherwise indicated, all Content made available by PHPeclipse.de is provided to you under the terms and conditions of the Common Public License Version 1.0 (&quot;CPL&quot;). A copy of the CPL is provided with this Content and is also available at http://www.eclipse.org/legal/cpl-v10.html. For purposes of the CPL, &quot;Program&quot; will mean the Content.
 
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the PHPeclipse.de CVS repository (&quot;Repository&quot;) in CVS modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).
 
 Content may be apportioned into plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments are located in directories named &quot;plugins&quot; and Features are located in directories named &quot;features&quot;.
 
@@ -33,7 +33,7 @@ The top-level (root) directory
 Plug-in and Fragment directories 
 Subdirectories of the directory named &quot;src&quot; of certain Plug-ins 
 Feature directories 
-Note: if a Feature made available by Eclipse.org is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot;. Such Abouts, Feature Licenses and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in that directory.
+Note: if a Feature made available by PHPeclipse.de is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot;. Such Abouts, Feature Licenses and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in that directory.
 
 THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE CPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
 
@@ -199,11 +199,11 @@ b) in the case of each subsequent Contributor:&lt;/FONT&gt;&lt;/UL&gt;
       <import plugin="org.eclipse.update.ui"/>
       <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.core.boot"/>
-      <import plugin="org.eclipse.core.resources" version="3.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.core.runtime" version="3.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.ui" version="3.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.ui.ide" version="3.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.ui.editors" version="3.0.0" match="equivalent"/>
+      <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"/>
+      <import plugin="org.eclipse.ui.editors" version="3.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/net.sourceforge.phpeclipse.feature/license.html b/net.sourceforge.phpeclipse.feature/license.html
index e7d8500..665bc1e 100644
--- a/net.sourceforge.phpeclipse.feature/license.html
+++ b/net.sourceforge.phpeclipse.feature/license.html
@@ -2,16 +2,16 @@
 <html>
 <head>
 <meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
+<title>PHPeclipse.de Software User Agreement</title>
 </head>
 
 <body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse.org Software User Agreement</h2>
+<h2>PHPeclipse.de Software User Agreement</h2>
 <p>15<sup>th</sup> June, 2004</p>
 
 <h3>Usage Of Content</h3>
 
-<p>ECLIPSE.ORG MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+<p>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
@@ -20,11 +20,11 @@
    
 <h3>Applicable Licenses</h3>   
    
-<p>Unless otherwise indicated, all Content made available by Eclipse.org is provided to you under the terms and conditions of the Common Public License Version 1.0
+<p>Unless otherwise indicated, all Content made available by PHPeclipse.de is provided to you under the terms and conditions of the Common Public License Version 1.0
    (&quot;CPL&quot;).  A copy of the CPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
    For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
 
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the PHPeclipse.de CVS repository (&quot;Repository&quot;) in CVS
    modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
 
 <p>Content may be apportioned into plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Files named &quot;feature.xml&quot; may contain a list of the names and version numbers of  the Plug-ins and/or Fragments associated with a Feature.   Plug-ins and Fragments are located in directories
@@ -43,7 +43,7 @@ including, but not limited to the following locations:</p>
 	<li>Feature directories</li>
 </ul>
 		
-<p>Note: if a Feature made available by Eclipse.org is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
+<p>Note: if a Feature made available by PHPeclipse.de is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
 installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
 inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot;.
 Such Abouts, Feature Licenses and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -61,7 +61,7 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
 </ul>
 
 <p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License or Feature Update License is provided, please
-contact Eclipse.org to determine what terms and conditions govern that particular Content.</p>
+contact PHPeclipse.de to determine what terms and conditions govern that particular Content.</p>
 
 <h3>Cryptography</h3>
 
diff --git a/net.sourceforge.phpeclipse.phphelp/build.xml b/net.sourceforge.phpeclipse.phphelp/build.xml
index 280176c..08cac08 100644
--- a/net.sourceforge.phpeclipse.phphelp/build.xml
+++ b/net.sourceforge.phpeclipse.phphelp/build.xml
@@ -37,7 +37,7 @@
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
-		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" filesonly="false" whenempty="skip" update="false"/>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.2.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -57,7 +57,8 @@
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/defaultAdaptor.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.osgi_3.0.1/eclipseAdaptor.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
-				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.ide_3.0.1/ide.jar"/>
+				<pathelement path="../org.eclipse.ui.ide/bin"/>
+				<pathelement path="../org.eclipse.ui.ide/ide.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/ide.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.win32_3.0.1/workbenchwin32.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.resources_3.0.1/resources.jar"/>
@@ -69,8 +70,9 @@
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.swt.win32_3.0.1/ws/${basews}/swt.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.swt.win32_3.0.1"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
-				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench_3.0.1/compatibility.jar"/>
-				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench_3.0.1/workbench.jar"/>
+				<pathelement path="../org.eclipse.ui.workbench/bin"/>
+				<pathelement path="../org.eclipse.ui.workbench/compatibility.jar"/>
+				<pathelement path="../org.eclipse.ui.workbench/workbench.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.workbench.compatibility_3.0.0/workbench.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.expressions_3.0.0/expressions.jar"/>
@@ -90,7 +92,8 @@
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.filebuffers_3.0.1/filebuffers.jar"/>
 				<pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse/bin"/>
 				<pathelement path="${build.result.folder}/../net.sourceforge.phpeclipse/phpeclipse.jar"/>
-				<pathelement path="../../../eclipse301/plugins/org.eclipse.ui.console_3.0.0/console.jar"/>
+				<pathelement path="../org.eclipse.ui.console/bin"/>
+				<pathelement path="../org.eclipse.ui.console/console.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.search_3.0.1/search.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.debug.core_3.0.1/dtcore.jar"/>
 				<pathelement path="../../../eclipse301/plugins/org.eclipse.core.variables_3.0.0/variables.jar"/>
@@ -139,11 +142,11 @@
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1"/>
-		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="true">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" failonerror="true">
 			<fileset dir="${build.result.folder}" includes="phphelp.jar"			/>
 		</copy>
-		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="true">
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" failonerror="true">
 			<fileset dir="${basedir}" includes="phphelp.jar,phphelp.xml,plugin.properties,plugin.xml,.classpath,doc.zip,cpl-v10.html"			/>
 		</copy>
 	</target>
@@ -152,23 +155,23 @@
 	</target>
 
 	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1"/>
-		<copy file="${build.result.folder}/phphelpsrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="false"/>
-		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="false">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2"/>
+		<copy file="${build.result.folder}/phphelpsrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" failonerror="false"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" failonerror="false">
 			<fileset dir="${basedir}" includes="src/,.cvsignore,.project,.template,.classpath,build.properties,build.xml,plugin.properties,plugin.xml"			/>
 		</copy>
 	</target>
 
 	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1"/>
-		<copy file="${temp.folder}/phphelp.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.1" failonerror="false"/>
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2"/>
+		<copy file="${temp.folder}/phphelp.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.phphelp_1.1.2" failonerror="false"/>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse.phphelp of all the zips, jars and logs created.">
 		<delete file="${build.result.folder}/phphelp.jar"/>
 		<delete file="${build.result.folder}/phphelpsrc.zip"/>
-		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.jar"/>
-		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.zip"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.2.jar"/>
+		<delete file="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.2.zip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -191,7 +194,7 @@
 		<delete>
 			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
 		</delete>
-		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.1.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.phphelp_1.1.2.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
diff --git a/net.sourceforge.phpeclipse.phphelp/plugin.properties b/net.sourceforge.phpeclipse.phphelp/plugin.properties
index 4b79c2b..389e36f 100644
--- a/net.sourceforge.phpeclipse.phphelp/plugin.properties
+++ b/net.sourceforge.phpeclipse.phphelp/plugin.properties
@@ -5,3 +5,11 @@ pluginName=PHP Plugin Help
 providerName=phpeclipse.de
 phphelpLabel=PHP Help
 phphelpFormat=Help (WIN_32 *.chm format)
+
+context.editingPHPSource.name= Editing PHP Source
+context.editingPHPSource.description= Editing PHP Source Context
+
+category.source.name=Source
+category.source.description= PHP Source Actions
+ActionDefinition.contexthelp.name= Open PHP HTML help
+ActionDefinition.contexthelp.description= Open PHP HTML help in browser
diff --git a/net.sourceforge.phpeclipse.phphelp/plugin.xml b/net.sourceforge.phpeclipse.phphelp/plugin.xml
index 63c0f53..b75be07 100644
--- a/net.sourceforge.phpeclipse.phphelp/plugin.xml
+++ b/net.sourceforge.phpeclipse.phphelp/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.phphelp"
    name="%pluginName"
-   version="1.1.1"
+   version="1.1.2"
    provider-name="%providerName"
    class="net.sourceforge.phpdt.phphelp.PHPHelpPlugin">
 
@@ -32,10 +32,11 @@
             targetID="#PHPEditorContext"
             id="net.sourceforge.phpdt.phphelp.actions.popup.editor">
          <action
+               definitionId="net.sourceforge.phpdt.phphelp.actions.contexthelp"
                label="%phphelpLabel"
                class="net.sourceforge.phpdt.phphelp.actions.PHPEclipseShowContextHelp"
                menubarPath="additions"
-               id="net.sourceforge.phpdt.phphelp.actions.contexthelp">
+               id="net.sourceforge.phpdt.phphelp.actions.PHPEclipseShowContextHelp">
          </action>
       </viewerContribution>
    </extension>
@@ -55,4 +56,48 @@
             id="net.sourceforge.phpdt.phphelp.PHPHelpPreferencePage">
       </page>
    </extension>
+   
+   <extension
+         point="org.eclipse.ui.editorActions">
+      <editorContribution 
+            id="net.sourceforge.phpdt.phphelp.actions"
+            targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
+         <action
+               definitionId="net.sourceforge.phpdt.phphelp.actions.contexthelp"
+               label="PHP Help"
+               class="net.sourceforge.phpdt.phphelp.actions.PHPEclipseShowContextHelp"
+               id="net.sourceforge.phpdt.phphelp.actions.PHPEclipseShowContextHelp">
+         </action>
+      </editorContribution>
+   </extension>   
+   
+   <extension point="org.eclipse.ui.contexts">
+      <context 
+        name="%context.editingPHPSource.name" 
+        description="%context.editingPHPSource.description" 
+        parentId="org.eclipse.ui.textEditorScope" 
+        id="net.sourceforge.phpdt.ui.phpEditorScope" /> 
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <category
+            name="%category.source.name"
+            description="%category.source.description"
+            id="net.sourceforge.phpeclipse.ui.category.source">
+      </category>
+    
+      <command
+            name="%ActionDefinition.contexthelp.name"
+            description="%ActionDefinition.contexthelp.description"
+            category="net.sourceforge.phpeclipse.ui.category.source"
+            id="net.sourceforge.phpdt.phphelp.actions.contexthelp">
+      </command>
+     
+      <keyBinding
+            string="Ctrl+Shift+H"
+            scope="net.sourceforge.phpdt.ui.phpEditorScope"
+            command="net.sourceforge.phpdt.phphelp.actions.contexthelp"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
+  </extension>
 </plugin>
diff --git a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/PHPHelpPlugin.java b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/PHPHelpPlugin.java
index c7dd57d..d6fc392 100644
--- a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/PHPHelpPlugin.java
+++ b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/PHPHelpPlugin.java
@@ -7,7 +7,7 @@ http://www.eclipse.org/legal/cpl-v10.html
 
 Contributors:
     IBM Corporation - Initial implementation
-    Klaus Hartlage - www.eclipseproject.de
+    www.phpeclipse.de
 **********************************************************************/
 package net.sourceforge.phpdt.phphelp;
 
diff --git a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPEclipseShowContextHelp.java b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPEclipseShowContextHelp.java
index 73957ae..c822bb1 100644
--- a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPEclipseShowContextHelp.java
+++ b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPEclipseShowContextHelp.java
@@ -7,7 +7,7 @@ http://www.eclipse.org/legal/cpl-v10.html
 
 Contributors:
     IBM Corporation - Initial implementation
-    Klaus Hartlage - www.eclipseproject.de
+    www.phpeclipse.de
 **********************************************************************/
 package net.sourceforge.phpdt.phphelp.actions;
 
diff --git a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPFunctionHelpResource.java b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPFunctionHelpResource.java
index ae1f34c..f33ad0d 100644
--- a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPFunctionHelpResource.java
+++ b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPFunctionHelpResource.java
@@ -7,7 +7,7 @@ http://www.eclipse.org/legal/cpl-v10.html
 
 Contributors:
     IBM Corporation - Initial implementation
-    Klaus Hartlage - www.eclipseproject.de
+    www.phpeclipse.de
 **********************************************************************/
 package net.sourceforge.phpdt.phphelp.actions;
 
diff --git a/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/editor/SmartyEditorMessages.java b/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/editor/SmartyEditorMessages.java
index 046db9e..395dbfa 100644
--- a/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/editor/SmartyEditorMessages.java
+++ b/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/editor/SmartyEditorMessages.java
@@ -7,7 +7,7 @@ http://www.eclipse.org/legal/cpl-v10.html
 
 Contributors:
     IBM Corporation - Initial implementation
-    Klaus Hartlage - www.eclipseproject.de
+    www.phpeclipse.de
 **********************************************************************/
 package net.sourceforge.phpdt.smarty.ui.internal.editor;
 
diff --git a/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyConfiguration.java b/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyConfiguration.java
index 2600db0..cc272c1 100644
--- a/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyConfiguration.java
+++ b/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyConfiguration.java
@@ -22,11 +22,6 @@ import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.ui.texteditor.ITextEditor;
 
-/**
- * @author khartlage
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
- */
 public class SmartyConfiguration extends XMLConfiguration {
   private SmartyTagScanner smartyTagScanner;
   public SmartyConfiguration(XMLTextTools tools) {
diff --git a/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyTagRule.java b/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyTagRule.java
index f1a71f6..1e22864 100644
--- a/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyTagRule.java
+++ b/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/text/SmartyTagRule.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: SmartyTagRule.java,v 1.1 2004-09-02 18:25:04 jsurfer Exp $
+ * $Id: SmartyTagRule.java,v 1.2 2004-12-29 21:30:33 axelcl Exp $
  */
 
 package net.sourceforge.phpdt.smarty.ui.internal.text;
@@ -19,9 +19,7 @@ import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.Token;
 
 /**
- * Rule detecting XML tag brackets and name.
- * 
- * @author Igor Malinin
+ * Rule detecting smarty tags
  */
 public class SmartyTagRule implements IRule {
 
-- 
1.7.1