Author: bbrodt Date: 2012-05-17 19:48:16 -0400 (Thu, 17 May 2012) New Revision: 41134 Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java Log: https://issues.jboss.org/browse/JBIDE-9789 - partial fix. Still does not automatically re-deploy, but at least we're back to using the correct publisher, and Server view shows "Republish" flag. Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2012-05-17 23:05:50 UTC (rev 41133) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2012-05-17 23:48:16 UTC (rev 41134) @@ -17,7 +17,7 @@ <!--=========================================================================--> <!-- New BPEL Project Wizard --> <!--=========================================================================--> - + <!-- This is not the New BPEL Project Wizard you are looking for...move along! <extension point="org.eclipse.ui.newWizards"> <wizard @@ -32,6 +32,8 @@ <description>%NEW_BPEL_PROJECT_DESCRIPTION</description> </wizard> </extension> + --> + <!-- <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages"> <wizard-pages action="bpel.facet.core.install"> @@ -59,7 +61,7 @@ <extension point="org.eclipse.wst.server.ui.serverImages"> <image id="org.jboss.tools.bpel.runtimes.jbt.bpel.module" - typeIds="jbt.bpel.module,bpel.module" + typeIds="jbt.bpel.module" icon="icons/obj16/bpelfacet.gif"/> </extension> @@ -205,10 +207,11 @@ <moduleFactory projects="true" class="org.jboss.tools.bpel.runtimes.module.BPELModuleFactoryDelegate" - id="org.jboss.tools.bpel.runtimes.module.moduleFactory"> + id="org.jboss.tools.bpel.runtimes.module.moduleFactory" + order="1"> <moduleType versions="1.1, 2.0" - types="jbt.bpel.module,bpel.module"> + types="bpel.module,jbt.bpel.module"> </moduleType> </moduleFactory> </extension> @@ -220,7 +223,8 @@ <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters"> <moduleArtifactAdapter id="org.jboss.tools.bpel.runtimes.module.artifactAdapter1" - class="org.jboss.tools.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory"> + class="org.jboss.tools.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory" + priority="100"> <enablement> <with variable="selection"> <adapt type="org.eclipse.core.resources.IProject"/> @@ -229,7 +233,8 @@ </moduleArtifactAdapter> <moduleArtifactAdapter id="org.jboss.tools.bpel.runtimes.module.artifactAdapter2" - class="org.jboss.tools.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory"> + class="org.jboss.tools.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory" + priority="100"> <enablement> <with variable="selection"> <adapt type="org.eclipse.core.resources.IFile"/> @@ -254,14 +259,20 @@ <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/> </factory> </extension> - <extension - point="org.jboss.ide.eclipse.as.core.publishers"> - <publisher - class="org.jboss.tools.bpel.runtimes.module.JBTBPELPublisher" - priority="10" - zipDelegate="false"> - </publisher> - </extension> + + <!-- + The priority needs to be above that of JBoss7JSTPublisher publisher, which currently is 15. + Note that the JBoss 7 publisher does not actually accept a bpel.module - its accept method + defaults to AbstractServerToolsPublisher.accept() which (in this case) always returns true + --> + <extension + point="org.jboss.ide.eclipse.as.core.publishers"> + <publisher + class="org.jboss.tools.bpel.runtimes.module.JBTBPELPublisher" + priority="100" + zipDelegate="true"> + </publisher> + </extension> <!--=========================================================================--> <!-- TO MAKE PROCESSES ACTUALLY LAUNCHABLE VIA RUN ON SERVER --> Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java 2012-05-17 23:05:50 UTC (rev 41133) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java 2012-05-17 23:48:16 UTC (rev 41134) @@ -22,14 +22,15 @@ // module types - public final static String BPEL_MODULE_TYPE = "jbt.bpel.module"; //$NON-NLS-1$ + public final static String JBT_BPEL_MODULE_TYPE = "jbt.bpel.module"; //$NON-NLS-1$ + public final static String BPEL_MODULE_TYPE = "bpel.module"; //$NON-NLS-1$ // module type versions public final static String BPEL11_VERSION = "1.1"; // $NON-NLS-1$ public final static String BPEL20_VERSION = "2.0"; // $NON-NLS-1$ // facet template - public final static String BPEL20_FACET_TEMPLATE = "jbt.template.bpel.core"; //$NON-NLS-1$ + public final static String JBT_BPEL_FACET_TEMPLATE = "jbt.template.bpel.core"; //$NON-NLS-1$ // facet // this facet has been deprecated Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java 2012-05-17 23:05:50 UTC (rev 41133) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java 2012-05-17 23:48:16 UTC (rev 41134) @@ -60,7 +60,7 @@ // // if (IStatus.OK != fileStatus.getCode()) return null; // not a valid BPEL file // -// IModule[] modules = ServerUtil.getModules(IBPELModuleFacetConstants.BPEL_MODULE_TYPE); +// IModule[] modules = ServerUtil.getModules(IBPELModuleFacetConstants.JBT_BPEL_MODULE_TYPE); // // for (int i=0; i<modules.length; i++) { // Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2012-05-17 23:05:50 UTC (rev 41133) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2012-05-17 23:48:16 UTC (rev 41134) @@ -39,7 +39,7 @@ protected Map <IModule, FlatComponentDeployable> moduleDelegates = new HashMap<IModule, FlatComponentDeployable>(5); public static final String FACTORY_ID = "org.jboss.tools.bpel.runtimes.module.moduleFactory"; - public static final String MODULE_TYPE = IBPELModuleFacetConstants.BPEL_MODULE_TYPE; + public static BPELModuleFactoryDelegate FACTORY; public static BPELModuleFactoryDelegate factoryInstance() { if( FACTORY == null ) { @@ -75,7 +75,6 @@ return null; } - @Override public ModuleDelegate getModuleDelegate(IModule module) { if (module == null) @@ -95,7 +94,7 @@ protected boolean canHandleProject(IProject p) { // https://issues.jboss.org/browse/JBIDE-8533 // Added support for deprecated jbt.bpel.facet.core - return //FacetedProjectUtilities.isProjectOfType(p, IBPELModuleFacetConstants.BPEL_PROJECT_FACET) || + return FacetedProjectUtilities.isProjectOfType(p, IBPELModuleFacetConstants.BPEL_PROJECT_FACET) || FacetedProjectUtilities.isProjectOfType(p, IBPELModuleFacetConstants.JBT_BPEL_PROJECT_FACET); } Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2012-05-17 23:05:50 UTC (rev 41133) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2012-05-17 23:48:16 UTC (rev 41134) @@ -74,8 +74,8 @@ && module != null && module.length > 0 && module[module.length-1] != null && ( - module[module.length-1].getModuleType().getId().equals(IBPELModuleFacetConstants.BPEL_MODULE_TYPE) || - module[module.length-1].getModuleType().getId().equals("bpel.module")) + module[module.length-1].getModuleType().getId().equals(IBPELModuleFacetConstants.JBT_BPEL_MODULE_TYPE) || + module[module.length-1].getModuleType().getId().equals(IBPELModuleFacetConstants.BPEL_MODULE_TYPE)) ) return true; return false; Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java 2012-05-17 23:05:50 UTC (rev 41133) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java 2012-05-17 23:48:16 UTC (rev 41134) @@ -20,7 +20,12 @@ String typeId = mod.getModuleType().getId(); // https://jira.jboss.org/browse/JBIDE-7486 // if project was closed or deleted, mod.getProject() is null - ignore - if( mod != null && mod.getProject() != null && typeId.equals(IBPELModuleFacetConstants.BPEL_MODULE_TYPE)) { + if( mod != null && mod.getProject() != null && + ( + typeId.equals(IBPELModuleFacetConstants.JBT_BPEL_MODULE_TYPE) || + typeId.equals(IBPELModuleFacetConstants.BPEL_MODULE_TYPE) + ) + ) { // we have a bpel module deployed to a server. List the children String[] versions = JBTBPELPublisher.getDeployedPathsFromDescriptor(s, mod.getProject()); return wrap((ModuleServer)parentElement, versions); Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java 2012-05-17 23:05:50 UTC (rev 41133) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java 2012-05-17 23:48:16 UTC (rev 41134) @@ -91,7 +91,7 @@ */ @Override protected IFacetedProjectTemplate getTemplate() { - return ProjectFacetsManager.getTemplate(IBPELModuleFacetConstants.BPEL20_FACET_TEMPLATE); + return ProjectFacetsManager.getTemplate(IBPELModuleFacetConstants.JBT_BPEL_FACET_TEMPLATE); } Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java 2012-05-17 23:05:50 UTC (rev 41133) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java 2012-05-17 23:48:16 UTC (rev 41134) @@ -50,9 +50,9 @@ top.setLayout(new GridLayout()); top.setLayoutData(new GridData(GridData.FILL_BOTH)); createProjectGroup(top); -// createServerTargetComposite(top); + createServerTargetComposite(top); // createPrimaryFacetComposite(top); -// createPresetPanel(top); + createPresetPanel(top); return top; } }