diff options
Diffstat (limited to 'jaxb')
5 files changed, 99 insertions, 91 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/plugin.xml b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/plugin.xml index b56254171b..2a329682a2 100644 --- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/plugin.xml +++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/plugin.xml @@ -11,26 +11,26 @@ --> <plugin> - - + + <!-- ***** commands ***** --> - + <extension point="org.eclipse.ui.commands"> - + <command id="org.eclipse.jpt.dbws.ui.generateDbws" name="%generateDBWS" > </command> - - </extension> + + </extension> <!-- ***** handlers ***** --> - + <extension point="org.eclipse.ui.handlers"> - + <handler commandId="org.eclipse.jpt.dbws.ui.generateDbws" class="org.eclipse.jpt.dbws.eclipselink.ui.internal.handlers.GenerateDbwsHandler"> @@ -41,12 +41,9 @@ <and> <adapt type="org.eclipse.core.resources.IFile"> <and> - <test - property="org.eclipse.core.resources.name" + <test property="org.eclipse.core.resources.name" value="*builder.xml"/> - <test - property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="jst.web"/> + <reference definitionId="org.eclipse.jpt.expression.hasDynamicWebFacet"/> </and> </adapt> </and> @@ -56,17 +53,17 @@ </handler> </extension> - - + + <!-- ***** menus ***** --> - - <extension + + <extension point="org.eclipse.ui.menus"> - + <!-- contributions for any popup --> <menuContribution locationURI="popup:org.eclipse.ui.popup.any"> - + <menu id="org.eclipse.jpt.dbws.ui.menu.WebServices" label="%dbwsWizardCategoryName"> @@ -77,17 +74,16 @@ <menuContribution locationURI="popup:org.eclipse.jpt.dbws.ui.menu.WebServices"> - + <command commandId="org.eclipse.jpt.dbws.ui.generateDbws"> <visibleWhen checkEnabled="true"/> </command> </menuContribution> - - - </extension> - - - <!-- ***** newWizards ***** --> + + </extension> + + + <!-- ***** new wizards ***** --> <extension point="org.eclipse.ui.newWizards"> @@ -96,11 +92,11 @@ id="org.eclipse.jpt.dbws" name="%dbwsWizardCategoryName"/> - <wizard - id="org.eclipse.jpt.dbws.ui.wizard.generateDbws" + <wizard + id="org.eclipse.jpt.dbws.ui.wizard.generateDbws" name="%generateDbwsFromXmlName" - category="org.eclipse.jpt.dbws" - class="org.eclipse.jpt.dbws.eclipselink.ui.internal.wizards.gen.DbwsGeneratorWizard" + category="org.eclipse.jpt.dbws" + class="org.eclipse.jpt.dbws.eclipselink.ui.internal.wizards.gen.DbwsGeneratorWizard" icon="$nl$/images/buttons/new-web-services-client.gif"> <description>%generateDbwsFromXmlDesc</description> </wizard> diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.core/plugin.xml index db9cb38863..159896b1de 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/plugin.xml +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/plugin.xml @@ -11,33 +11,38 @@ --> <plugin> - + <!-- ***** extension points ***** --> - + <extension-point id="jaxbPlatforms" name="%JAXB_PLATFORMS" schema="schema/jaxbPlatforms.exsd"/> - - <!-- ***** expressions ***** --> - - <extension point="org.eclipse.core.expressions.definitions"> - <!-- A test for determining whether something adapts to an IProject and has the JAXB facet. - Force activation of the wst facet plug-in containing the property tester. - Possible usage: - <adapt type="org.eclipse.core.resources.IProject"> - <reference definitionId="org.eclipse.jpt.jaxb.reference.hasJaxbFacet"/> + + + <!-- ***** expression definitions ***** --> + + <extension + point="org.eclipse.core.expressions.definitions"> + + <!-- + Return whether a resource's project has the JAXB facet + (or a project facet version matches the JAXB facet). + Force activation of the WST facet plug-in containing the property tester. + Example usage: + <adapt type="org.eclipse.core.resources.IResource"> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </adapt> - --> - <definition id="org.eclipse.jpt.jaxb.reference.hasJaxbFacet"> - <test - property="org.eclipse.wst.common.project.facet.core.projectFacet" + --> + <definition id="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jaxb" forcePluginActivation="true"/> </definition> - + </extension> - + + <!-- ***** adapters ***** --> <extension @@ -187,7 +192,7 @@ </extension> - <!-- ***** Dali extensions (eat our own dogfood) ***** --> + <!-- ***** JAXB platforms (eat our own dogfood) ***** --> <extension point="org.eclipse.jpt.jaxb.core.jaxbPlatforms"> @@ -215,6 +220,8 @@ </extension> + <!-- ***** library validators ***** --> + <extension point="org.eclipse.jpt.common.core.libraryValidators"> @@ -256,7 +263,9 @@ </extension> - <extension + <!-- ***** WTP library providers ***** --> + + <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> <provider @@ -265,9 +274,7 @@ <param name="message" value="%JAXB_NO_OP_LIBRARY_PROVIDER_MESSAGE"/> <enablement> <with variable="requestingProjectFacet"> - <test - property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="jpt.jaxb" forcePluginActivation="true"/> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </with> </enablement> </provider> @@ -280,8 +287,7 @@ <enablement> <and> <with variable="requestingProjectFacet"> - <test property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="jpt.jaxb" forcePluginActivation="true"/> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </with> </and> </enablement> @@ -299,8 +305,7 @@ extends="wtp-user-library-provider"> <enablement> <with variable="requestingProjectFacet"> - <test property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="jpt.jaxb" forcePluginActivation="true"/> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </with> </enablement> <action type="INSTALL"> @@ -316,8 +321,7 @@ abstract="true"> <enablement> <with variable="requestingProjectFacet"> - <test property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="jpt.jaxb" forcePluginActivation="true"/> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </with> </enablement> <action type="INSTALL"> @@ -335,7 +339,7 @@ </extension> - <!-- ***** WTP facet framework ***** --> + <!-- ***** WTP facets ***** --> <extension point="org.eclipse.wst.common.project.facet.core.runtimes"> @@ -391,7 +395,7 @@ </extension> - <!-- ***** WTP validation framework ***** --> + <!-- ***** WTP validation ***** --> <extension point="org.eclipse.wst.validation.validatorV2" diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml index c08012ca5c..07211100ed 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml @@ -12,6 +12,28 @@ <plugin> + <!-- ***** expression definitions ***** --> + + <extension + point="org.eclipse.core.expressions.definitions"> + + <!-- + Return whether a JAXB platform config's JAXB platform is EclipseLink. + Example usage: + <adapt type="org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig"> + <reference definitionId="org.eclipse.jpt.jaxb.eclipselink.expression.jaxbPlatformIsEclipseLink"/> + </adapt> + --> + <definition id="org.eclipse.jpt.jaxb.eclipselink.expression.jaxbPlatformIsEclipseLink"> + <test property="org.eclipse.jpt.jaxb.core.jaxbPlatformGroup" + value="eclipselink"/> + </definition> + + </extension> + + + <!-- ***** content types ***** --> + <extension point="org.eclipse.core.contenttype.contentTypes"> @@ -31,27 +53,8 @@ </extension> - <!-- ***** expressions ***** --> + <!-- ***** property testers ***** --> - <extension point="org.eclipse.core.expressions.definitions"> - <!-- A test for determining whether something adapts to a JaxbPlatformConfig - and has an eclipselink platform. - Force activation of the wst facet plug-in containing the property tester. - Possible usage: - <adapt type="org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig"> - <reference definitionId="org.eclipse.jpt.jaxb.eclipselink.reference.hasEclipseLinkPlatform"/> - </adapt> - --> - <definition id="org.eclipse.jpt.jaxb.eclipselink.reference.hasEclipseLinkPlatform"> - <test - property="org.eclipse.jpt.jaxb.core.jaxbPlatformGroup" - value="eclipselink" - forcePluginActivation="true"/> - </definition> - - </extension> - - <extension point="org.eclipse.core.expressions.propertyTesters"> @@ -65,6 +68,8 @@ </extension> + <!-- ***** JAXB platforms ***** --> + <extension point="org.eclipse.jpt.jaxb.core.jaxbPlatforms"> @@ -115,6 +120,8 @@ </extension> + <!-- ***** EMF ecore package registry ***** --> + <extension point="org.eclipse.emf.ecore.generated_package"> @@ -126,6 +133,8 @@ </extension> + <!-- ***** library validators ***** --> + <extension point="org.eclipse.jpt.common.core.libraryValidators"> @@ -151,6 +160,8 @@ </extension> + <!-- ***** resource types ***** --> + <extension point="org.eclipse.jpt.common.core.resourceTypes"> diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/plugin.xml index 7d9dbfd408..a116dc8bb9 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/plugin.xml +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/plugin.xml @@ -110,10 +110,10 @@ <instanceof value="org.eclipse.jdt.core.IPackageFragment"/> </or> <adapt type="org.eclipse.core.resources.IResource"> - <reference definitionId="org.eclipse.jpt.jaxb.reference.hasJaxbFacet"/> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </adapt> <adapt type="org.eclipse.jpt.jaxb.core.platform.JaxbPlatformConfig"> - <reference definitionId="org.eclipse.jpt.jaxb.eclipselink.reference.hasEclipseLinkPlatform"/> + <reference definitionId="org.eclipse.jpt.jaxb.eclipselink.expression.jaxbPlatformIsEclipseLink"/> </adapt> </and> </enablement> diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml index 6bdc8dcdad..86ab865882 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml @@ -103,7 +103,7 @@ <enablement> <with variable="project"> <adapt type="org.eclipse.core.resources.IProject"> - <reference definitionId="org.eclipse.jpt.jaxb.reference.hasJaxbFacet"/> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </adapt> </with> </enablement> @@ -240,7 +240,7 @@ the JaxbPackage AdapterFactory will not be called and the expression evaluates to true, that causes the JAXB menu to appear for JPA project packages --> <adapt type="org.eclipse.core.resources.IResource"> - <reference definitionId="org.eclipse.jpt.jaxb.reference.hasJaxbFacet"/> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </adapt> <adapt type="org.eclipse.jpt.jaxb.core.context.JaxbPackage"/> </iterate> @@ -304,7 +304,7 @@ <or> <instanceof value="org.eclipse.jpt.jaxb.core.context.JaxbContextNode"/> <adapt type="org.eclipse.core.resources.IProject"> - <reference definitionId="org.eclipse.jpt.jaxb.reference.hasJaxbFacet"/> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </adapt> </or> </triggerPoints> @@ -387,7 +387,7 @@ class="org.eclipse.jpt.jaxb.ui.internal.properties.JaxbProjectPropertiesPage"> <enabledWhen> <adapt type="org.eclipse.core.resources.IProject"> - <reference definitionId="org.eclipse.jpt.jaxb.reference.hasJaxbFacet"/> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </adapt> </enabledWhen> </page> @@ -399,7 +399,7 @@ class="org.eclipse.jpt.jaxb.ui.internal.properties.JaxbSchemasPropertiesPage"> <enabledWhen> <adapt type="org.eclipse.core.resources.IProject"> - <reference definitionId="org.eclipse.jpt.jaxb.reference.hasJaxbFacet"/> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </adapt> </enabledWhen> </page> @@ -412,10 +412,7 @@ class="org.eclipse.jpt.jaxb.ui.internal.preferences.JaxbProblemSeveritiesPage"> <enabledWhen> <adapt type="org.eclipse.core.resources.IProject"> - <test - forcePluginActivation="true" - property="org.eclipse.wst.common.project.facet.core.projectFacet" - value="jpt.jaxb"/> + <reference definitionId="org.eclipse.jpt.jaxb.expression.hasJaxbFacet"/> </adapt> </enabledWhen> </page> |