[jbosstools-commits] JBoss Tools SVN: r39737 - in workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp: org.jboss.tools.jst.jsp and 1 other directory.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Wed Mar 21 14:50:58 EDT 2012


Author: dazarov
Date: 2012-03-21 14:50:58 -0400 (Wed, 21 Mar 2012)
New Revision: 39737

Added:
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.classpath
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.cvsignore
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.options.template
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.project
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.settings/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/META-INF/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/about.html
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/build.properties
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/icons/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/images/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin_ja.properties
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/pom.xml
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/resources/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/schema/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/src/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/templates/
Removed:
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.classpath
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.cvsignore
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.options.template
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.project
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.settings/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/META-INF/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/about.html
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/build.properties
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/icons/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/images/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin.properties
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin.xml
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin_ja.properties
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/pom.xml
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/resources/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/schema/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/src/
   workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/templates/
Log:
move to right place

Copied: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.classpath (from rev 39736, workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.classpath)
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.classpath	                        (rev 0)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.classpath	2012-03-21 18:50:58 UTC (rev 39737)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="resources/"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Copied: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.cvsignore (from rev 39736, workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.cvsignore)
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.cvsignore	                        (rev 0)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.cvsignore	2012-03-21 18:50:58 UTC (rev 39737)
@@ -0,0 +1,2 @@
+yguard.log
+bin

Copied: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.options.template (from rev 39736, workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.options.template)
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.options.template	                        (rev 0)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.options.template	2012-03-21 18:50:58 UTC (rev 39737)
@@ -0,0 +1 @@
+org.jboss.tools.jst.jsp/debug=false
\ No newline at end of file

Copied: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.project (from rev 39736, workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.project)
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.project	                        (rev 0)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/.project	2012-03-21 18:50:58 UTC (rev 39737)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.jboss.tools.jst.jsp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>

Copied: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/about.html (from rev 39736, workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/about.html)
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/about.html	                        (rev 0)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/about.html	2012-03-21 18:50:58 UTC (rev 39737)
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+
+<BODY lang="EN-US">
+
+<H3>About This Content</H3>
+
+<P>&copy;2007 Red Hat, Inc. All rights reserved</P>
+
+<H3>License</H3>
+
+<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in 
+("Content"). Unless otherwise indicated below, the Content is provided to you 
+under the terms and conditions of the Eclipse Public License Version 1.0 
+("EPL"). A copy of the EPL is available at
+<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+For purposes of the EPL, "Program" will mean the Content.</P>
+
+<P>If you did not receive this Content directly from Red Hat Inc., the 
+Content is being redistributed by another party ("Redistributor") and different 
+terms and conditions may apply to your use of any object code in the Content. 
+Check the Redistributor's license that was provided with the Content. If no such 
+license exists, contact the Redistributor. Unless otherwise indicated below, the 
+terms and conditions of the EPL still apply to any source code in the Content 
+and such source code may be obtained at
+  <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P>
+
+</BODY>
+</HTML>
\ No newline at end of file

Copied: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/build.properties (from rev 39736, workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/build.properties)
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/build.properties	                        (rev 0)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/build.properties	2012-03-21 18:50:58 UTC (rev 39737)
@@ -0,0 +1,13 @@
+bin.includes = templates/,\
+               plugin.xml,\
+               plugin.properties,\
+               images/,\
+               about.html,\
+               META-INF/,\
+               .,\
+               icons/
+src.includes = resources/
+jars.compile.order = .
+output.. = bin/
+source.. = resources/,\
+           src/

Deleted: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.classpath
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.classpath	2012-03-21 18:49:51 UTC (rev 39736)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.classpath	2012-03-21 18:50:58 UTC (rev 39737)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="src" path="resources/"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

Deleted: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.cvsignore
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.cvsignore	2012-03-21 18:49:51 UTC (rev 39736)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.cvsignore	2012-03-21 18:50:58 UTC (rev 39737)
@@ -1,2 +0,0 @@
-yguard.log
-bin

Deleted: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.options.template
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.options.template	2012-03-21 18:49:51 UTC (rev 39736)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.options.template	2012-03-21 18:50:58 UTC (rev 39737)
@@ -1 +0,0 @@
-org.jboss.tools.jst.jsp/debug=false
\ No newline at end of file

Deleted: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.project
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.project	2012-03-21 18:49:51 UTC (rev 39736)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/.project	2012-03-21 18:50:58 UTC (rev 39737)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.jboss.tools.jst.jsp</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

Deleted: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/about.html
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/about.html	2012-03-21 18:49:51 UTC (rev 39736)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/about.html	2012-03-21 18:50:58 UTC (rev 39737)
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>&copy;2007 Red Hat, Inc. All rights reserved</P>
-
-<H3>License</H3>
-
-<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from Red Hat Inc., the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-  <A href="http://www.jboss.org/tools">http://www.jboss.org/tools</A>.</P>
-
-</BODY>
-</HTML>
\ No newline at end of file

Deleted: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/build.properties
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/build.properties	2012-03-21 18:49:51 UTC (rev 39736)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/build.properties	2012-03-21 18:50:58 UTC (rev 39737)
@@ -1,13 +0,0 @@
-bin.includes = templates/,\
-               plugin.xml,\
-               plugin.properties,\
-               images/,\
-               about.html,\
-               META-INF/,\
-               .,\
-               icons/
-src.includes = resources/
-jars.compile.order = .
-output.. = bin/
-source.. = resources/,\
-           src/

Deleted: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin.properties
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin.properties	2012-03-21 18:49:51 UTC (rev 39736)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin.properties	2012-03-21 18:50:58 UTC (rev 39737)
@@ -1,25 +0,0 @@
-providerName=JBoss by Red Hat
-jsp.page.name=JSP Syntax Colors
-editors.jsp.name=JBoss Tools JSP Editor
-editors.html.name=JBoss Tools HTML Editor
-editors.docbook.name=JBoss Tools Docbook Editor
-
-JSP_Occurrences.name= JSP Occurrences
-
-occurrenceStructureProvidersExtensionPoint= Occurrence Structure Providers
-defaultOccurrenceStructureProviderName= Default Occurrence Provider
-
-Bundle-Name.0 = Jsp Editor Plug-in
-
-javaStringELHover= EL in Java String
-javaStringELHoverDescription= Shows the Javadoc of the selected EL-operand.
-
-proposalCategory.xmlEL= JBoss JSF EL Proposals
-proposalCategory.xmlTag= JBoss JSF Tag Proposals
-Toggle.Selection.Bar=Toggle Selection Bar
-Externalize.Selected.Property=Externalize selected string...
-
-vpe.toolbar.name=VPE Toolbar
-
-ContentType_JBossToolsINC=JBoss Tools JSP Include
-ContentType_JBossPHPSource=JBoss Tools PHP Source
\ No newline at end of file

