JBIDE-16019 Reorganize JST component

jbosstools · Nov 25, 2013 · 7331485 · 7331485
1 parent c16133a
commit 7331485
Show file tree

Hide file tree

Showing 196 changed files with 597 additions and 257 deletions.
diff --git a/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/META-INF/MANIFEST.MF b/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.jboss.tools.cdi.text.ext,
  org.jboss.tools.cdi.seam.config.core,
  org.jboss.tools.cdi.seam.solder.core,
- org.jboss.tools.jst.text.ext,
+ org.jboss.tools.jst.web.ui,
  org.jboss.tools.jst.web;bundle-version="3.2.0"
 Bundle-Version: 1.6.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/....text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/SeamConfigTagNameHyperlink.java b/....text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/SeamConfigTagNameHyperlink.java
@@ -38,7 +38,7 @@
 import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

diff --git a/...xt/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/XMLInjectedPointHyperlinkDetector.java b/...xt/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/XMLInjectedPointHyperlinkDetector.java
@@ -39,7 +39,7 @@
 import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 

diff --git a/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF b/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.jboss.tools.jst.web.ui,
  org.eclipse.core.expressions;bundle-version="3.4.200",
  org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
- org.jboss.tools.jst.jsp,
+ org.jboss.tools.jst.web.ui,
  org.eclipse.wst.common.project.facet.ui;bundle-version="1.4.200",
  org.eclipse.debug.ui;bundle-version="3.7.0",
  org.eclipse.ui.navigator;bundle-version="3.5.0",

diff --git a/....jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java b/....jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java
@@ -28,8 +28,8 @@
 import org.jboss.tools.common.el.core.resolver.ELContext;
 import org.jboss.tools.common.text.TextProposal;
 import org.jboss.tools.common.ui.CommonUIPlugin;
-import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
-import org.jboss.tools.jst.jsp.contentassist.computers.XmlTagCompletionProposalComputer;
+import org.jboss.tools.jst.web.ui.internal.editor.contentassist.AutoContentAssistantProposal;
+import org.jboss.tools.jst.web.ui.internal.editor.contentassist.computers.XmlTagCompletionProposalComputer;
 import org.jboss.tools.jst.web.kb.KbQuery;
 import org.jboss.tools.jst.web.kb.KbQuery.Type;
 import org.w3c.dom.Element;

diff --git a/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.deltaspike.core.test/META-INF/MANIFEST.MF
@@ -22,10 +22,9 @@ Require-Bundle: org.jboss.tools.cdi.seam.core,
  org.eclipse.jface.text;bundle-version="3.7.0",
  org.jboss.tools.common.el.core,
  org.jboss.tools.common.text.ext,
- org.jboss.tools.jst.text.ext,
  org.jboss.tools.jst.text.ext.test,
  org.jboss.tools.cdi.seam.solder.core.test,
  org.eclipse.wst.validation;bundle-version="1.2.300",
- org.jboss.tools.jst.jsp
+ org.jboss.tools.jst.web.ui
 Export-Package: org.jboss.tools.cdi.deltaspike.core.test
 Eclipse-BundleShape: dir
diff --git a/cdi/tests/org.jboss.tools.cdi.extension.core.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.extension.core.test/META-INF/MANIFEST.MF
@@ -21,9 +21,8 @@ Require-Bundle: org.eclipse.jdt.core,
  org.eclipse.jface.text;bundle-version="3.7.0",
  org.jboss.tools.common.el.core,
  org.jboss.tools.common.text.ext,
- org.jboss.tools.jst.text.ext,
  org.jboss.tools.jst.text.ext.test,
  org.eclipse.wst.validation;bundle-version="1.2.300",
- org.jboss.tools.jst.jsp
+ org.jboss.tools.jst.web.ui
 Export-Package: org.jboss.tools.cdi.extension.core.test
 Eclipse-BundleShape: dir
diff --git a/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF
@@ -21,10 +21,9 @@ Require-Bundle: org.jboss.tools.cdi.seam.core,
  org.eclipse.jface.text;bundle-version="3.7.0",
  org.jboss.tools.common.el.core,
  org.jboss.tools.common.text.ext,
- org.jboss.tools.jst.text.ext,
  org.jboss.tools.jst.text.ext.test,
  org.jboss.tools.cdi.seam.solder.core.test,
  org.eclipse.wst.validation;bundle-version="1.2.300",
- org.jboss.tools.jst.jsp
+ org.jboss.tools.jst.web.ui
 Export-Package: org.jboss.tools.cdi.seam.core.test
 Eclipse-BundleShape: dir
