[jbosstools-commits] JBoss Tools SVN: r2725 - in trunk: jsf/plugins/org.jboss.tools.jsf.text.ext and 1 other directories.

Author: vrubezhny Date: 2007-07-30 12:03:12 -0400 (Mon, 30 Jul 2007) New Revision: 2725 Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml Log: http://jira.jboss.org/jira/browse/JBIDE-574 OpenOn don't work in JSF and Struts web.xml Issue is fixed. Web.xml related OpenOn definitions are added for new content type "org.eclipse.jst.j2ee.webDD". Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2007-07-30 15:52:16 UTC (rev 2724) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2007-07-30 16:03:12 UTC (rev 2725) @@ -23,6 +23,9 @@ <contentType id="org.eclipse.wst.xml.core.xmlsource"> <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/> </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/> + </contentType> <contentType id="org.eclipse.core.runtime.xml"> <partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/> </contentType> @@ -51,12 +54,15 @@ <contentType id="org.eclipse.jst.jsp.core.tldsource"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> </contentType> - <contentType id="org.eclipse.wst.xml.core.xmlsource"> + <contentType id="org.eclipse.wst.xml.core.xmlsource"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> - </contentType> - <contentType id="org.eclipse.core.runtime.xml"> + </contentType> + <contentType id="org.eclipse.core.runtime.xml"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> - </contentType> + </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -68,12 +74,15 @@ <contentType id="org.eclipse.jst.jsp.core.tldsource"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> </contentType> - <contentType id="org.eclipse.wst.xml.core.xmlsource"> + <contentType id="org.eclipse.wst.xml.core.xmlsource"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> - </contentType> - <contentType id="org.eclipse.core.runtime.xml"> + </contentType> + <contentType id="org.eclipse.core.runtime.xml"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> - </contentType> + </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -85,12 +94,15 @@ <contentType id="org.eclipse.jst.jsp.core.tldsource"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> </contentType> - <contentType id="org.eclipse.wst.xml.core.xmlsource"> + <contentType id="org.eclipse.wst.xml.core.xmlsource"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> - </contentType> - <contentType id="org.eclipse.core.runtime.xml"> + </contentType> + <contentType id="org.eclipse.core.runtime.xml"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> - </contentType> + </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ROOT" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -100,14 +112,17 @@ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> </contentType> <contentType id="org.eclipse.jst.jsp.core.tldsource"> - <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> </contentType> - <contentType id="org.eclipse.wst.xml.core.xmlsource"> - <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> - </contentType> - <contentType id="org.eclipse.core.runtime.xml"> - <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> - </contentType> + <contentType id="org.eclipse.wst.xml.core.xmlsource"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> + </contentType> + <contentType id="org.eclipse.core.runtime.xml"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> + </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -119,35 +134,42 @@ <contentType id="org.eclipse.jst.jsp.core.tldsource"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> </contentType> - <contentType id="org.eclipse.wst.xml.core.xmlsource"> - <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> - </contentType> - <contentType id="org.eclipse.core.runtime.xml"> - <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> - </contentType> + <contentType id="org.eclipse.wst.xml.core.xmlsource"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> + </contentType> + <contentType id="org.eclipse.core.runtime.xml"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> + </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner class="org.jboss.tools.common.text.ext.hyperlink.xml.XMLXmlNsHyperlinkPartitioner" id="org.jboss.tools.common.text.ext.hyperlink.xml.XMLXmlNsHyperlinkPartitioner"> - <contentType id="org.eclipse.wst.xml.core.xmlsource"> - <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <contentType id="org.eclipse.wst.xml.core.xmlsource"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> <!-- <axis path="*/xmlns/"/> <axis path="*/xmlns:*/"/> <axis path="*:schemaLocation/"/> --> - </partitionType> - </contentType> - <contentType id="org.eclipse.core.runtime.xml"> - <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + </partitionType> + </contentType> + <contentType id="org.eclipse.core.runtime.xml"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> <!-- <axis path="*/xmlns/"/> <axis path="*/xmlns:*/"/> <axis path="*:schemaLocation/"/> --> - </partitionType> - </contentType> + </partitionType> + </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + </partitionType> + </contentType> </hyperlinkPartitioner> <!-- End of Common XML hyperlink partitioners --> @@ -382,6 +404,18 @@ <!-- TLD Files --> </partitionType> </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT"> + <!-- Web.xml --> + <axis path="/web-app/env-entry/env-entry-type/" /> + <axis path="/web-app/error-page/exception-type/" /> + <axis path="/web-app/filter/filter-class/" /> + <axis path="/web-app/servlet/servlet-class/" /> + <axis path="/web-app/listener/listener-class/" /> + <axis path="/web-app/resource-env-ref/resource-env-ref-type/" /> + <!-- Web.xml --> + </partitionType> + </contentType> </hyperlinkPartitioner> <!-- End of Web.xml and/or TLD files hyperlink partitioners --> @@ -399,6 +433,11 @@ <axis path="/web-app/filter-mapping/filter-name/" /> </partitionType> </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT"> + <axis path="/web-app/filter-mapping/filter-name/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -416,6 +455,12 @@ <axis path="/web-app/servlet-mapping/servlet-name/" /> </partitionType> </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT"> + <axis path="/web-app/filter-mapping/servlet-name/" /> + <axis path="/web-app/servlet-mapping/servlet-name/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -435,6 +480,13 @@ <axis path="/web-app/security-constraint/auth-constraint/role-name/" /> </partitionType> </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT"> + <axis path="/web-app/servlet/security-role-ref/role-link/" /> + <axis path="/web-app/servlet/run-as/role-name/" /> + <axis path="/web-app/security-constraint/auth-constraint/role-name/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <!-- End of Web.xml file hyperlink partitioners --> @@ -481,6 +533,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_DOCTYPE" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_DOCTYPE" /> + </contenttypeidentifier> </hyperlink> @@ -554,6 +609,9 @@ <contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource"> <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CLASS" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CLASS" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -579,6 +637,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_XMLNS" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_XMLNS" /> + </contenttypeidentifier> </hyperlink> <!-- Web.inf File --> @@ -592,6 +653,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_FILTER_NAME" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_FILTER_NAME" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -603,6 +667,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_ROLE_NAME" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_ROLE_NAME" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -614,6 +681,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_SERVLET_NAME" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_SERVLET_NAME" /> + </contenttypeidentifier> </hyperlink> <!-- Web.inf File --> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2007-07-30 15:52:16 UTC (rev 2724) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2007-07-30 16:03:12 UTC (rev 2725) @@ -68,6 +68,23 @@ <axis path="*/web-app/*" /> </partitionType> </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT"> + <!-- Web.xml --> + <axis path="/web-app/error-page/location/" /> + <axis path="/web-app/login-config/form-login-config/form-error-page/" /> + <axis path="/web-app/login-config/form-login-config/form-login-page/" /> + <axis path="/web-app/servlet/jsp-file/" /> + <axis path="/web-app/error-page/location/" /> + <axis path="/web-app/*/icon/large-icon/" /> + <axis path="/web-app/*/icon/small-icon/" /> + <axis path="/web-app/taglib/taglib-location/" /> + <axis path="/web-app/error-page/location/" /> + <axis path="/web-app/error-page/location/" /> + <axis path="/web-app/error-page/location/" /> + <!-- Web.xml --> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -83,6 +100,11 @@ <axis path="/web-app/context-param/param-value/" /> </partitionType> </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT"> + <axis path="/web-app/context-param/param-value/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -866,6 +888,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.JSF_XML_CONTEXT_PARAM_LINK" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.JSF_XML_CONTEXT_PARAM_LINK" /> + </contenttypeidentifier> </hyperlink> <!-- Web.inf File --> @@ -881,6 +906,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.JSF_XML_LINK" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.JSF_XML_LINK" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -895,6 +923,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_PROPERTY" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_PROPERTY" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -909,6 +940,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_RENDER_KIT" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_RENDER_KIT" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -956,6 +990,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_BUNDLE_BASENAME" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_BUNDLE_BASENAME" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -998,6 +1035,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CONVERTER" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CONVERTER" /> + </contenttypeidentifier> </hyperlink> <hyperlink Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml 2007-07-30 15:52:16 UTC (rev 2724) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml 2007-07-30 16:03:12 UTC (rev 2725) @@ -46,6 +46,21 @@ <axis path="*/web-app/*" /> </partitionType> </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT"> + <!-- Web.xml --> + <axis path="/web-app/error-page/location/" /> + <axis path="/web-app/login-config/form-login-config/form-error-page/" /> + <axis path="/web-app/login-config/form-login-config/form-login-page/" /> + <axis path="/web-app/servlet/jsp-file/" /> + <axis path="/web-app/*/icon/large-icon/" /> + <axis path="/web-app/*/icon/small-icon/" /> + <axis path="/web-app/taglib/taglib-location/" /> + <axis path="/web-app/jsp-config/taglib/taglib-location/" /> + <axis path="/web-app/welcome-file-list/welcome-file/" /> + <!-- Web.xml --> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -260,6 +275,11 @@ <axis path="/web-app/servlet/init-param/param-value/" /> </partitionType> </contentType> + <contentType id="org.eclipse.jst.j2ee.webDD"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT"> + <axis path="/web-app/servlet/init-param/param-value/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -1153,6 +1173,9 @@ <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.xml.STRUTS_XML_CONTEXT_PARAM_LINK" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.jst.j2ee.webDD"> + <partitiontype id="org.jboss.tools.common.text.ext.xml.STRUTS_XML_CONTEXT_PARAM_LINK" /> + </contenttypeidentifier> </hyperlink> <!-- Web.inf File -->