Deleted: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin.xml	2012-03-21 18:49:51 UTC (rev 39736)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin.xml	2012-03-21 18:50:58 UTC (rev 39737)
@@ -1,1069 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-  <extension-point id="occurrenceStructureProviders" 
-  		name="%occurrenceStructureProvidersExtensionPoint" />
-  <extension-point id="visulaEditorImplementations" name="Visual Editor Implementations" schema="schema/visulaEditorImplementations.exsd" />
-  <extension-point id="editorContentAssistent" name="editorContentAssistent" schema="schema/editorContentAssistent.exsd"/>
-  <extension-point id="localeProvider" name="Locale provider for an opened file" schema="schema/localeProvider.exsd"/>
-  <extension-point id="cssDialog" name="cssDialog" schema="schema/cssDialog.exsd"/> 
-
-	<extension point="org.eclipse.wst.sse.ui.editorConfiguration"> 
-		<sourceViewerConfiguration
-			class="org.jboss.tools.jst.jsp.JSPTextViewerConfiguration"
-			target="org.eclipse.jst.jsp.core.jspsource"/>
-		<contentOutlineConfiguration
-			class="org.eclipse.jst.jsp.ui.views.contentoutline.JSPContentOutlineConfiguration"
-			target="org.eclipse.jst.jsp.core.jspsource"/>
-		<propertySheetConfiguration
-			class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
-			target="org.eclipse.jst.jsp.core.jspsource"/>
-		<provisionalConfiguration 
-      		type="sourceeditingtexttools"
-			class="org.eclipse.jst.jsp.ui.internal.editor.JSPSourceEditingTextTools"
-			target="org.eclipse.jst.jsp.core.jspsource"/>
-		<provisionalConfiguration
-      		type="characterpairmatcher"
-			class="org.eclipse.jst.jsp.ui.internal.text.JSPDocumentRegionEdgeMatcher"
-			target="org.eclipse.jst.jsp.core.jspsource"/>
-	    <provisionalConfiguration
-      		type="structuredtextfoldingprovider"
-            class="org.eclipse.wst.xml.ui.internal.projection.StructuredTextFoldingProviderJSP"
-            target="org.eclipse.jst.jsp.core.jspsource"/>
-		<provisionalDefinition 
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp"
-			target="org.eclipse.jst.jsp.core.jspsource"/>
-		<provisionalDefinition
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp.source"
-			target="org.eclipse.jst.jsp.core.jspsource"/>
-		<provisionalDefinition
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp.templates"
-			target="org.eclipse.jst.jsp.core.jspsource"/>
-		<provisionalDefinition
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp.styles"
-			target="org.eclipse.jst.jsp.core.jspsource"/>
-		<provisionalDefinition
-      		type="showintarget"
-            value="org.eclipse.jdt.ui.PackageExplorer"
-			target="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
-		<provisionalDefinition
-      		type="showintarget"
-            value="org.jboss.tools.jst.web.ui.navigator.WebProjectsView"
-			target="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
-      <provisionalDefinition
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
-			target="org.eclipse.jst.jsp.core.jspsource"/>
-
-		<sourceViewerConfiguration
-			class="org.jboss.tools.jst.jsp.JSPTextViewerConfiguration"
-			target="org.jboss.tools.jst.jsp.jspincludesource"/>
-		<contentOutlineConfiguration
-			class="org.eclipse.jst.jsp.ui.views.contentoutline.JSPContentOutlineConfiguration"
-			target="org.jboss.tools.jst.jsp.jspincludesource"/>
-		<propertySheetConfiguration
-			class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
-			target="org.jboss.tools.jst.jsp.jspincludesource"/>
-		<provisionalConfiguration 
-      		type="sourceeditingtexttools"
-			class="org.eclipse.jst.jsp.ui.internal.editor.JSPSourceEditingTextTools"
-			target="org.jboss.tools.jst.jsp.jspincludesource"/>
-		<provisionalConfiguration
-      		type="characterpairmatcher"
-			class="org.eclipse.jst.jsp.ui.internal.text.JSPDocumentRegionEdgeMatcher"
-			target="org.jboss.tools.jst.jsp.jspincludesource"/>
-	    <provisionalConfiguration
-      		type="structuredtextfoldingprovider"
-            class="org.eclipse.wst.xml.ui.internal.projection.StructuredTextFoldingProviderJSP"
-            target="org.jboss.tools.jst.jsp.jspincludesource"/>
-		<provisionalDefinition 
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp"
-			target="org.jboss.tools.jst.jsp.jspincludesource"/>
-		<provisionalDefinition
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp.source"
-			target="org.jboss.tools.jst.jsp.jspincludesource"/>
-		<provisionalDefinition
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp.templates"
-			target="org.jboss.tools.jst.jsp.jspincludesource"/>
-		<provisionalDefinition
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp.styles"
-			target="org.jboss.tools.jst.jsp.jspincludesource"/>
-      <provisionalDefinition
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
-			target="org.jboss.tools.jst.jsp.jspincludesource"/>
-			
-	      <sourceViewerConfiguration
-				class="org.jboss.tools.jst.jsp.HTMLTextViewerConfiguration"
-	            target="org.eclipse.wst.html.core.htmlsource"/>
-	      <contentOutlineConfiguration
-	            class="org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration"
-	            target="org.eclipse.wst.html.core.htmlsource"/>
-	      <propertySheetConfiguration
-	            class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
-	            target="org.eclipse.wst.html.core.htmlsource"/>
-	      <provisionalConfiguration
-	      		type="sourceeditingtexttools"
-	            class="org.eclipse.wst.xml.ui.internal.provisional.XMLSourceEditingTextTools"
-	            target="org.eclipse.wst.html.core.htmlsource"/>
-	      <provisionalConfiguration
-	      		type="characterpairmatcher"
-	            class="org.eclipse.wst.html.ui.internal.text.HTMLDocumentRegionEdgeMatcher"
-	            target="org.eclipse.wst.html.core.htmlsource"/>
-	      <provisionalConfiguration
-	      		type="structuredtextfoldingprovider"
-	            class="org.eclipse.wst.html.ui.internal.projection.StructuredTextFoldingProviderHTML"
-	            target="org.eclipse.wst.html.core.htmlsource"/>
-	      <provisionalDefinition 
-	      		type="preferencepages"
-	            value="org.eclipse.wst.html.ui.preferences"
-	            target="org.eclipse.wst.html.core.htmlsource"/>
-	      <provisionalDefinition 
-	      		type="preferencepages"
-	            value="org.eclipse.wst.html.ui.preferences.source"
-	            target="org.eclipse.wst.html.core.htmlsource"/>
-	      <provisionalDefinition 
-	      		type="preferencepages"
-	            value="org.eclipse.wst.html.ui.preferences.templates"
-	            target="org.eclipse.wst.html.core.htmlsource"/>
-	      <provisionalDefinition 
-	      		type="preferencepages"
-	            value="org.eclipse.wst.html.ui.preferences.styles"
-	            target="org.eclipse.wst.html.core.htmlsource"/>
-      <provisionalDefinition
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
-            target="org.eclipse.wst.html.core.htmlsource"/>
-
-	      <sourceViewerConfiguration
-				class="org.jboss.tools.jst.jsp.HTMLTextViewerConfiguration"
-	            target="jsf.facelet"/>
-	      <contentOutlineConfiguration
-	            class="org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration"
-	            target="jsf.facelet"/>
-	      <propertySheetConfiguration
-	            class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
-	            target="jsf.facelet"/>
-	      <provisionalConfiguration
-	      		type="sourceeditingtexttools"
-	            class="org.eclipse.wst.xml.ui.internal.provisional.XMLSourceEditingTextTools"
-	            target="jsf.facelet"/>
-	      <provisionalConfiguration
-	      		type="characterpairmatcher"
-	            class="org.eclipse.wst.html.ui.internal.text.HTMLDocumentRegionEdgeMatcher"
-	            target="jsf.facelet"/>
-	      <provisionalConfiguration
-	      		type="structuredtextfoldingprovider"
-	            class="org.eclipse.wst.html.ui.internal.projection.StructuredTextFoldingProviderHTML"
-	            target="jsf.facelet"/>
-	      <provisionalDefinition 
-	      		type="preferencepages"
-	            value="org.eclipse.wst.html.ui.preferences"
-	            target="jsf.facelet"/>
-	      <provisionalDefinition 
-	      		type="preferencepages"
-	            value="org.eclipse.wst.html.ui.preferences.source"
-	            target="jsf.facelet"/>
-	      <provisionalDefinition 
-	      		type="preferencepages"
-	            value="org.eclipse.wst.html.ui.preferences.templates"
-	            target="jsf.facelet"/>
-	      <provisionalDefinition 
-	      		type="preferencepages"
-	            value="org.eclipse.wst.html.ui.preferences.styles"
-	            target="jsf.facelet"/>
-      <provisionalDefinition
-      		type="preferencepages"
-            value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
-            target="jsf.facelet"/>
-
-      <provisionalConfiguration
-            class="org.eclipse.wst.xml.ui.internal.projection.StructuredTextFoldingProviderXML"
-            target="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"
-            type="structuredtextfoldingprovider">
-      </provisionalConfiguration>
-      <provisionalConfiguration
-            class="org.eclipse.wst.xml.ui.internal.projection.StructuredTextFoldingProviderXML"
-            target="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"
-            type="structuredtextfoldingprovider">
-      </provisionalConfiguration>
-	
-	
-	  <documentationTextHover class="org.jboss.tools.jst.jsp.jspeditor.info.FaceletTagInfoHoverProcessor" target="org.eclipse.wst.html.HTML_DEFAULT" /> 
-	  <documentationTextHover class="org.jboss.tools.jst.jsp.jspeditor.info.FaceletTagInfoHoverProcessor" target="org.eclipse.wst.xml.XML_DEFAULT" />
-	  <documentationTextHover class="org.jboss.tools.jst.jsp.jspeditor.info.FaceletTagInfoHoverProcessor" target="org.eclipse.wst.sse.ST_DEFAULT" />
-	  <documentationTextHover class="org.jboss.tools.jst.jsp.jspeditor.info.FaceletTagInfoHoverProcessor" target="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-	  <documentationTextHover class="org.jboss.tools.jst.jsp.jspeditor.info.FaceletTagInfoHoverProcessor" target="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-	  
-	</extension>
-
-   <extension
-         point="org.eclipse.jdt.ui.javaEditorTextHovers">
-      <hover
-            label="%javaStringELHover"
-            description="%javaStringELHoverDescription"
-            class="org.jboss.tools.jst.jsp.jspeditor.info.JavaStringELInfoHover"
-            id="org.jboss.tools.jst.jsp.jspeditor.info.JavaStringELInfoHover"
-            activate="true">
-      </hover>
-	</extension>
-
-	<extension point="org.eclipse.ui.preferencePages">
-		<!-- Additional JSP/HTML PREFERENCE PAGES -->
-		<page
-			name="%JSP_Occurrences.name"
-			category="org.eclipse.jst.jsp.ui.preferences.jsp"
-			class="org.jboss.tools.jst.jsp.preferences.JSPOccurrencesPreferencePage"
-			id="org.eclipse.wst.sse.ui.preferences.jsp.occurrences">
-		</page>
-	</extension>
-
-   <extension point="org.eclipse.ui.editors">
-      <editor
-            icon="$nl$/images/xstudio/editors/jsp.gif"
-            class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor"
-            default="true"
-            name="%editors.jsp.name"
-            contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor"
-            id="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"
-            matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl"
-            extensions="jsp, jspf, jspx, tag, tagf">
-         <contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.jspsource"/>
-         <contentTypeBinding contentTypeId="org.jboss.tools.jst.jsp.jspincludesource"/>
-      </editor>
-      <editor 
-            class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor" 
-            contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor" 
-            extensions="html, htm, jsf, xhtml" 
-            icon="$nl$/images/xstudio/editors/html_file.gif" 
-            id="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor" 
-            matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl"
-            name="%editors.html.name" 
-            default="true">
-         <contentTypeBinding contentTypeId="org.eclipse.wst.html.core.htmlsource"/>
-         <contentTypeBinding contentTypeId="org.jboss.tools.jst.jsp.phpsource"/>
-         <contentTypeBinding contentTypeId="org.eclipse.php.core.phpsource"/>
-         <contentTypeBinding contentTypeId="jsf.facelet"/>
-      </editor>
-      <editor
-      		class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor"
-      		contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor"
-      		icon="$nl$/images/xstudio/editors/xmldoc.gif"
-      		id="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"
-      		name="%editors.docbook.name">
-      		<contentTypeBinding contentTypeId="org.jboss.tools.jst.jsp.editor.docbookFile"/> 
-      </editor>
-   </extension>
-
-   <extension point="org.eclipse.ui.editorActions">
-   <!-- necessary menu items -->
-   <!--<editorContribution id="formatJSPActionContribution" targetID="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
-           <action actionID="formatJSPAction" class="org.jboss.tools.jst.jsp.ui.action.FormatJSPActionDelegate" id="formatJSPAction" label="Format" menubarPath="edit/additions">
-           </action>
-      </editorContribution>
-
-      <editorContribution 
-         id="ARenameElement" 
-         targetID="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
-           <action
-                 actionID="org.eclipse.jst.jsp.ui.refactor.rename"
-                 class="org.eclipse.jst.jsp.ui.internal.java.refactoring.JSPRenameElementActionDelegate"
-                 definitionId="org.eclipse.jst.jsp.ui.refactor.rename"
-                 id="RenameElement"
-                 label="Rename">
-           </action>
-      </editorContribution>
-      <editorContribution 
-         id="AMoveElement" 
-         targetID="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
-           <action
-                 actionID="org.eclipse.jst.jsp.ui.refactor.move"
-                 class="org.eclipse.jst.jsp.ui.internal.java.refactoring.JSPMoveElementActionDelegate"
-                 definitionId="org.eclipse.jst.jsp.ui.refactor.move"
-                 id="MoveElement"
-                 label="Move">
-           </action>
-      </editorContribution>-->
-      
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-         <menuContribution 
-               locationURI="menu:navigate?endof=show.ext">
-               <command label="%Toggle.Selection.Bar"
-                     commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar"
-                     id="org.jboss.tools.jst.jsp.menus.showSelectionBar"
-                     style="toggle"
-                     mnemonic="S">
-                     <visibleWhen
-                           checkEnabled="false">
-                           <with
-                                 variable="activeEditorId">
-                                 <or>
-	                                 <equals
-	                                       value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
-	                                 </equals>
-	                                 <equals
-	                                       value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor">
-	                                 </equals>
-	                                 <equals
-	                                       value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor">
-	                                 </equals>
-                                 </or>
-                           </with>
-                     </visibleWhen>
-               </command>
-         </menuContribution>
-         <menuContribution 
-			locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.source.EditorContext?after=org.jboss.tools.vpe.editor.menu.SetupTemplateContributionItem">
-        	<dynamic
-               class="org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem"
-               id="org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
-        	</dynamic>
-        </menuContribution>
-        <menuContribution
-              locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor.source.EditorContext?after=org.jboss.tools.vpe.editor.menu.SetupTemplateContributionItem">
-        	<dynamic
-               class="org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem"
-               id="org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
-        	</dynamic>
-        </menuContribution>
-         <menuContribution 
-			locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.source.EditorContext?after=org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
-			<command
-         		commandId="org.jboss.tools.jst.jsp.commands.i18" />
-        </menuContribution>
-        <menuContribution
-              locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor.source.EditorContext?after=org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
-              <command
-         		commandId="org.jboss.tools.jst.jsp.commands.i18" />
-        </menuContribution>
-        <menuContribution
-              locationURI="menu:sourceMenuId?after=OccurencesFile">
-              <command label="%Externalize.Selected.Property"
-                    commandId="org.jboss.tools.jst.jsp.commands.i18"
-                    id="org.jboss.tools.jst.jsp.menus.i18"
-                    mnemonic="S">
-                    	<visibleWhen checkEnabled="false">
-							<and>
-								<with variable="activeContexts">
-									<iterate operator="or">
-										<equals value="org.eclipse.wst.sse.ui.structuredTextEditorScope"/>
-									</iterate>
-								</with>
-								<with variable="activeEditorId">
-                            	     <or>
-	                            	     <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor" />
-	                                	 <equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor" />
-		                                 <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor" />
-    	                             </or>
-        	                   </with>
-							</and>
-						</visibleWhen>
-              </command>
-        </menuContribution>
-        <menuContribution
-              locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
-           <toolbar label="%vpe.toolbar.name"
-                 id="org.jboss.tools.jst.jsp.toolbars.sampleToolbar">
-              <command
-                    commandId="org.jboss.tools.jst.jsp.commands.i18"
-                    icon="icons/externalize.png"
-                    id="org.jboss.tools.jst.jsp.toolbars.i18"
-                    tooltip="%Externalize.Selected.Property">
-					 <visibleWhen checkEnabled="false">
-	            		<reference definitionId="org.jboss.tools.ui.vpe.editor"/>
-	            	</visibleWhen>
-              </command>
-              <command
-                     commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar"
-                     icon="icons/selbar.gif"
-                     id="org.jboss.tools.jst.jsp.toolbars.showSelectionBar"
-                     style="toggle"
-                     tooltip="%Toggle.Selection.Bar">
-                     <visibleWhen checkEnabled="false">
-	            		<reference definitionId="org.jboss.tools.ui.vpe.editor"/>
-	            	</visibleWhen>
-               </command>
-           </toolbar>
-        </menuContribution>
-         
-   </extension>
-   
-       <extension
-       point="org.eclipse.ui.handlers">
-       <handler
-             class="org.eclipse.jst.jsp.ui.internal.handlers.JSPFindOccurrencesHandler"
-             commandId="org.eclipse.wst.sse.ui.search.find.occurrences">
-             <activeWhen>
-              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.html.ui.internal.edit.ui.CleanupDocumentHandler"
-             commandId="org.eclipse.wst.sse.ui.cleanup.document">
-             <activeWhen>
-                    <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-             </activeWhen>
-             <enabledWhen>
-                    <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-             </enabledWhen>
-       </handler>
-              <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectEnclosingXMLHandler"
-             commandId="org.eclipse.wst.sse.ui.structure.select.enclosing">
-          <activeWhen>
-              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectNextXMLHandler"
-             commandId="org.eclipse.wst.sse.ui.structure.select.next">
-          <activeWhen>
-              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectPreviousXMLHandler"
-             commandId="org.eclipse.wst.sse.ui.structure.select.previous">
-          <activeWhen>
-              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.sse.ui.internal.handlers.StructuredSelectHistoryHandler"
-             commandId="org.eclipse.wst.sse.ui.structure.select.last">
-          <activeWhen>
-              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.jboss.tools.jst.jsp.selection.bar.SelectionBarHandler"
-             commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar">
-       </handler>
-       <handler
-             class="org.jboss.tools.jst.jsp.i18n.handlers.I18nHandler"
-             commandId="org.jboss.tools.jst.jsp.commands.i18">
-       </handler>
-       </extension>
-
-	<extension point="org.eclipse.core.expressions.definitions">
-			<definition id="org.jboss.tools.ui.structuredEditor">
-				<and>
-					<with variable="activeContexts">
-						<iterate operator="or">
-							<equals value="org.eclipse.wst.sse.ui.structuredTextEditorScope"/>
-						</iterate>
-					</with>
-					<or>
-					<with variable="activeEditorId">
-							<equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
-					</with>
-					<with variable="activeEditorId">
-							<equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/>
-					</with>
-					<with variable="activeEditorId">
-							<equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/>
-					</with>
-					</or>
-				</and>			
-			</definition>
-		</extension>
-   <!--extension point="org.jboss.tools.common.verification.rules">
-      <rule-set path="meta/.rule-sets.xml"/>
-   </extension-->
-   
-    <extension point="org.jboss.tools.jst.jsp.occurrenceStructureProviders">
-	  	<provider 
-	  		class="org.jboss.tools.jst.jsp.text.JSPOccurrenceProvider" 
-	  		editorId="org.jboss.tools.jst.jsp" 
-	  		name="%defaultOccurrenceStructureProviderName" /> 
-	</extension>
-
-	<extension point="org.eclipse.core.contenttype.contentTypes"> 
-   	</extension>
-   
-	
-    <extension point="org.eclipse.core.runtime.contentTypes">
-      	<content-type 
-	      	id="org.jboss.tools.jst.jsp.jspincludesource"
-	       	name="%ContentType_JBossToolsINC"
-	       	base-type="org.eclipse.jst.jsp.core.jspsource"
-	       	describer="org.jboss.tools.jst.jsp.jspeditor.JSPIncludeContentDescriber"
-	       	file-extensions="inc"
-	       	priority="high"/>
-      	<content-type 
-	      	id="org.jboss.tools.jst.jsp.phpsource"
-	       	name="%ContentType_JBossPHPSource"
-	       	base-type="org.eclipse.wst.html.core.htmlsource"
-	       	describer="org.jboss.tools.jst.jsp.jspeditor.JSPIncludeContentDescriber"
-	       	file-extensions="php"
-	       	priority="high"/>
-	       	
-       <file-association
-             content-type="org.eclipse.wst.html.core.htmlsource"
-             file-extensions="jsf"/>
-       <content-type id="org.jboss.tools.jst.jsp.editor.docbookFile"
-       		base-type="org.eclipse.core.runtime.xml"
-       		file-extensions="dbk, xml"
-       		priority="normal"
-       		name="Docbook File">
-       	<describer class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber2">
-			<parameter name="element" value="book"/>
-			<parameter name="element" value="chapter"/>
-			<parameter name="element" value="section"/>
-			<parameter name="element" value="part"/>
-			<parameter name="element" value="article"/>
-			<parameter name="element" value="appendix"/>
-       	</describer>
-      </content-type> 
-      
-    </extension>
-   
-   <extension
-         point="org.jboss.tools.common.model.resourceMapping">
-      <mapping
-          loader="org.jboss.tools.jst.jsp"
-          priority="4"
-          kind="class"
-          paths=".texteditors.jsp.,org.jboss.tools.jst.jsp."
-      />
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.templates">
-      <include
-            file="templates/facelets-templates.xml"
-            translations="$nl$/templates/facelets-templates.properties"/>
-   </extension>
-
-   <extension point="org.jboss.tools.common.model.classes">
-		<xclass id="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"
-			class="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
-		<xclass id="org.jboss.tools.jst.jsp.outline.JSPCellEditorProviderImpl"
-			class="org.jboss.tools.jst.jsp.outline.JSPCellEditorProviderImpl"/>
-		<xclass id="org.jboss.tools.jst.jsp.outline.VpeProperties"
-			class="org.jboss.tools.jst.jsp.outline.VpeProperties"/>
-		<xclass id="org.jboss.tools.jst.jsp.outline.DefaultDropCommandRunner"
-			class="org.jboss.tools.jst.jsp.outline.DefaultDropCommandRunner"/>
-		<xclass id="org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand"
-			class="org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand"/>
-		<xclass id="org.jboss.tools.jst.jsp.jspeditor.dnd.FileDropCommand"
-			class="org.jboss.tools.jst.jsp.jspeditor.dnd.FileDropCommand"/>
-   </extension>
-    
-   <extension 
-		point="org.jboss.tools.common.text.xml.contentAssistProcessor"
-		id="org.jboss.tools.jst.jsp.contentAssistProcessor"
-		name="org.jboss.tools.jst.jsp.contentAssistProcessor">
-
-		<!-- contentAssistProcessor 
-				class="org.jboss.tools.jst.jsp.contentassist.ExtendedJSPContentAssistProcessor" 
-				id="org.jboss.tools.jst.jsp.contentassist.ExtendedJSPContentAssistProcessor">
-			<contenttype id="org.eclipse.jst.jsp.core.jspsource">
-				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitiontype id="org.eclipse.jst.jsp.DEFAULT_JSP" />
-				<partitiontype id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-			</contenttype>
-		</contentAssistProcessor>
-		
-		<contentAssistProcessor 
-				class="org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor" 
-				id="org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor">
-
-			<contenttype id="org.eclipse.wst.html.core.htmlsource">
-				<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" /> 
-			</contenttype>
-		</contentAssistProcessor>
--->
-		<!-- 
-			//added by estherbin
-			//fix http://jira.jboss.com/jira/browse/JBIDE-1791
-		-->
-		<!-- contentAssistProcessor 
-				class="org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor" 
-				id="org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor">
-			<contenttype id="org.eclipse.wst.html.core.htmlsource">
-				<partitiontype id="org.eclipse.wst.css.STYLE" />
-			</contenttype>
-		</contentAssistProcessor -->
-		
-		<!-- 
-			// Fix for JBIDE-5068 
-		-->
-		<!-- contentAssistProcessor 
-				class="org.eclipse.jst.jsp.ui.internal.contentassist.JSPJavaContentAssistProcessor" 
-				id="org.eclipse.jst.jsp.ui.internal.contentassist.JSPJavaContentAssistProcessor">
-			<contenttype id="org.eclipse.jst.jsp.core.jspsource">
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JAVA" />
-			</contenttype>
-		</contentAssistProcessor -->
-		
-		<!-- This is to be replaced by org.eclipse.wst.sse.ui.completionProposal ext. point -->
-		<!--
-		<contentAssistProcessor 
-				class="org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor" 
-				id="org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor">
-			<contenttype id="org.eclipse.jst.jsp.core.jspsource">
-				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitiontype id="org.eclipse.jst.jsp.DEFAULT_JSP" />
-				<partitiontype id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-				<partitiontype id="org.eclipse.wst.css.STYLE" />
-			</contenttype>
-		</contentAssistProcessor>
-			
-		<contentAssistProcessor 
-				class="org.jboss.tools.jst.jsp.contentassist.XmlContentAssistProcessor" 
-				id="org.jboss.tools.jst.jsp.contentassist.XmlContentAssistProcessor">
-			<contenttype id="org.eclipse.wst.xml.core.xmlsource">
-				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitiontype id="org.eclipse.wst.xml.XML_PI" />
-				<partitiontype id="org.eclipse.wst.xml.XML_DECL" />
-				<partitiontype id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitiontype id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitiontype id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contenttype>
-			<contenttype id="org.jboss.tools.seam.xml.ui.pages20xmlsource">
-				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitiontype id="org.eclipse.wst.xml.XML_PI" />
-				<partitiontype id="org.eclipse.wst.xml.XML_DECL" />
-				<partitiontype id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitiontype id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitiontype id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contenttype>
-			<contenttype id="org.eclipse.jst.jsf.facesconfig.facesConfigFile">
-				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitiontype id="org.eclipse.wst.xml.XML_PI" />
-				<partitiontype id="org.eclipse.wst.xml.XML_DECL" />
-				<partitiontype id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitiontype id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitiontype id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contenttype>
-			<contenttype id="org.jboss.tools.common.model.ui.xml">
-				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitiontype id="org.eclipse.wst.xml.XML_PI" />
-				<partitiontype id="org.eclipse.wst.xml.XML_DECL" />
-				<partitiontype id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitiontype id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitiontype id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contenttype>
-			<contenttype id="org.eclipse.jst.jee.ee5webDD">
-				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitiontype id="org.eclipse.wst.xml.XML_PI" />
-				<partitiontype id="org.eclipse.wst.xml.XML_DECL" />
-				<partitiontype id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitiontype id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitiontype id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitiontype id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contenttype>
-		</contentAssistProcessor>
-
-		<contentAssistProcessor 
-				class="org.jboss.tools.jst.jsp.contentassist.FaceletPageContectAssistProcessor" 
-				id="org.jboss.tools.jst.jsp.contentassist.FaceletPageContectAssistProcessor">
-			<contenttype id="org.eclipse.wst.html.core.htmlsource">
-				<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-				<partitiontype id="org.eclipse.wst.css.STYLE" />
-			</contenttype>
-			<contenttype id="jsf.facelet">
-				<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-				<partitiontype id="org.eclipse.wst.css.STYLE" />
-			</contenttype>
-		</contentAssistProcessor>
-	-->
-  </extension>
-  <extension
-        point="org.eclipse.ui.commands">
-     <category
-           description="CSSDialog"
-           id="org.jboss.tools.jst.jsp.commands"
-           name="CSS Dialog">
-     </category>
-     <command
-           categoryId="org.jboss.tools.jst.jsp.commands"
-           description="Open active or selected CSS Dialog"
-           id="org.jboss.tools.jst.jsp.commands.openCSSDialog"
-           name="Open CSS Dialog">
-     </command>
-     <category
-           id="org.jboss.tools.jst.jsp.commands.category"
-           name="Visual Page Editor Category">
-     </category>
-     <command
-           categoryId="org.jboss.tools.jst.jsp.commands.category"
-           id="org.jboss.tools.jst.jsp.commands.showSelectionBar"
-           name="Show Selection Bar">
-           <state
-                 class="org.eclipse.ui.handlers.RegistryToggleState:true"
-                 id="org.eclipse.ui.commands.toggleState">
-           </state>
-     </command>
-     <command
-           categoryId="org.jboss.tools.jst.jsp.commands.category"
-           id="org.jboss.tools.jst.jsp.commands.i18"
-           name="%Externalize.Selected.Property">
-     </command>
-  </extension>
-  <extension
-        point="org.eclipse.ui.bindings">
-     <key
-           commandId="org.jboss.tools.jst.jsp.commands.openCSSDialog"
-           contextId="org.eclipse.wst.css.core.csssource"
-           schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-           sequence="Ctrl+Shift+C">
-     </key>
-     <key
-           commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar"
-           contextId="org.eclipse.ui.contexts.window"
-           schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-           sequence="M1+6">
-     </key>
-     <key
-           commandId="org.jboss.tools.jst.jsp.commands.i18"
-           contextId="org.eclipse.ui.contexts.window"
-           schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-           sequence="M1+7">
-     </key>
-  </extension>
-  
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-               <initializer class="org.jboss.tools.jst.jsp.preferences.VpePreferencesInitializer"/>
-   </extension>
-   
-    <extension
-       point="org.eclipse.wst.sse.ui.completionProposal">
-    <proposalCategory
-          icon="images/ca/icons_JSF_EL.gif"
-          id="org.jboss.tools.jst.jsp.proposalCategory.xmlEL"
-          name="%proposalCategory.xmlEL">
-    </proposalCategory>
-    <proposalComputer
-          activate="false"
-          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlEL"
-          class="org.jboss.tools.jst.jsp.contentassist.computers.XmlELCompletionProposalComputer"
-          id="org.jboss.tools.jst.jsp.proposalComputer.xmlEL">
-          	<contentType id="org.eclipse.core.runtime.xml">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitionType id="org.eclipse.wst.xml.XML_PI" />
-				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contentType>
-			<contentType id="org.eclipse.wst.xml.core.xmlsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitionType id="org.eclipse.wst.xml.XML_PI" />
-				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contentType>
-			<contentType id="org.jboss.tools.seam.xml.ui.pages20xmlsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitionType id="org.eclipse.wst.xml.XML_PI" />
-				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contentType>
-			<contentType id="org.eclipse.jst.jsf.facesconfig.facesConfigFile">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitionType id="org.eclipse.wst.xml.XML_PI" />
-				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contentType>
-			<contentType id="org.jboss.tools.common.model.ui.xml">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitionType id="org.eclipse.wst.xml.XML_PI" />
-				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contentType>
-			<contentType id="org.eclipse.jst.jee.ee5webDD">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitionType id="org.eclipse.wst.xml.XML_PI" />
-				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contentType>
-    </proposalComputer>
-    <proposalComputer
-          activate="false"
-          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlEL"
-          class="org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer"
-          id="org.jboss.tools.jst.jsp.proposalComputer.jspEL">
-			<contentType id="org.eclipse.jst.jsp.core.jspsource">
-          		<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-          		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-          		<partitionType id="org.eclipse.jst.jsp.DEFAULT_JSP" />
-          		<partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-          		<partitionType id="org.eclipse.wst.css.STYLE" />
-       		</contentType>
-			<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
-          		<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-          		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-          		<partitionType id="org.eclipse.jst.jsp.DEFAULT_JSP" />
-          		<partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-          		<partitionType id="org.eclipse.wst.css.STYLE" />
-       		</contentType>
-    </proposalComputer>
-    <proposalComputer
-          activate="false"
-          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlEL"
-          class="org.jboss.tools.jst.jsp.contentassist.computers.FaceletsELCompletionProposalComputer"
-          id="org.jboss.tools.jst.jsp.proposalComputer.xhtmlEL">
-			<contentType id="org.eclipse.wst.html.core.htmlsource">
-				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-				<partitionType id="org.eclipse.wst.css.STYLE" />
-				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
-       		</contentType>
-       		<contentType id="org.jboss.tools.jst.jsp.phpsource">
-				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-				<partitionType id="org.eclipse.wst.css.STYLE" />
-				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
-       		</contentType>
-			<contentType id="org.eclipse.php.core.phpsource">
-				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-				<partitionType id="org.eclipse.wst.css.STYLE" />
-				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
-			</contentType>
-       		<contentType id="jsf.facelet">
-				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-				<partitionType id="org.eclipse.wst.css.STYLE" />
-				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
-			</contentType>
-			<contentType id="jsf.facelet.composite">
-				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-				<partitionType id="org.eclipse.wst.css.STYLE" />
-				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
-			</contentType>
-			
-    </proposalComputer>
-
-    <proposalCategory
-          icon="images/ca/icons_JSF_EL.gif"
-          id="org.jboss.tools.jst.jsp.proposalCategory.xmlTag"
-          name="%proposalCategory.xmlTag">
-    </proposalCategory>
-    <proposalComputer
-          activate="false"
-          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlTag"
-          class="org.jboss.tools.jst.jsp.contentassist.computers.XmlTagCompletionProposalComputer"
-          id="org.jboss.tools.jst.jsp.proposalComputer.xmlTag">
-			<contentType id="org.eclipse.wst.xml.core.xmlsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitionType id="org.eclipse.wst.xml.XML_PI" />
-				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contentType>
-			<contentType id="org.jboss.tools.seam.xml.ui.pages20xmlsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitionType id="org.eclipse.wst.xml.XML_PI" />
-				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contentType>
-			<contentType id="org.eclipse.jst.jsf.facesconfig.facesConfigFile">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitionType id="org.eclipse.wst.xml.XML_PI" />
-				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contentType>
-			<contentType id="org.jboss.tools.common.model.ui.xml">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitionType id="org.eclipse.wst.xml.XML_PI" />
-				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contentType>
-			<contentType id="org.eclipse.jst.jee.ee5webDD">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
-				<partitionType id="org.eclipse.wst.xml.XML_PI" />
-				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
-				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
-			</contentType>
-    </proposalComputer>
-    <proposalComputer
-          activate="false"
-          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlTag"
-          class="org.jboss.tools.jst.jsp.contentassist.computers.JspTagCompletionProposalComputer"
-          id="org.jboss.tools.jst.jsp.proposalComputer.jspTag">
-			<contentType id="org.eclipse.jst.jsp.core.jspsource">
-          		<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-          		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-          		<partitionType id="org.eclipse.jst.jsp.DEFAULT_JSP" />
-          		<partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-          		<partitionType id="org.eclipse.wst.css.STYLE" />
-       		</contentType>
-       		<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
-          		<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-          		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-          		<partitionType id="org.eclipse.jst.jsp.DEFAULT_JSP" />
-          		<partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-          		<partitionType id="org.eclipse.wst.css.STYLE" />
-       		</contentType>
-    </proposalComputer>
-    <proposalComputer
-          activate="false"
-          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlTag"
-          class="org.jboss.tools.jst.jsp.contentassist.computers.FaceletsTagCompletionProposalComputer"
-          id="org.jboss.tools.jst.jsp.proposalComputer.xhtmltag">
-			<contentType id="org.eclipse.wst.html.core.htmlsource">
-				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-				<partitionType id="org.eclipse.wst.css.STYLE" />
-       		</contentType>
-       		<contentType id="jsf.facelet">
-				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-				<partitionType id="org.eclipse.wst.css.STYLE" />
-			</contentType>
-			<contentType id="jsf.facelet.composite">
-				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
-				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
-				<partitionType id="org.eclipse.wst.css.STYLE" />
-			</contentType>
-    </proposalComputer>
-   </extension>
-    <extension
-          point="org.eclipse.ui.contexts">
-       <context
-             description="Context to allow activate and deactivate selection bar"
-             id="org.jboss.tools.jst.jsp.selectionBar.context"
-             name="Selection Bar"
-             parentId="org.eclipse.ui.contexts.window">
-       </context>
-    </extension>
-   <extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.jsp.ui.jspSourceContributions.definition">
-            <with variable="activeContexts">
-	           <iterate operator="or">
-	              <equals value="org.eclipse.jst.jsp.core.jspsource"/>
-	           </iterate>
-            </with>
-		</definition>
-	</extension>
-	
-	<extension point="org.eclipse.ui.menus">
-	    <menuContribution locationURI="menu:refactorMenuId">
-	       <separator name="jspRefactorBegin" visible="false"></separator>
-	       <command commandId="org.eclipse.jst.jsp.ui.refactor.rename" id="RenameElement" label="%command.jsp.refactor.rename.name" style="push">
-			   <visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition"></reference>
-				</visibleWhen>
-	       </command>
-	       <command commandId="org.eclipse.jst.jsp.ui.refactor.move" id="MoveElement" label="%command.jsp.refactor.move.name" style="push">
-			   <visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition"></reference>
-				</visibleWhen>
-	       </command>
-	       <separator name="jspRefactorBegin" visible="false"></separator>
-		</menuContribution>
-	</extension>
-</plugin>