diff --git a/...test/src/org/jboss/tools/cdi/seam/core/test/international/CACdiAddInfoELMessagesTest.java b/...test/src/org/jboss/tools/cdi/seam/core/test/international/CACdiAddInfoELMessagesTest.java
@@ -17,7 +17,7 @@
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.jboss.tools.cdi.seam.core.test.SeamCoreTest;
 import org.jboss.tools.common.base.test.contentassist.CATestUtil;
-import org.jboss.tools.jst.jsp.contentassist.AutoELContentAssistantProposal;
+import org.jboss.tools.jst.web.ui.internal.editor.contentassist.AutoELContentAssistantProposal;
 import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
 
 /**
@@ -34,8 +34,8 @@ public class CACdiAddInfoELMessagesTest extends SeamCoreTest {
 	private static final String PREFIXES[] = new String[] {"#{bundles.messa", "#{bundles.messages.home_hea"};
 	private static final String NAMES[] = new String[] {"bundles.messages", "home_header"};
 	private static final String ADD_INFOS[] = new String[] {
-			"<html><body text=\"#000000\" bgcolor=\"#ffffe1\"><br><b>Resource Bundle:</b> /SeamCoreTest/src/messages.properties<br><br><b>Resource Bundle:</b> /SeamCoreTest/src/messages_de.properties</body></html>",
-			"<html><body text=\'#ffffff\" bgcolor=\"#000000\"><b>Property:</b> home_header<br><b>Base Name:</b> messages<br><br><b>Resource Bundle:</b> /SeamCoreTest/src/messages.properties<br><b>Value:</b> About this example application</body></html>"
+			"/SeamCoreTest/src/messages.properties",
+			"home_header"
 		};
 
 	/**
@@ -57,7 +57,7 @@ public void testCACdiAddInfoELMessagesTest() throws Exception {
 
 					String addInfoValue = html2Text(addInfo);
 					String compareValue = html2Text(ADD_INFOS[i]);
-					assertTrue("Additional Info exists but its value is not expected:\nAdd. Info: [" + addInfoValue + "]\nExpected Value: [" + compareValue + "]", compareValue.equalsIgnoreCase(addInfoValue));
+					assertTrue("Additional Info exists but its value is not expected:\nAdd. Info: [" + addInfoValue + "]\nExpected Value: [" + compareValue + "]", addInfoValue.indexOf(compareValue)>-1);
 					proposalFound = true;
 					break;
 				}

diff --git a/...org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundleCdiElResolverTest.java b/...org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundleCdiElResolverTest.java
@@ -22,7 +22,7 @@
 import org.jboss.tools.common.el.core.resolver.ELResolver;
 import org.jboss.tools.common.el.core.resolver.ELSegment;
 import org.jboss.tools.common.text.TextProposal;
-import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlinkDetector;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.ELHyperlinkDetector;
 import org.jboss.tools.jst.web.kb.PageContextFactory;
 
 /**

diff --git a/...re.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java b/...re.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java
@@ -23,8 +23,8 @@
 import org.jboss.tools.common.text.TextProposal;
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
-import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlink;
-import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlinkDetector;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.ELHyperlink;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.ELHyperlinkDetector;
 import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil;
 import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestHyperlink;
 import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestRegion;

diff --git a/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.junit,
  org.eclipse.wst.validation,
  org.jboss.tools.common.base.test,
  org.jboss.tools.cdi.seam.core.test,
- org.jboss.tools.jst.text.ext
+ org.jboss.tools.jst.web.ui
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor.0
 Export-Package: org.jboss.tools.cdi.seam.text.ext.test

diff --git a/....ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamResourceBundleHyperlinkTest.java b/....ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamResourceBundleHyperlinkTest.java
@@ -15,7 +15,7 @@
 import org.eclipse.jface.text.hyperlink.IHyperlink;
 import org.jboss.tools.cdi.seam.core.test.SeamCoreTest;
 import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil;
-import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlink;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.ELHyperlink;
 
 /**
  * The JUnit test cases for JBIDE-9288 issue 

diff --git a/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
@@ -21,9 +21,8 @@ Require-Bundle: org.junit;bundle-version="3.8.2",
  org.jboss.tools.common.el.core,
  org.jboss.tools.jst.web.ui,
  org.eclipse.wst.validation;bundle-version="1.2.300",
- org.jboss.tools.jst.jsp,
  org.jboss.tools.jst.web,
- org.jboss.tools.jst.text.ext
+ org.jboss.tools.jst.web.ui
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor.0
 Export-Package: org.jboss.tools.cdi.text.ext.test

diff --git a/...s.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java b/...s.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java
@@ -58,9 +58,9 @@
 import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
 import org.jboss.tools.common.text.ext.util.AxisUtil;
 import org.jboss.tools.common.util.FileUtil;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart;
-import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlinkDetector;
+import org.jboss.tools.jst.web.ui.internal.editor.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.web.ui.internal.editor.jspeditor.JSPMultiPageEditorPart;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.ELHyperlinkDetector;
 import org.jboss.tools.jst.web.ui.editors.WebCompoundEditor;
 
 public class CDIHyperlinkTestUtil extends TestCase{

diff --git a/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
@@ -31,7 +31,7 @@ Require-Bundle: org.junit,
  org.eclipse.wst.validation,
  org.jboss.tools.jst.web.kb.test,
  org.jboss.tools.common.validation,
- org.jboss.tools.jst.jsp,
+ org.jboss.tools.jst.web.ui,
  org.eclipse.ltk.ui.refactoring,
  org.eclipse.wst.web.ui,
  org.eclipse.wst.common.project.facet.core,

diff --git a/...rg.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CAELProposalFilteringTest.java b/...rg.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CAELProposalFilteringTest.java
@@ -17,7 +17,7 @@
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.jboss.tools.cdi.core.test.tck.TCKTest;
 import org.jboss.tools.common.base.test.contentassist.CATestUtil;
-import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
+import org.jboss.tools.jst.web.ui.internal.editor.contentassist.AutoContentAssistantProposal;
 import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
 
 /**

diff --git a/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF b/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle:
  org.eclipse.core.resources,org.eclipse.jface.text,
  org.jboss.tools.common,
  org.jboss.tools.common.text.ext,
- org.jboss.tools.jst.text.ext,
+ org.jboss.tools.jst.web.ui,
  org.jboss.tools.jsf.text.ext
 Export-Package: org.jboss.tools.jsf.text.ext.facelets,
  org.jboss.tools.jsf.text.ext.facelets.hyperlink

diff --git a/...celets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlink.java b/...celets/src/org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlink.java
@@ -14,7 +14,7 @@
 import java.text.MessageFormat;
 
 import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
-import org.jboss.tools.jst.text.ext.hyperlink.CSSClassHyperlink;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.CSSClassHyperlink;
 
 /**
  * 

diff --git a/...org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlinkPartitioner.java b/...org/jboss/tools/jsf/text/ext/facelets/hyperlink/FaceletsCSSClassHyperlinkPartitioner.java
@@ -13,7 +13,7 @@
 
 import org.eclipse.jface.text.IDocument;
 import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
-import org.jboss.tools.jst.text.ext.hyperlink.CSSClassHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.CSSClassHyperlinkPartitioner;
 
 /**
  * 

diff --git a/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/META-INF/MANIFEST.MF b/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle:
  org.eclipse.ui,
  org.eclipse.jface.text,
  org.jboss.tools.common.text.ext,
- org.jboss.tools.jst.text.ext,
+ org.jboss.tools.jst.web.ui,
  org.jboss.tools.jsf.text.ext,
  org.jboss.tools.jst.web,
  org.jboss.tools.jst.web.kb,

diff --git a/...ss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesJSPLoadBundleHyperlinkPartitioner.java b/...ss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesJSPLoadBundleHyperlinkPartitioner.java
@@ -14,7 +14,7 @@
 import java.util.ArrayList;
 
 import org.eclipse.jface.text.IDocument;
-import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper;
+import org.jboss.tools.jst.web.ui.internal.text.ext.util.TaglibManagerWrapper;
 import org.jboss.tools.jsf.text.ext.hyperlink.JSPLoadBundleHyperlinkPartitioner;
 
 /**

diff --git a/...es/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesLoadBundleHyperlink.java b/...es/src/org/jboss/tools/jsf/text/ext/richfaces/hyperlink/RichfacesLoadBundleHyperlink.java
@@ -15,7 +15,7 @@
 
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.ui.IEditorPart;
-import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper;
+import org.jboss.tools.jst.web.ui.internal.text.ext.util.TaglibManagerWrapper;
 import org.jboss.tools.jsf.text.ext.hyperlink.LoadBundleHyperlink;
 import org.jboss.tools.jsf.text.ext.richfaces.RichfacesExtensionsPlugin;
 import org.jboss.tools.jst.web.tld.TaglibData;

diff --git a/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF b/jsf/plugins/org.jboss.tools.jsf.text.ext/META-INF/MANIFEST.MF
@@ -10,11 +10,10 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
  org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.jface.text;bundle-version="3.7.0",
  org.jboss.tools.common.text.ext,
- org.jboss.tools.jst.text.ext,
  org.jboss.tools.jsf,
  org.jboss.tools.common.el.core,
  org.eclipse.jdt.ui;bundle-version="3.7.0",
- org.jboss.tools.jst.jsp;bundle-version="3.3.0",
+ org.jboss.tools.jst.web.ui,
  org.jboss.tools.common.model.ui;bundle-version="3.3.0"
 Export-Package: org.jboss.tools.jsf.text.ext,
  org.jboss.tools.jsf.text.ext.hyperlink

diff --git a/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml b/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
@@ -602,7 +602,7 @@
 
 		<hyperlinkPartitioner 
          	id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPClassHyperlinkPartitioner"
-         	class="org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPClassHyperlinkPartitioner">
+         	class="org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPClassHyperlinkPartitioner">
          	<contentType id="org.eclipse.jst.jsp.core.jspsource">
          		<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
          			<axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />

diff --git a/...f.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSFJSPLinkHyperlinkPartitioner.java b/...f.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSFJSPLinkHyperlinkPartitioner.java
@@ -18,7 +18,7 @@
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.jsf.project.JSFNature;
 import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPLinkHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPLinkHyperlinkPartitioner;
 
 public class JSFJSPLinkHyperlinkPartitioner extends JSPLinkHyperlinkPartitioner {
 	public static final String JSF_JSP_LINK_PARTITION = "org.jboss.tools.common.text.ext.jsp.JSF_JSP_LINK"; //$NON-NLS-1$

diff --git a/...text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPConverterHyperlinkPartitioner.java b/...text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPConverterHyperlinkPartitioner.java
@@ -18,7 +18,7 @@
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

diff --git a/...jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPForIDHyperlinkPartitioner.java b/...jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPForIDHyperlinkPartitioner.java
@@ -18,7 +18,7 @@
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

diff --git a/...f.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPForwardHyperlinkPartitioner.java b/...f.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPForwardHyperlinkPartitioner.java
@@ -18,8 +18,8 @@
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
-import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.util.TaglibManagerWrapper;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

diff --git a/...ext.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPLoadBundleHyperlinkPartitioner.java b/...ext.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPLoadBundleHyperlinkPartitioner.java
@@ -19,8 +19,8 @@
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
-import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.util.TaglibManagerWrapper;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

diff --git a/...ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPNavigationCaseHyperlinkPartitioner.java b/...ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPNavigationCaseHyperlinkPartitioner.java
@@ -18,7 +18,7 @@
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

diff --git a/...text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java b/...text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java
@@ -20,7 +20,7 @@
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

diff --git a/....jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java b/....jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java
@@ -21,7 +21,7 @@
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.text.ext.JSFTextExtMessages;
-import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper;
+import org.jboss.tools.jst.web.ui.internal.text.ext.util.TaglibManagerWrapper;
 import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;

diff --git a/...xt/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlinkPartitioner.java b/...xt/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlinkPartitioner.java
@@ -26,7 +26,7 @@
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.project.JSFNature;
 import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

diff --git a/...tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java b/...tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java
@@ -26,7 +26,7 @@
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.text.ext.JSFTextExtMessages;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
 import org.jboss.tools.jst.web.kb.KbProjectFactory;
 import org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent;
 import org.jboss.tools.jst.web.kb.taglib.IComponent;

diff --git a/...f.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java b/...f.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java
@@ -28,8 +28,8 @@
 import org.jboss.tools.common.model.XModelObject;
 import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
 import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.JSPStructuredTextViewer;
-import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper;
+import org.jboss.tools.jst.web.ui.internal.editor.jspeditor.JSPTextEditor.JSPStructuredTextViewer;
+import org.jboss.tools.jst.web.ui.internal.text.ext.util.TaglibManagerWrapper;
 import org.jboss.tools.jst.web.kb.IPageContext;
 import org.jboss.tools.jst.web.kb.KbQuery;
 import org.jboss.tools.jst.web.kb.PageContextFactory;

diff --git a/...ext.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkPartitioner.java b/...ext.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkPartitioner.java
@@ -26,7 +26,7 @@
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.project.JSFNature;
 import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 

diff --git a/....text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlinkPartitioner.java b/....text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlinkPartitioner.java
@@ -23,7 +23,7 @@
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.project.JSFNature;
 import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPTagAttributeValueHyperlinkPartitioner;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

diff --git a/...xt/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlinkPartitioner.java b/...xt/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlinkPartitioner.java
@@ -21,7 +21,7 @@
 import org.jboss.tools.common.text.ext.util.Utils;
 import org.jboss.tools.jsf.project.JSFNature;
 import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPTagAttributeValueHyperlinkPartitioner;
+import org.jboss.tools.jst.web.ui.internal.text.ext.hyperlink.jsp.JSPTagAttributeValueHyperlinkPartitioner;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;