Author: dgolovin Date: 2009-09-26 02:37:20 -0400 (Sat, 26 Sep 2009) New Revision: 17770 Removed: trunk/struts/plugins/org.jboss.tools.struts/meta/ Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml trunk/struts/features/org.jboss.tools.struts.feature/feature.xml trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF trunk/struts/plugins/org.jboss.tools.struts.ui/build.properties trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF trunk/struts/plugins/org.jboss.tools.struts.validator.ui/build.properties trunk/struts/plugins/org.jboss.tools.struts.validator.ui/plugin.xml trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF trunk/struts/plugins/org.jboss.tools.struts/build.properties trunk/struts/plugins/org.jboss.tools.struts/plugin.xml trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3628 - Plugins should be .jar's not directories for efficiency sake to make Plug-ins were converted to jars: seam.pages.xml struts struts.ui struts.validator.ui Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2009-09-26 06:37:20 UTC (rev 17770) @@ -14,11 +14,6 @@ <keys path="help/keys-seampages-lists.properties"/> </extension> - <extension - point="org.eclipse.wst.xml.core.catalogContributions"> - <catalogContribution id="default"> - </catalogContribution> - </extension> <extension point="org.jboss.tools.common.model.classes"> <xclass id="org.jboss.tools.seam.pages.xml.model.FileSeamPageImpl" Modified: trunk/struts/features/org.jboss.tools.struts.feature/feature.xml =================================================================== --- trunk/struts/features/org.jboss.tools.struts.feature/feature.xml 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/struts/features/org.jboss.tools.struts.feature/feature.xml 2009-09-26 06:37:20 UTC (rev 17770) @@ -26,7 +26,8 @@ id="org.jboss.tools.struts" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> <plugin id="org.jboss.tools.struts.text.ext" @@ -39,13 +40,15 @@ id="org.jboss.tools.struts.ui" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> <plugin id="org.jboss.tools.struts.validator.ui" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> <plugin id="org.jboss.tools.struts.verification" Modified: trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF 2009-09-26 06:37:20 UTC (rev 17770) @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: struts.jar Bundle-Activator: org.jboss.tools.struts.StrutsModelPlugin Bundle-Vendor: %providerName Bundle-SymbolicName: org.jboss.tools.struts;singleton:=true Modified: trunk/struts/plugins/org.jboss.tools.struts/build.properties =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/build.properties 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/struts/plugins/org.jboss.tools.struts/build.properties 2009-09-26 06:37:20 UTC (rev 17770) @@ -1,9 +1,9 @@ -source.struts.jar = src/,\ - resources/ +source.. = src/,\ + resources/ bin.includes = plugin.xml,\ plugin.properties,\ dtds/,\ about.html,\ META-INF/,\ - struts.jar + . additional.bundles = org.eclipse.wst.server.core Modified: trunk/struts/plugins/org.jboss.tools.struts/plugin.xml =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/plugin.xml 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/struts/plugins/org.jboss.tools.struts/plugin.xml 2009-09-26 06:37:20 UTC (rev 17770) @@ -39,16 +39,16 @@ <catalogContribution id="default"> <public publicId="-//Apache Software Foundation//DTD Struts Configuration 1.0//EN" - uri="dtds/struts-config_1_0.dtd"/> + uri="platform:/plugin/org.jboss.tools.struts/dtds/struts-config_1_0.dtd"/> <public publicId="-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" - uri="dtds/struts-config_1_1.dtd"/> + uri="platform:/plugin/org.jboss.tools.struts/dtds/struts-config_1_1.dtd"/> <public publicId="-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" - uri="dtds/struts-config_1_2.dtd"/> + uri="platform:/plugin/org.jboss.tools.struts/dtds/struts-config_1_2.dtd"/> <public publicId="-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.0//EN" - uri="dtds/validator_1_0.dtd"/> + uri="platform:/plugin/org.jboss.tools.struts/dtds/validator_1_0.dtd"/> </catalogContribution> </extension> @@ -411,4 +411,4 @@ </contribution> </extension> -</plugin> \ No newline at end of file +</plugin> Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/META-INF/MANIFEST.MF 2009-09-26 06:37:20 UTC (rev 17770) @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName -Bundle-ClassPath: strutsui.jar Bundle-Activator: org.jboss.tools.struts.ui.StrutsUIPlugin Bundle-ManifestVersion: 2 Bundle-Vendor: %providerName Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/build.properties =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/build.properties 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/build.properties 2009-09-26 06:37:20 UTC (rev 17770) @@ -1,12 +1,28 @@ -source.strutsui.jar = src/,\ - resources/ +source.. = src/,\ + resources/ bin.includes = plugin.xml,\ plugin.properties,\ images/,\ about.html,\ META-INF/,\ - strutsui.jar,\ + .,\ about.ini,\ about.mappings,\ about.properties,\ jboss_about.png +src.includes = src/,\ + resources/,\ + plugin.xml,\ + plugin.properties,\ + jboss_about.png,\ + images/,\ + build.properties,\ + about.properties,\ + about.mappings,\ + about.ini,\ + about.html,\ + META-INF/,\ + .project,\ + .options.template,\ + .cvsignore,\ + .classpath Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/plugin.xml 2009-09-26 06:37:20 UTC (rev 17770) @@ -20,13 +20,13 @@ </editor> </extension> <extension id="e" name="XML Editors" point="org.jboss.tools.common.model.ui.xmlEditor"> - <xmlEditor class="org.jboss.tools.struts.ui.editor.StrutsConfigEditor" contributorClass="org.jboss.tools.struts.ui.action.StrutsMultiPageContributor" entities="StrutsConfig10,StrutsConfig11,StrutsConfig12" icon="images/xstudio/editors/struts.gif" name="%editors.strutsconfig.name"> + <xmlEditor class="org.jboss.tools.struts.ui.editor.StrutsConfigEditor" contributorClass="org.jboss.tools.struts.ui.action.StrutsMultiPageContributor" entities="StrutsConfig10,StrutsConfig11,StrutsConfig12" icon="$nl$/images/xstudio/editors/struts.gif" name="%editors.strutsconfig.name"> </xmlEditor> <!--xmlEditor class="org.jboss.tools.struts.ui.editor.StrutsConfigEditor" contributorClass="org.jboss.tools.struts.ui.editor.StrutsActionContributor" entities="StrutsConfig10,StrutsConfig11" - icon="images/xstudio/editors/struts.gif" + icon="$nl$/images/xstudio/editors/struts.gif" name="%editors.strutsconfig.name"> </xmlEditor--> </extension> @@ -37,7 +37,7 @@ category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.struts.ui.wizard.project.NewProjectWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_project.gif" + icon="$nl$/images/xstudio/wizards/new_project.gif" id="org.jboss.tools.struts.ui.wizard.project.NewStrutsProjectWizard" name="%newProjectWizard.name" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -50,7 +50,7 @@ category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.struts.ui.wizard.newfile.NewStrutsConfigFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_struts.gif" + icon="$nl$/images/xstudio/wizards/new_struts.gif" id="org.jboss.tools.struts.ui.wizard.newfile.NewStrutsConfigFileWizard" name="%strutsConfig.11" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -65,7 +65,7 @@ category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.struts.ui.wizard.newfile.NewValidationFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_validator_file.gif" + icon="$nl$/images/xstudio/wizards/new_validator_file.gif" id="org.jboss.tools.struts.ui.wizard.newfile.NewValidationFileWizard" name="%new.validation" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -77,7 +77,7 @@ class="org.eclipse.core.resources.IResource"> </selection> </wizard> - <!--wizard category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.struts.ui.wizard.newfile.NewStrutsConfigFile10Wizard" icon="images/xstudio/wizards/new_struts.gif" id="org.jboss.tools.struts.ui.wizard.newfile.NewStrutsConfigFile10Wizard" name="%strutsConfig.10" project="false"> + <!--wizard category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.struts.ui.wizard.newfile.NewStrutsConfigFile10Wizard" icon="$nl$/images/xstudio/wizards/new_struts.gif" id="org.jboss.tools.struts.ui.wizard.newfile.NewStrutsConfigFile10Wizard" name="%strutsConfig.10" project="false"> <selection class="org.eclipse.core.resources.IResource"> </selection> </wizard--> @@ -100,7 +100,7 @@ <wizard category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.struts.ui.wizard.project.ImportProjectWizard" - icon="images/xstudio/wizards/import_project.gif" + icon="$nl$/images/xstudio/wizards/import_project.gif" id="org.jboss.tools.struts.ui.wizard.project.ImportProjectWizard" name="%importProjectWizard.name"> <description>Create a new Project from a WEB project in the file system. Struts support will be added if it is missing.</description> @@ -108,7 +108,7 @@ <wizard category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.struts.ui.wizard.project.ImportStrutsWarWizard" - icon="images/xstudio/wizards/import_project.gif" + icon="$nl$/images/xstudio/wizards/import_project.gif" id="org.jboss.tools.struts.ui.wizard.project.ImportStrutsWarWizard" name="%importStrutsWarWizard.name"> <description>Create a new Project from a Struts project in a WAR file. The content of WAR file will be copied to the workspace.</description> @@ -154,7 +154,7 @@ </page> </extension> <!--extension point="org.eclipse.ui.perspectives"> - <perspective class="org.jboss.tools.struts.ui.XStudioPerspectiveFactory" icon="images/xstudio/perspective.gif" id="org.jboss.tools.common.model.ui.XStudioPerspective" name="%perspective.name"> + <perspective class="org.jboss.tools.struts.ui.XStudioPerspectiveFactory" icon="$nl$/images/xstudio/perspective.gif" id="org.jboss.tools.common.model.ui.XStudioPerspective" name="%perspective.name"> </perspective> </extension--> <extension point="org.eclipse.ui.popupMenus"> @@ -169,7 +169,7 @@ <separator name="d"> </separator> </menu> - <action class="org.jboss.tools.struts.ui.internal.action.AddStrutsNatureActionDelegate" enablesFor="*" icon="images/xstudio/actions/add_struts_nature.gif" id="org.jboss.tools.struts.ui.action.AddStrutsNatureActionDelegate" label="%popupMenus.action.addStrutsNature" menubarPath="RedHat4Web/a"> + <action class="org.jboss.tools.struts.ui.internal.action.AddStrutsNatureActionDelegate" enablesFor="*" icon="$nl$/images/xstudio/actions/add_struts_nature.gif" id="org.jboss.tools.struts.ui.action.AddStrutsNatureActionDelegate" label="%popupMenus.action.addStrutsNature" menubarPath="RedHat4Web/a"> </action> <action class="org.jboss.tools.struts.ui.internal.action.RemoveStrutsNatureActionDelegate" enablesFor="*" id="org.jboss.tools.common.xstudio.action.RemoveStrutsNatureActionDelegate" label="%popupMenus.action.removeStrutsNature" menubarPath="RedHat4Web/d"> </action> @@ -187,7 +187,7 @@ <separator name="d"> </separator> </menu> - <action class="org.jboss.tools.struts.ui.internal.action.AddStrutsNatureActionDelegate" enablesFor="*" icon="images/xstudio/actions/add_struts_nature.gif" id="org.jboss.tools.struts.ui.action.AddStrutsNatureActionDelegate" label="%popupMenus.action.addStrutsNature" menubarPath="RedHat4Web/a"> + <action class="org.jboss.tools.struts.ui.internal.action.AddStrutsNatureActionDelegate" enablesFor="*" icon="$nl$/images/xstudio/actions/add_struts_nature.gif" id="org.jboss.tools.struts.ui.action.AddStrutsNatureActionDelegate" label="%popupMenus.action.addStrutsNature" menubarPath="RedHat4Web/a"> </action> <action class="org.jboss.tools.struts.ui.internal.action.RemoveStrutsNatureActionDelegate" enablesFor="*" id="org.jboss.tools.common.xstudio.action.RemoveStrutsNatureActionDelegate" label="%popupMenus.action.removeStrutsNature" menubarPath="RedHat4Web/d"> </action> @@ -248,10 +248,10 @@ </actionSet --> <actionSet description="%actionSets.projectActions.description" id="org.jboss.tools.common.studio.actionSet" label="%actionSets.projectActions.label" visible="false"> <!--toolbarPath="Normal/SSProject"--> - <action class="org.jboss.tools.struts.ui.internal.action.ImportProjectAction" icon="images/xstudio/wizards/import_project.gif" id="org.jboss.tools.common.xstudio.action1" label="%actionSets.projectActions.importStrutsProject.label" tooltip="%actionSets.projectActions.importStrutsProject.label"> + <action class="org.jboss.tools.struts.ui.internal.action.ImportProjectAction" icon="$nl$/images/xstudio/wizards/import_project.gif" id="org.jboss.tools.common.xstudio.action1" label="%actionSets.projectActions.importStrutsProject.label" tooltip="%actionSets.projectActions.importStrutsProject.label"> </action> <!--toolbarPath="Normal/SSProject"--> - <action class="org.jboss.tools.struts.ui.internal.action.CreateProjectAction" icon="images/xstudio/wizards/new_project.gif" id="org.jboss.tools.common.xstudio.action1" label="%actionSets.projectActions.newStrutsProject.label" tooltip="%actionSets.projectActions.newStrutsProject.label"> + <action class="org.jboss.tools.struts.ui.internal.action.CreateProjectAction" icon="$nl$/images/xstudio/wizards/new_project.gif" id="org.jboss.tools.common.xstudio.action1" label="%actionSets.projectActions.newStrutsProject.label" tooltip="%actionSets.projectActions.newStrutsProject.label"> </action> </actionSet> </extension> Modified: trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/struts/plugins/org.jboss.tools.struts.validator.ui/META-INF/MANIFEST.MF 2009-09-26 06:37:20 UTC (rev 17770) @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName Bundle-ManifestVersion: 2 -Bundle-ClassPath: strutsvalidatorui.jar Bundle-Activator: org.jboss.tools.struts.validator.ui.XStudioValidato rPlugin Bundle-Vendor: %providerName Modified: trunk/struts/plugins/org.jboss.tools.struts.validator.ui/build.properties =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.validator.ui/build.properties 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/struts/plugins/org.jboss.tools.struts.validator.ui/build.properties 2009-09-26 06:37:20 UTC (rev 17770) @@ -1,8 +1,20 @@ -source.strutsvalidatorui.jar = src/ +source.. = src/ bin.includes = plugin.xml,\ plugin.properties,\ images/,\ extensions.xml,\ about.html,\ META-INF/,\ - strutsvalidatorui.jar + . +src.includes = .classpath,\ + .cvsignore,\ + .options.template,\ + .project,\ + META-INF/,\ + about.html,\ + build.properties,\ + extensions.xml,\ + images/,\ + plugin.properties,\ + plugin.xml,\ + src/ Modified: trunk/struts/plugins/org.jboss.tools.struts.validator.ui/plugin.xml =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.validator.ui/plugin.xml 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/struts/plugins/org.jboss.tools.struts.validator.ui/plugin.xml 2009-09-26 06:37:20 UTC (rev 17770) @@ -45,7 +45,7 @@ <xmlEditor class="org.jboss.tools.struts.validator.ui.ValidationCompoundEditor" contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" entities="FileValidationRules,FileValidationRules11" - icon="images/validator_file.gif" + icon="$nl$/images/validator_file.gif" name="%editors.validator.name"> </xmlEditor> </extension> @@ -73,4 +73,4 @@ class="org.jboss.tools.struts.validator.ui.wizard.key.SelectKeyWizard"/> </extension> -</plugin> \ No newline at end of file +</plugin> Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml =================================================================== --- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2009-09-25 19:39:23 UTC (rev 17769) +++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2009-09-26 06:37:20 UTC (rev 17770) @@ -76,6 +76,7 @@ id="org.jboss.tools.xulrunner" download-size="0" install-size="0" - version="0.0.0"/> + version="0.0.0" + unpack="false"/> </feature>