Deleted: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin_ja.properties
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin_ja.properties	2012-03-21 18:49:51 UTC (rev 39736)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin_ja.properties	2012-03-21 18:50:58 UTC (rev 39737)
@@ -1,8 +0,0 @@
-providerName=JBoss by Red Hat
-jsp.page.name=JSP \u69CB\u6587\u306E\u8272
-editors.jsp.name=JBoss Tools JSP \u30A8\u30C7\u30A3\u30BF\u30FC
-editors.html.name=JBoss Tools HTML \u30A8\u30C7\u30A3\u30BF\u30FC
-JSP_Occurrences.name=JSP \u30AA\u30AB\u30EC\u30F3\u30B9
-occurrenceStructureProvidersExtensionPoint=\u30AA\u30AB\u30EC\u30F3\u30B9\u69CB\u9020\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC
-defaultOccurrenceStructureProviderName=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30AA\u30AB\u30EC\u30F3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC
-Bundle-Name.0=JSP \u30A8\u30C7\u30A3\u30BF\u30FC\u30FB\u30D7\u30E9\u30B0\u30A4\u30F3

Deleted: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/pom.xml
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/pom.xml	2012-03-21 18:49:51 UTC (rev 39736)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/pom.xml	2012-03-21 18:50:58 UTC (rev 39737)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion> 
-	<parent>
-		<groupId>org.jboss.tools.jst</groupId>
-		<artifactId>plugins</artifactId>
-		<version>3.3.0-SNAPSHOT</version>
-	</parent>
-	<groupId>org.jboss.tools.jst.plugins</groupId>
-	<artifactId>org.jboss.tools.jst.jsp</artifactId> 
-	
-	<packaging>eclipse-plugin</packaging>
-</project>

