Author: scabanovich Date: 2009-09-18 06:06:58 -0400 (Fri, 18 Sep 2009) New Revision: 17651 Added: trunk/jst/plugins/org.jboss.tools.jst.web/schema/ trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPCompoundAdopt.java Modified: trunk/jst/plugins/org.jboss.tools.jst.web/build.properties trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-4913 Extension point jspAdopt moved to jst.web. Modified: trunk/jst/plugins/org.jboss.tools.jst.web/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/build.properties 2009-09-18 09:19:45 UTC (rev 17650) +++ trunk/jst/plugins/org.jboss.tools.jst.web/build.properties 2009-09-18 10:06:58 UTC (rev 17651) @@ -6,5 +6,6 @@ about.html,\ META-INF/,\ web.jar,\ - catalog/ + catalog/,\ + schema/ additional.bundles = org.eclipse.jem.util Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-18 09:19:45 UTC (rev 17650) +++ trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-18 10:06:58 UTC (rev 17651) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> <plugin> + <extension-point id="jspAdopt" name="JSP Adopt" schema="schema/jspAdopt.exsd"/> <extension point="org.jboss.tools.common.model.meta"> <meta path="meta/studio_eclipse_option.meta"> @@ -33,7 +34,7 @@ </specialwizard> </extension> - <extension point="org.jboss.tools.common.model.jspAdopt"> + <extension point="org.jboss.tools.jst.web.jspAdopt"> <jspAdopt class="org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt"/> <jspAdopt class="org.jboss.tools.jst.web.model.handlers.JSPAdopt"/> </extension> @@ -118,6 +119,8 @@ class="org.jboss.tools.jst.web.model.handlers.FindReferringItemHandler"/> <xclass id="org.jboss.tools.jst.web.model.handlers.JSPAdopt" class="org.jboss.tools.jst.web.model.handlers.JSPAdopt"/> + <xclass id="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt" + class="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt"/> <xclass id="org.jboss.tools.jst.web.model.handlers.JumpToTransitionTargetHandler" class="org.jboss.tools.jst.web.model.handlers.JumpToTransitionTargetHandler"/> <xclass id="org.jboss.tools.jst.web.model.handlers.RegisterInServerXmlHandler" Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta 2009-09-18 09:19:45 UTC (rev 17650) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/page-files.meta 2009-09-18 10:06:58 UTC (rev 17651) @@ -52,7 +52,7 @@ </ICONS> <GlobalActions kind="list"/> <XModelEntity - AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" + AdoptManagerClass="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt" ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" ObjectEditorClass="%HTML%" name="FileHTML"> @@ -143,7 +143,7 @@ <XDependencies/> </XModelEntity> <XModelEntity - AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" + AdoptManagerClass="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt" ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" ObjectEditorClass="%JSP%" name="FileJSP"> @@ -233,7 +233,7 @@ <XDependencies/> </XModelEntity> <XModelEntity - AdoptManagerClass="org.jboss.tools.common.model.files.handlers.JSPAdopt" + AdoptManagerClass="org.jboss.tools.jst.web.model.handlers.JSPCompoundAdopt" ImplementationLoadingClass="org.jboss.tools.common.model.loaders.impl.BodyLoader" ImplementingClass="org.jboss.tools.common.model.filesystems.impl.RecognizedFileImpl" ObjectEditorClass="%HTML%" name="FileXHTML"> Added: trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd 2009-09-18 10:06:58 UTC (rev 17651) @@ -0,0 +1,103 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- Schema file written by PDE --> +<schema targetNamespace="org.jboss.tools.jst.web" xmlns="http://www.w3.org/2001/XMLSchema"> +<annotation> + <appInfo> + <meta.schema plugin="org.jboss.tools.jst.web" id="jspAdopt" name="JSP Adopt"/> + </appInfo> + <documentation> + [Enter description of this extension point.] + </documentation> + </annotation> + + <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> + <complexType> + <sequence> + <element ref="jspAdopt" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute translatable="true"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="jspAdopt"> + <complexType> + <attribute name="class" type="string"> + <annotation> + <documentation> + Qualified name of class implementing interface + org.jboss.tools.common.meta.XAdoptManager + </documentation> + <appInfo> + <meta.attribute kind="java"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appInfo> + <meta.section type="since"/> + </appInfo> + <documentation> + [Enter the first release in which this extension point appears.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="examples"/> + </appInfo> + <documentation> + [Enter extension point usage example here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="apiinfo"/> + </appInfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="implementation"/> + </appInfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + +</schema> Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web/schema/jspAdopt.exsd ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPCompoundAdopt.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPCompoundAdopt.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPCompoundAdopt.java 2009-09-18 10:06:58 UTC (rev 17651) @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.web.model.handlers; + +import org.jboss.tools.common.meta.XAdoptManager; +import org.jboss.tools.common.meta.action.impl.CompoundAdoptManager; + +public class JSPCompoundAdopt extends CompoundAdoptManager { + /* + * see extension point org.jboss.tools.common.model.jspAdopt + private static String[] MANAGERS = {"org.jboss.tools.jst.web.tld.model.handlers.JSPAdopt", + "org.jboss.tools.struts.tiles.model.handlers.JSPAdopt", + "org.jboss.tools.struts.model.handlers.JSPAdopt", + "org.jboss.tools.jsf.model.handlers.JSPAdopt", + "org.jboss.tools.jsf.ui.adopt.JSPAdopt", + "org.jboss.tools.jst.web.model.handlers.JSPAdopt", + }; + */ + private static XAdoptManager[] managers = null; + + public XAdoptManager[] getManagers() { + if(managers == null) managers = loadManagers("org.jboss.tools.jst.web.jspAdopt"); //$NON-NLS-1$ + return managers; + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/JSPCompoundAdopt.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java 2009-09-18 09:19:45 UTC (rev 17650) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/TLDUtil.java 2009-09-18 10:06:58 UTC (rev 17651) @@ -14,7 +14,7 @@ public class TLDUtil { static String FILE_ENTITIES = ".FileTLD_PRO.FileTLD_1_2.FileTLD_2_0.FileTLD_2_1."; //$NON-NLS-1$ - static String TAG_ENTITIES = ".TLDTag.TLDTag12.TLDTag21."; //$NON-NLS-1$ + static String TAG_ENTITIES = ".TLDTag.TLDTag12.TLDTag20.TLDTag21."; //$NON-NLS-1$ static String ATTR_ENTITIES = ".TLDAttribute.TLDAttribute12."; //$NON-NLS-1$ public static boolean isTaglib(XModelObject o) {