Copied: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties (from rev 39736, workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin.properties)
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties	                        (rev 0)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties	2012-03-21 18:50:58 UTC (rev 39737)
@@ -0,0 +1,25 @@
+providerName=JBoss by Red Hat
+jsp.page.name=JSP Syntax Colors
+editors.jsp.name=JBoss Tools JSP Editor
+editors.html.name=JBoss Tools HTML Editor
+editors.docbook.name=JBoss Tools Docbook Editor
+
+JSP_Occurrences.name= JSP Occurrences
+
+occurrenceStructureProvidersExtensionPoint= Occurrence Structure Providers
+defaultOccurrenceStructureProviderName= Default Occurrence Provider
+
+Bundle-Name.0 = Jsp Editor Plug-in
+
+javaStringELHover= EL in Java String
+javaStringELHoverDescription= Shows the Javadoc of the selected EL-operand.
+
+proposalCategory.xmlEL= JBoss JSF EL Proposals
+proposalCategory.xmlTag= JBoss JSF Tag Proposals
+Toggle.Selection.Bar=Toggle Selection Bar
+Externalize.Selected.Property=Externalize selected string...
+
+vpe.toolbar.name=VPE Toolbar
+
+ContentType_JBossToolsINC=JBoss Tools JSP Include
+ContentType_JBossPHPSource=JBoss Tools PHP Source
\ No newline at end of file

Copied: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml (from rev 39736, workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin.xml)
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml	                        (rev 0)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml	2012-03-21 18:50:58 UTC (rev 39737)
@@ -0,0 +1,1069 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+  <extension-point id="occurrenceStructureProviders" 
+  		name="%occurrenceStructureProvidersExtensionPoint" />
+  <extension-point id="visulaEditorImplementations" name="Visual Editor Implementations" schema="schema/visulaEditorImplementations.exsd" />
+  <extension-point id="editorContentAssistent" name="editorContentAssistent" schema="schema/editorContentAssistent.exsd"/>
+  <extension-point id="localeProvider" name="Locale provider for an opened file" schema="schema/localeProvider.exsd"/>
+  <extension-point id="cssDialog" name="cssDialog" schema="schema/cssDialog.exsd"/> 
+
+	<extension point="org.eclipse.wst.sse.ui.editorConfiguration"> 
+		<sourceViewerConfiguration
+			class="org.jboss.tools.jst.jsp.JSPTextViewerConfiguration"
+			target="org.eclipse.jst.jsp.core.jspsource"/>
+		<contentOutlineConfiguration
+			class="org.eclipse.jst.jsp.ui.views.contentoutline.JSPContentOutlineConfiguration"
+			target="org.eclipse.jst.jsp.core.jspsource"/>
+		<propertySheetConfiguration
+			class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
+			target="org.eclipse.jst.jsp.core.jspsource"/>
+		<provisionalConfiguration 
+      		type="sourceeditingtexttools"
+			class="org.eclipse.jst.jsp.ui.internal.editor.JSPSourceEditingTextTools"
+			target="org.eclipse.jst.jsp.core.jspsource"/>
+		<provisionalConfiguration
+      		type="characterpairmatcher"
+			class="org.eclipse.jst.jsp.ui.internal.text.JSPDocumentRegionEdgeMatcher"
+			target="org.eclipse.jst.jsp.core.jspsource"/>
+	    <provisionalConfiguration
+      		type="structuredtextfoldingprovider"
+            class="org.eclipse.wst.xml.ui.internal.projection.StructuredTextFoldingProviderJSP"
+            target="org.eclipse.jst.jsp.core.jspsource"/>
+		<provisionalDefinition 
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp"
+			target="org.eclipse.jst.jsp.core.jspsource"/>
+		<provisionalDefinition
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp.source"
+			target="org.eclipse.jst.jsp.core.jspsource"/>
+		<provisionalDefinition
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp.templates"
+			target="org.eclipse.jst.jsp.core.jspsource"/>
+		<provisionalDefinition
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp.styles"
+			target="org.eclipse.jst.jsp.core.jspsource"/>
+		<provisionalDefinition
+      		type="showintarget"
+            value="org.eclipse.jdt.ui.PackageExplorer"
+			target="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
+		<provisionalDefinition
+      		type="showintarget"
+            value="org.jboss.tools.jst.web.ui.navigator.WebProjectsView"
+			target="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
+      <provisionalDefinition
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
+			target="org.eclipse.jst.jsp.core.jspsource"/>
+
+		<sourceViewerConfiguration
+			class="org.jboss.tools.jst.jsp.JSPTextViewerConfiguration"
+			target="org.jboss.tools.jst.jsp.jspincludesource"/>
+		<contentOutlineConfiguration
+			class="org.eclipse.jst.jsp.ui.views.contentoutline.JSPContentOutlineConfiguration"
+			target="org.jboss.tools.jst.jsp.jspincludesource"/>
+		<propertySheetConfiguration
+			class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
+			target="org.jboss.tools.jst.jsp.jspincludesource"/>
+		<provisionalConfiguration 
+      		type="sourceeditingtexttools"
+			class="org.eclipse.jst.jsp.ui.internal.editor.JSPSourceEditingTextTools"
+			target="org.jboss.tools.jst.jsp.jspincludesource"/>
+		<provisionalConfiguration
+      		type="characterpairmatcher"
+			class="org.eclipse.jst.jsp.ui.internal.text.JSPDocumentRegionEdgeMatcher"
+			target="org.jboss.tools.jst.jsp.jspincludesource"/>
+	    <provisionalConfiguration
+      		type="structuredtextfoldingprovider"
+            class="org.eclipse.wst.xml.ui.internal.projection.StructuredTextFoldingProviderJSP"
+            target="org.jboss.tools.jst.jsp.jspincludesource"/>
+		<provisionalDefinition 
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp"
+			target="org.jboss.tools.jst.jsp.jspincludesource"/>
+		<provisionalDefinition
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp.source"
+			target="org.jboss.tools.jst.jsp.jspincludesource"/>
+		<provisionalDefinition
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp.templates"
+			target="org.jboss.tools.jst.jsp.jspincludesource"/>
+		<provisionalDefinition
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp.styles"
+			target="org.jboss.tools.jst.jsp.jspincludesource"/>
+      <provisionalDefinition
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
+			target="org.jboss.tools.jst.jsp.jspincludesource"/>
+			
+	      <sourceViewerConfiguration
+				class="org.jboss.tools.jst.jsp.HTMLTextViewerConfiguration"
+	            target="org.eclipse.wst.html.core.htmlsource"/>
+	      <contentOutlineConfiguration
+	            class="org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration"
+	            target="org.eclipse.wst.html.core.htmlsource"/>
+	      <propertySheetConfiguration
+	            class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
+	            target="org.eclipse.wst.html.core.htmlsource"/>
+	      <provisionalConfiguration
+	      		type="sourceeditingtexttools"
+	            class="org.eclipse.wst.xml.ui.internal.provisional.XMLSourceEditingTextTools"
+	            target="org.eclipse.wst.html.core.htmlsource"/>
+	      <provisionalConfiguration
+	      		type="characterpairmatcher"
+	            class="org.eclipse.wst.html.ui.internal.text.HTMLDocumentRegionEdgeMatcher"
+	            target="org.eclipse.wst.html.core.htmlsource"/>
+	      <provisionalConfiguration
+	      		type="structuredtextfoldingprovider"
+	            class="org.eclipse.wst.html.ui.internal.projection.StructuredTextFoldingProviderHTML"
+	            target="org.eclipse.wst.html.core.htmlsource"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences"
+	            target="org.eclipse.wst.html.core.htmlsource"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences.source"
+	            target="org.eclipse.wst.html.core.htmlsource"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences.templates"
+	            target="org.eclipse.wst.html.core.htmlsource"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences.styles"
+	            target="org.eclipse.wst.html.core.htmlsource"/>
+      <provisionalDefinition
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
+            target="org.eclipse.wst.html.core.htmlsource"/>
+
+	      <sourceViewerConfiguration
+				class="org.jboss.tools.jst.jsp.HTMLTextViewerConfiguration"
+	            target="jsf.facelet"/>
+	      <contentOutlineConfiguration
+	            class="org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration"
+	            target="jsf.facelet"/>
+	      <propertySheetConfiguration
+	            class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
+	            target="jsf.facelet"/>
+	      <provisionalConfiguration
+	      		type="sourceeditingtexttools"
+	            class="org.eclipse.wst.xml.ui.internal.provisional.XMLSourceEditingTextTools"
+	            target="jsf.facelet"/>
+	      <provisionalConfiguration
+	      		type="characterpairmatcher"
+	            class="org.eclipse.wst.html.ui.internal.text.HTMLDocumentRegionEdgeMatcher"
+	            target="jsf.facelet"/>
+	      <provisionalConfiguration
+	      		type="structuredtextfoldingprovider"
+	            class="org.eclipse.wst.html.ui.internal.projection.StructuredTextFoldingProviderHTML"
+	            target="jsf.facelet"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences"
+	            target="jsf.facelet"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences.source"
+	            target="jsf.facelet"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences.templates"
+	            target="jsf.facelet"/>
+	      <provisionalDefinition 
+	      		type="preferencepages"
+	            value="org.eclipse.wst.html.ui.preferences.styles"
+	            target="jsf.facelet"/>
+      <provisionalDefinition
+      		type="preferencepages"
+            value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
+            target="jsf.facelet"/>
+
+      <provisionalConfiguration
+            class="org.eclipse.wst.xml.ui.internal.projection.StructuredTextFoldingProviderXML"
+            target="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"
+            type="structuredtextfoldingprovider">
+      </provisionalConfiguration>
+      <provisionalConfiguration
+            class="org.eclipse.wst.xml.ui.internal.projection.StructuredTextFoldingProviderXML"
+            target="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"
+            type="structuredtextfoldingprovider">
+      </provisionalConfiguration>
+	
+	
+	  <documentationTextHover class="org.jboss.tools.jst.jsp.jspeditor.info.FaceletTagInfoHoverProcessor" target="org.eclipse.wst.html.HTML_DEFAULT" /> 
+	  <documentationTextHover class="org.jboss.tools.jst.jsp.jspeditor.info.FaceletTagInfoHoverProcessor" target="org.eclipse.wst.xml.XML_DEFAULT" />
+	  <documentationTextHover class="org.jboss.tools.jst.jsp.jspeditor.info.FaceletTagInfoHoverProcessor" target="org.eclipse.wst.sse.ST_DEFAULT" />
+	  <documentationTextHover class="org.jboss.tools.jst.jsp.jspeditor.info.FaceletTagInfoHoverProcessor" target="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+	  <documentationTextHover class="org.jboss.tools.jst.jsp.jspeditor.info.FaceletTagInfoHoverProcessor" target="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+	  
+	</extension>
+
+   <extension
+         point="org.eclipse.jdt.ui.javaEditorTextHovers">
+      <hover
+            label="%javaStringELHover"
+            description="%javaStringELHoverDescription"
+            class="org.jboss.tools.jst.jsp.jspeditor.info.JavaStringELInfoHover"
+            id="org.jboss.tools.jst.jsp.jspeditor.info.JavaStringELInfoHover"
+            activate="true">
+      </hover>
+	</extension>
+
+	<extension point="org.eclipse.ui.preferencePages">
+		<!-- Additional JSP/HTML PREFERENCE PAGES -->
+		<page
+			name="%JSP_Occurrences.name"
+			category="org.eclipse.jst.jsp.ui.preferences.jsp"
+			class="org.jboss.tools.jst.jsp.preferences.JSPOccurrencesPreferencePage"
+			id="org.eclipse.wst.sse.ui.preferences.jsp.occurrences">
+		</page>
+	</extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <editor
+            icon="$nl$/images/xstudio/editors/jsp.gif"
+            class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor"
+            default="true"
+            name="%editors.jsp.name"
+            contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor"
+            id="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"
+            matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl"
+            extensions="jsp, jspf, jspx, tag, tagf">
+         <contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.jspsource"/>
+         <contentTypeBinding contentTypeId="org.jboss.tools.jst.jsp.jspincludesource"/>
+      </editor>
+      <editor 
+            class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor" 
+            contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor" 
+            extensions="html, htm, jsf, xhtml" 
+            icon="$nl$/images/xstudio/editors/html_file.gif" 
+            id="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor" 
+            matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl"
+            name="%editors.html.name" 
+            default="true">
+         <contentTypeBinding contentTypeId="org.eclipse.wst.html.core.htmlsource"/>
+         <contentTypeBinding contentTypeId="org.jboss.tools.jst.jsp.phpsource"/>
+         <contentTypeBinding contentTypeId="org.eclipse.php.core.phpsource"/>
+         <contentTypeBinding contentTypeId="jsf.facelet"/>
+      </editor>
+      <editor
+      		class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor"
+      		contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor"
+      		icon="$nl$/images/xstudio/editors/xmldoc.gif"
+      		id="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"
+      		name="%editors.docbook.name">
+      		<contentTypeBinding contentTypeId="org.jboss.tools.jst.jsp.editor.docbookFile"/> 
+      </editor>
+   </extension>
+
+   <extension point="org.eclipse.ui.editorActions">
+   <!-- necessary menu items -->
+   <!--<editorContribution id="formatJSPActionContribution" targetID="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
+           <action actionID="formatJSPAction" class="org.jboss.tools.jst.jsp.ui.action.FormatJSPActionDelegate" id="formatJSPAction" label="Format" menubarPath="edit/additions">
+           </action>
+      </editorContribution>
+
+      <editorContribution 
+         id="ARenameElement" 
+         targetID="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
+           <action
+                 actionID="org.eclipse.jst.jsp.ui.refactor.rename"
+                 class="org.eclipse.jst.jsp.ui.internal.java.refactoring.JSPRenameElementActionDelegate"
+                 definitionId="org.eclipse.jst.jsp.ui.refactor.rename"
+                 id="RenameElement"
+                 label="Rename">
+           </action>
+      </editorContribution>
+      <editorContribution 
+         id="AMoveElement" 
+         targetID="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
+           <action
+                 actionID="org.eclipse.jst.jsp.ui.refactor.move"
+                 class="org.eclipse.jst.jsp.ui.internal.java.refactoring.JSPMoveElementActionDelegate"
+                 definitionId="org.eclipse.jst.jsp.ui.refactor.move"
+                 id="MoveElement"
+                 label="Move">
+           </action>
+      </editorContribution>-->
+      
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+         <menuContribution 
+               locationURI="menu:navigate?endof=show.ext">
+               <command label="%Toggle.Selection.Bar"
+                     commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar"
+                     id="org.jboss.tools.jst.jsp.menus.showSelectionBar"
+                     style="toggle"
+                     mnemonic="S">
+                     <visibleWhen
+                           checkEnabled="false">
+                           <with
+                                 variable="activeEditorId">
+                                 <or>
+	                                 <equals
+	                                       value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
+	                                 </equals>
+	                                 <equals
+	                                       value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor">
+	                                 </equals>
+	                                 <equals
+	                                       value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor">
+	                                 </equals>
+                                 </or>
+                           </with>
+                     </visibleWhen>
+               </command>
+         </menuContribution>
+         <menuContribution 
+			locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.source.EditorContext?after=org.jboss.tools.vpe.editor.menu.SetupTemplateContributionItem">
+        	<dynamic
+               class="org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem"
+               id="org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
+        	</dynamic>
+        </menuContribution>
+        <menuContribution
+              locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor.source.EditorContext?after=org.jboss.tools.vpe.editor.menu.SetupTemplateContributionItem">
+        	<dynamic
+               class="org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem"
+               id="org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
+        	</dynamic>
+        </menuContribution>
+         <menuContribution 
+			locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.source.EditorContext?after=org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
+			<command
+         		commandId="org.jboss.tools.jst.jsp.commands.i18" />
+        </menuContribution>
+        <menuContribution
+              locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor.source.EditorContext?after=org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
+              <command
+         		commandId="org.jboss.tools.jst.jsp.commands.i18" />
+        </menuContribution>
+        <menuContribution
+              locationURI="menu:sourceMenuId?after=OccurencesFile">
+              <command label="%Externalize.Selected.Property"
+                    commandId="org.jboss.tools.jst.jsp.commands.i18"
+                    id="org.jboss.tools.jst.jsp.menus.i18"
+                    mnemonic="S">
+                    	<visibleWhen checkEnabled="false">
+							<and>
+								<with variable="activeContexts">
+									<iterate operator="or">
+										<equals value="org.eclipse.wst.sse.ui.structuredTextEditorScope"/>
+									</iterate>
+								</with>
+								<with variable="activeEditorId">
+                            	     <or>
+	                            	     <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor" />
+	                                	 <equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor" />
+		                                 <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor" />
+    	                             </or>
+        	                   </with>
+							</and>
+						</visibleWhen>
+              </command>
+        </menuContribution>
+        <menuContribution
+              locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
+           <toolbar label="%vpe.toolbar.name"
+                 id="org.jboss.tools.jst.jsp.toolbars.sampleToolbar">
+              <command
+                    commandId="org.jboss.tools.jst.jsp.commands.i18"
+                    icon="icons/externalize.png"
+                    id="org.jboss.tools.jst.jsp.toolbars.i18"
+                    tooltip="%Externalize.Selected.Property">
+					 <visibleWhen checkEnabled="false">
+	            		<reference definitionId="org.jboss.tools.ui.vpe.editor"/>
+	            	</visibleWhen>
+              </command>
+              <command
+                     commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar"
+                     icon="icons/selbar.gif"
+                     id="org.jboss.tools.jst.jsp.toolbars.showSelectionBar"
+                     style="toggle"
+                     tooltip="%Toggle.Selection.Bar">
+                     <visibleWhen checkEnabled="false">
+	            		<reference definitionId="org.jboss.tools.ui.vpe.editor"/>
+	            	</visibleWhen>
+               </command>
+           </toolbar>
+        </menuContribution>
+         
+   </extension>
+   
+       <extension
+       point="org.eclipse.ui.handlers">
+       <handler
+             class="org.eclipse.jst.jsp.ui.internal.handlers.JSPFindOccurrencesHandler"
+             commandId="org.eclipse.wst.sse.ui.search.find.occurrences">
+             <activeWhen>
+              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+          </activeWhen>
+          <enabledWhen>
+              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+          </enabledWhen>
+       </handler>
+       <handler
+             class="org.eclipse.wst.html.ui.internal.edit.ui.CleanupDocumentHandler"
+             commandId="org.eclipse.wst.sse.ui.cleanup.document">
+             <activeWhen>
+                    <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+             </activeWhen>
+             <enabledWhen>
+                    <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+             </enabledWhen>
+       </handler>
+              <handler
+             class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectEnclosingXMLHandler"
+             commandId="org.eclipse.wst.sse.ui.structure.select.enclosing">
+          <activeWhen>
+              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+          </activeWhen>
+          <enabledWhen>
+              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+          </enabledWhen>
+       </handler>
+       <handler
+             class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectNextXMLHandler"
+             commandId="org.eclipse.wst.sse.ui.structure.select.next">
+          <activeWhen>
+              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+          </activeWhen>
+          <enabledWhen>
+              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+          </enabledWhen>
+       </handler>
+       <handler
+             class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectPreviousXMLHandler"
+             commandId="org.eclipse.wst.sse.ui.structure.select.previous">
+          <activeWhen>
+              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+          </activeWhen>
+          <enabledWhen>
+              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+          </enabledWhen>
+       </handler>
+       <handler
+             class="org.eclipse.wst.sse.ui.internal.handlers.StructuredSelectHistoryHandler"
+             commandId="org.eclipse.wst.sse.ui.structure.select.last">
+          <activeWhen>
+              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+          </activeWhen>
+          <enabledWhen>
+              <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
+          </enabledWhen>
+       </handler>
+       <handler
+             class="org.jboss.tools.jst.jsp.selection.bar.SelectionBarHandler"
+             commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar">
+       </handler>
+       <handler
+             class="org.jboss.tools.jst.jsp.i18n.handlers.I18nHandler"
+             commandId="org.jboss.tools.jst.jsp.commands.i18">
+       </handler>
+       </extension>
+
+	<extension point="org.eclipse.core.expressions.definitions">
+			<definition id="org.jboss.tools.ui.structuredEditor">
+				<and>
+					<with variable="activeContexts">
+						<iterate operator="or">
+							<equals value="org.eclipse.wst.sse.ui.structuredTextEditorScope"/>
+						</iterate>
+					</with>
+					<or>
+					<with variable="activeEditorId">
+							<equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
+					</with>
+					<with variable="activeEditorId">
+							<equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/>
+					</with>
+					<with variable="activeEditorId">
+							<equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/>
+					</with>
+					</or>
+				</and>			
+			</definition>
+		</extension>
+   <!--extension point="org.jboss.tools.common.verification.rules">
+      <rule-set path="meta/.rule-sets.xml"/>
+   </extension-->
+   
+    <extension point="org.jboss.tools.jst.jsp.occurrenceStructureProviders">
+	  	<provider 
+	  		class="org.jboss.tools.jst.jsp.text.JSPOccurrenceProvider" 
+	  		editorId="org.jboss.tools.jst.jsp" 
+	  		name="%defaultOccurrenceStructureProviderName" /> 
+	</extension>
+
+	<extension point="org.eclipse.core.contenttype.contentTypes"> 
+   	</extension>
+   
+	
+    <extension point="org.eclipse.core.runtime.contentTypes">
+      	<content-type 
+	      	id="org.jboss.tools.jst.jsp.jspincludesource"
+	       	name="%ContentType_JBossToolsINC"
+	       	base-type="org.eclipse.jst.jsp.core.jspsource"
+	       	describer="org.jboss.tools.jst.jsp.jspeditor.JSPIncludeContentDescriber"
+	       	file-extensions="inc"
+	       	priority="high"/>
+      	<content-type 
+	      	id="org.jboss.tools.jst.jsp.phpsource"
+	       	name="%ContentType_JBossPHPSource"
+	       	base-type="org.eclipse.wst.html.core.htmlsource"
+	       	describer="org.jboss.tools.jst.jsp.jspeditor.JSPIncludeContentDescriber"
+	       	file-extensions="php"
+	       	priority="high"/>
+	       	
+       <file-association
+             content-type="org.eclipse.wst.html.core.htmlsource"
+             file-extensions="jsf"/>
+       <content-type id="org.jboss.tools.jst.jsp.editor.docbookFile"
+       		base-type="org.eclipse.core.runtime.xml"
+       		file-extensions="dbk, xml"
+       		priority="normal"
+       		name="Docbook File">
+       	<describer class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber2">
+			<parameter name="element" value="book"/>
+			<parameter name="element" value="chapter"/>
+			<parameter name="element" value="section"/>
+			<parameter name="element" value="part"/>
+			<parameter name="element" value="article"/>
+			<parameter name="element" value="appendix"/>
+       	</describer>
+      </content-type> 
+      
+    </extension>
+   
+   <extension
+         point="org.jboss.tools.common.model.resourceMapping">
+      <mapping
+          loader="org.jboss.tools.jst.jsp"
+          priority="4"
+          kind="class"
+          paths=".texteditors.jsp.,org.jboss.tools.jst.jsp."
+      />
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors.templates">
+      <include
+            file="templates/facelets-templates.xml"
+            translations="$nl$/templates/facelets-templates.properties"/>
+   </extension>
+
+   <extension point="org.jboss.tools.common.model.classes">
+		<xclass id="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"
+			class="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
+		<xclass id="org.jboss.tools.jst.jsp.outline.JSPCellEditorProviderImpl"
+			class="org.jboss.tools.jst.jsp.outline.JSPCellEditorProviderImpl"/>
+		<xclass id="org.jboss.tools.jst.jsp.outline.VpeProperties"
+			class="org.jboss.tools.jst.jsp.outline.VpeProperties"/>
+		<xclass id="org.jboss.tools.jst.jsp.outline.DefaultDropCommandRunner"
+			class="org.jboss.tools.jst.jsp.outline.DefaultDropCommandRunner"/>
+		<xclass id="org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand"
+			class="org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand"/>
+		<xclass id="org.jboss.tools.jst.jsp.jspeditor.dnd.FileDropCommand"
+			class="org.jboss.tools.jst.jsp.jspeditor.dnd.FileDropCommand"/>
+   </extension>
+    
+   <extension 
+		point="org.jboss.tools.common.text.xml.contentAssistProcessor"
+		id="org.jboss.tools.jst.jsp.contentAssistProcessor"
+		name="org.jboss.tools.jst.jsp.contentAssistProcessor">
+
+		<!-- contentAssistProcessor 
+				class="org.jboss.tools.jst.jsp.contentassist.ExtendedJSPContentAssistProcessor" 
+				id="org.jboss.tools.jst.jsp.contentassist.ExtendedJSPContentAssistProcessor">
+			<contenttype id="org.eclipse.jst.jsp.core.jspsource">
+				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitiontype id="org.eclipse.jst.jsp.DEFAULT_JSP" />
+				<partitiontype id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+			</contenttype>
+		</contentAssistProcessor>
+		
+		<contentAssistProcessor 
+				class="org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor" 
+				id="org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor">
+
+			<contenttype id="org.eclipse.wst.html.core.htmlsource">
+				<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" /> 
+			</contenttype>
+		</contentAssistProcessor>
+-->
+		<!-- 
+			//added by estherbin
+			//fix http://jira.jboss.com/jira/browse/JBIDE-1791
+		-->
+		<!-- contentAssistProcessor 
+				class="org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor" 
+				id="org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor">
+			<contenttype id="org.eclipse.wst.html.core.htmlsource">
+				<partitiontype id="org.eclipse.wst.css.STYLE" />
+			</contenttype>
+		</contentAssistProcessor -->
+		
+		<!-- 
+			// Fix for JBIDE-5068 
+		-->
+		<!-- contentAssistProcessor 
+				class="org.eclipse.jst.jsp.ui.internal.contentassist.JSPJavaContentAssistProcessor" 
+				id="org.eclipse.jst.jsp.ui.internal.contentassist.JSPJavaContentAssistProcessor">
+			<contenttype id="org.eclipse.jst.jsp.core.jspsource">
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JAVA" />
+			</contenttype>
+		</contentAssistProcessor -->
+		
+		<!-- This is to be replaced by org.eclipse.wst.sse.ui.completionProposal ext. point -->
+		<!--
+		<contentAssistProcessor 
+				class="org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor" 
+				id="org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor">
+			<contenttype id="org.eclipse.jst.jsp.core.jspsource">
+				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitiontype id="org.eclipse.jst.jsp.DEFAULT_JSP" />
+				<partitiontype id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitiontype id="org.eclipse.wst.css.STYLE" />
+			</contenttype>
+		</contentAssistProcessor>
+			
+		<contentAssistProcessor 
+				class="org.jboss.tools.jst.jsp.contentassist.XmlContentAssistProcessor" 
+				id="org.jboss.tools.jst.jsp.contentassist.XmlContentAssistProcessor">
+			<contenttype id="org.eclipse.wst.xml.core.xmlsource">
+				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitiontype id="org.eclipse.wst.xml.XML_PI" />
+				<partitiontype id="org.eclipse.wst.xml.XML_DECL" />
+				<partitiontype id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitiontype id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitiontype id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contenttype>
+			<contenttype id="org.jboss.tools.seam.xml.ui.pages20xmlsource">
+				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitiontype id="org.eclipse.wst.xml.XML_PI" />
+				<partitiontype id="org.eclipse.wst.xml.XML_DECL" />
+				<partitiontype id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitiontype id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitiontype id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contenttype>
+			<contenttype id="org.eclipse.jst.jsf.facesconfig.facesConfigFile">
+				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitiontype id="org.eclipse.wst.xml.XML_PI" />
+				<partitiontype id="org.eclipse.wst.xml.XML_DECL" />
+				<partitiontype id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitiontype id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitiontype id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contenttype>
+			<contenttype id="org.jboss.tools.common.model.ui.xml">
+				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitiontype id="org.eclipse.wst.xml.XML_PI" />
+				<partitiontype id="org.eclipse.wst.xml.XML_DECL" />
+				<partitiontype id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitiontype id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitiontype id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contenttype>
+			<contenttype id="org.eclipse.jst.jee.ee5webDD">
+				<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitiontype id="org.eclipse.wst.xml.XML_PI" />
+				<partitiontype id="org.eclipse.wst.xml.XML_DECL" />
+				<partitiontype id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitiontype id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitiontype id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitiontype id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contenttype>
+		</contentAssistProcessor>
+
+		<contentAssistProcessor 
+				class="org.jboss.tools.jst.jsp.contentassist.FaceletPageContectAssistProcessor" 
+				id="org.jboss.tools.jst.jsp.contentassist.FaceletPageContectAssistProcessor">
+			<contenttype id="org.eclipse.wst.html.core.htmlsource">
+				<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitiontype id="org.eclipse.wst.css.STYLE" />
+			</contenttype>
+			<contenttype id="jsf.facelet">
+				<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitiontype id="org.eclipse.wst.css.STYLE" />
+			</contenttype>
+		</contentAssistProcessor>
+	-->
+  </extension>
+  <extension
+        point="org.eclipse.ui.commands">
+     <category
+           description="CSSDialog"
+           id="org.jboss.tools.jst.jsp.commands"
+           name="CSS Dialog">
+     </category>
+     <command
+           categoryId="org.jboss.tools.jst.jsp.commands"
+           description="Open active or selected CSS Dialog"
+           id="org.jboss.tools.jst.jsp.commands.openCSSDialog"
+           name="Open CSS Dialog">
+     </command>
+     <category
+           id="org.jboss.tools.jst.jsp.commands.category"
+           name="Visual Page Editor Category">
+     </category>
+     <command
+           categoryId="org.jboss.tools.jst.jsp.commands.category"
+           id="org.jboss.tools.jst.jsp.commands.showSelectionBar"
+           name="Show Selection Bar">
+           <state
+                 class="org.eclipse.ui.handlers.RegistryToggleState:true"
+                 id="org.eclipse.ui.commands.toggleState">
+           </state>
+     </command>
+     <command
+           categoryId="org.jboss.tools.jst.jsp.commands.category"
+           id="org.jboss.tools.jst.jsp.commands.i18"
+           name="%Externalize.Selected.Property">
+     </command>
+  </extension>
+  <extension
+        point="org.eclipse.ui.bindings">
+     <key
+           commandId="org.jboss.tools.jst.jsp.commands.openCSSDialog"
+           contextId="org.eclipse.wst.css.core.csssource"
+           schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+           sequence="Ctrl+Shift+C">
+     </key>
+     <key
+           commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar"
+           contextId="org.eclipse.ui.contexts.window"
+           schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+           sequence="M1+6">
+     </key>
+     <key
+           commandId="org.jboss.tools.jst.jsp.commands.i18"
+           contextId="org.eclipse.ui.contexts.window"
+           schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+           sequence="M1+7">
+     </key>
+  </extension>
+  
+   <extension
+         point="org.eclipse.core.runtime.preferences">
+               <initializer class="org.jboss.tools.jst.jsp.preferences.VpePreferencesInitializer"/>
+   </extension>
+   
+    <extension
+       point="org.eclipse.wst.sse.ui.completionProposal">
+    <proposalCategory
+          icon="images/ca/icons_JSF_EL.gif"
+          id="org.jboss.tools.jst.jsp.proposalCategory.xmlEL"
+          name="%proposalCategory.xmlEL">
+    </proposalCategory>
+    <proposalComputer
+          activate="false"
+          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlEL"
+          class="org.jboss.tools.jst.jsp.contentassist.computers.XmlELCompletionProposalComputer"
+          id="org.jboss.tools.jst.jsp.proposalComputer.xmlEL">
+          	<contentType id="org.eclipse.core.runtime.xml">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitionType id="org.eclipse.wst.xml.XML_PI" />
+				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
+				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contentType>
+			<contentType id="org.eclipse.wst.xml.core.xmlsource">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitionType id="org.eclipse.wst.xml.XML_PI" />
+				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
+				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contentType>
+			<contentType id="org.jboss.tools.seam.xml.ui.pages20xmlsource">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitionType id="org.eclipse.wst.xml.XML_PI" />
+				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
+				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contentType>
+			<contentType id="org.eclipse.jst.jsf.facesconfig.facesConfigFile">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitionType id="org.eclipse.wst.xml.XML_PI" />
+				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
+				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contentType>
+			<contentType id="org.jboss.tools.common.model.ui.xml">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitionType id="org.eclipse.wst.xml.XML_PI" />
+				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
+				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contentType>
+			<contentType id="org.eclipse.jst.jee.ee5webDD">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitionType id="org.eclipse.wst.xml.XML_PI" />
+				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
+				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contentType>
+    </proposalComputer>
+    <proposalComputer
+          activate="false"
+          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlEL"
+          class="org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer"
+          id="org.jboss.tools.jst.jsp.proposalComputer.jspEL">
+			<contentType id="org.eclipse.jst.jsp.core.jspsource">
+          		<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+          		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+          		<partitionType id="org.eclipse.jst.jsp.DEFAULT_JSP" />
+          		<partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+          		<partitionType id="org.eclipse.wst.css.STYLE" />
+       		</contentType>
+			<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+          		<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+          		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+          		<partitionType id="org.eclipse.jst.jsp.DEFAULT_JSP" />
+          		<partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+          		<partitionType id="org.eclipse.wst.css.STYLE" />
+       		</contentType>
+    </proposalComputer>
+    <proposalComputer
+          activate="false"
+          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlEL"
+          class="org.jboss.tools.jst.jsp.contentassist.computers.FaceletsELCompletionProposalComputer"
+          id="org.jboss.tools.jst.jsp.proposalComputer.xhtmlEL">
+			<contentType id="org.eclipse.wst.html.core.htmlsource">
+				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitionType id="org.eclipse.wst.css.STYLE" />
+				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
+       		</contentType>
+       		<contentType id="org.jboss.tools.jst.jsp.phpsource">
+				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitionType id="org.eclipse.wst.css.STYLE" />
+				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
+       		</contentType>
+			<contentType id="org.eclipse.php.core.phpsource">
+				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitionType id="org.eclipse.wst.css.STYLE" />
+				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
+			</contentType>
+       		<contentType id="jsf.facelet">
+				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitionType id="org.eclipse.wst.css.STYLE" />
+				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
+			</contentType>
+			<contentType id="jsf.facelet.composite">
+				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitionType id="org.eclipse.wst.css.STYLE" />
+				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
+			</contentType>
+			
+    </proposalComputer>
+
+    <proposalCategory
+          icon="images/ca/icons_JSF_EL.gif"
+          id="org.jboss.tools.jst.jsp.proposalCategory.xmlTag"
+          name="%proposalCategory.xmlTag">
+    </proposalCategory>
+    <proposalComputer
+          activate="false"
+          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlTag"
+          class="org.jboss.tools.jst.jsp.contentassist.computers.XmlTagCompletionProposalComputer"
+          id="org.jboss.tools.jst.jsp.proposalComputer.xmlTag">
+			<contentType id="org.eclipse.wst.xml.core.xmlsource">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitionType id="org.eclipse.wst.xml.XML_PI" />
+				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
+				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contentType>
+			<contentType id="org.jboss.tools.seam.xml.ui.pages20xmlsource">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitionType id="org.eclipse.wst.xml.XML_PI" />
+				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
+				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contentType>
+			<contentType id="org.eclipse.jst.jsf.facesconfig.facesConfigFile">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitionType id="org.eclipse.wst.xml.XML_PI" />
+				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
+				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contentType>
+			<contentType id="org.jboss.tools.common.model.ui.xml">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitionType id="org.eclipse.wst.xml.XML_PI" />
+				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
+				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contentType>
+			<contentType id="org.eclipse.jst.jee.ee5webDD">
+				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+				<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+				<partitionType id="org.eclipse.wst.xml.XML_PI" />
+				<partitionType id="org.eclipse.wst.xml.XML_DECL" />
+				<partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+				<partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+				<partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+			</contentType>
+    </proposalComputer>
+    <proposalComputer
+          activate="false"
+          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlTag"
+          class="org.jboss.tools.jst.jsp.contentassist.computers.JspTagCompletionProposalComputer"
+          id="org.jboss.tools.jst.jsp.proposalComputer.jspTag">
+			<contentType id="org.eclipse.jst.jsp.core.jspsource">
+          		<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+          		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+          		<partitionType id="org.eclipse.jst.jsp.DEFAULT_JSP" />
+          		<partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+          		<partitionType id="org.eclipse.wst.css.STYLE" />
+       		</contentType>
+       		<contentType id="org.jboss.tools.jst.jsp.jspincludesource">
+          		<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+          		<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+          		<partitionType id="org.eclipse.jst.jsp.DEFAULT_JSP" />
+          		<partitionType id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+          		<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+          		<partitionType id="org.eclipse.wst.css.STYLE" />
+       		</contentType>
+    </proposalComputer>
+    <proposalComputer
+          activate="false"
+          categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlTag"
+          class="org.jboss.tools.jst.jsp.contentassist.computers.FaceletsTagCompletionProposalComputer"
+          id="org.jboss.tools.jst.jsp.proposalComputer.xhtmltag">
+			<contentType id="org.eclipse.wst.html.core.htmlsource">
+				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitionType id="org.eclipse.wst.css.STYLE" />
+       		</contentType>
+       		<contentType id="jsf.facelet">
+				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitionType id="org.eclipse.wst.css.STYLE" />
+			</contentType>
+			<contentType id="jsf.facelet.composite">
+				<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+				<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+				<partitionType id="org.eclipse.wst.css.STYLE" />
+			</contentType>
+    </proposalComputer>
+   </extension>
+    <extension
+          point="org.eclipse.ui.contexts">
+       <context
+             description="Context to allow activate and deactivate selection bar"
+             id="org.jboss.tools.jst.jsp.selectionBar.context"
+             name="Selection Bar"
+             parentId="org.eclipse.ui.contexts.window">
+       </context>
+    </extension>
+   <extension point="org.eclipse.core.expressions.definitions">
+		<definition id="org.eclipse.wst.jsp.ui.jspSourceContributions.definition">
+            <with variable="activeContexts">
+	           <iterate operator="or">
+	              <equals value="org.eclipse.jst.jsp.core.jspsource"/>
+	           </iterate>
+            </with>
+		</definition>
+	</extension>
+	
+	<extension point="org.eclipse.ui.menus">
+	    <menuContribution locationURI="menu:refactorMenuId">
+	       <separator name="jspRefactorBegin" visible="false"></separator>
+	       <command commandId="org.eclipse.jst.jsp.ui.refactor.rename" id="RenameElement" label="%command.jsp.refactor.rename.name" style="push">
+			   <visibleWhen checkEnabled="false">
+					<reference definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition"></reference>
+				</visibleWhen>
+	       </command>
+	       <command commandId="org.eclipse.jst.jsp.ui.refactor.move" id="MoveElement" label="%command.jsp.refactor.move.name" style="push">
+			   <visibleWhen checkEnabled="false">
+					<reference definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition"></reference>
+				</visibleWhen>
+	       </command>
+	       <separator name="jspRefactorBegin" visible="false"></separator>
+		</menuContribution>
+	</extension>
+</plugin>

Copied: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin_ja.properties (from rev 39736, workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/plugin_ja.properties)
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin_ja.properties	                        (rev 0)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/plugin_ja.properties	2012-03-21 18:50:58 UTC (rev 39737)
@@ -0,0 +1,8 @@
+providerName=JBoss by Red Hat
+jsp.page.name=JSP \u69CB\u6587\u306E\u8272
+editors.jsp.name=JBoss Tools JSP \u30A8\u30C7\u30A3\u30BF\u30FC
+editors.html.name=JBoss Tools HTML \u30A8\u30C7\u30A3\u30BF\u30FC
+JSP_Occurrences.name=JSP \u30AA\u30AB\u30EC\u30F3\u30B9
+occurrenceStructureProvidersExtensionPoint=\u30AA\u30AB\u30EC\u30F3\u30B9\u69CB\u9020\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC
+defaultOccurrenceStructureProviderName=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30AA\u30AB\u30EC\u30F3\u30B9\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC
+Bundle-Name.0=JSP \u30A8\u30C7\u30A3\u30BF\u30FC\u30FB\u30D7\u30E9\u30B0\u30A4\u30F3

Copied: workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/pom.xml (from rev 39736, workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/org.jboss.tools.jst.jsp/pom.xml)
===================================================================
--- workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/pom.xml	                        (rev 0)
+++ workspace/dazarov/branches/jbosstools-3.4.x/jst/plugins/org.jboss.tools.jst.jsp/pom.xml	2012-03-21 18:50:58 UTC (rev 39737)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion> 
+	<parent>
+		<groupId>org.jboss.tools.jst</groupId>
+		<artifactId>plugins</artifactId>
+		<version>3.3.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.jboss.tools.jst.plugins</groupId>
+	<artifactId>org.jboss.tools.jst.jsp</artifactId> 
+	
+	<packaging>eclipse-plugin</packaging>
+</project>



More information about the jbosstools-commits mailing list