Author: rob.stryker(a)jboss.com Date: 2010-10-04 04:56:13 -0400 (Mon, 04 Oct 2010) New Revision: 25440 Modified: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java Log: Enablement of old publish actions in addition to handling legacy converted jbt projects who's official modules have bpel.module as a module id but where servers think the id is still jbt.bpel.module Modified: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2010-10-04 08:45:46 UTC (rev 25439) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2010-10-04 08:56:13 UTC (rev 25440) @@ -49,6 +49,10 @@ versions="1.1, 2.0" types="jbt.bpel.module"> </moduleType> + <moduleType + versions="1.1, 2.0" + types="bpel.module"> + </moduleType> </moduleFactory> </extension> Modified: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2010-10-04 08:45:46 UTC (rev 25439) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2010-10-04 08:56:13 UTC (rev 25440) @@ -70,9 +70,13 @@ public boolean accepts(String method, IServer server, IModule[] module) { if( LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method) && module != null && module.length > 0 - && module[module.length-1] != null - && module[module.length-1].getModuleType().getId().equals(IBPELModuleFacetConstants.BPEL20_MODULE_TYPE)) - return true; + && module[module.length-1] != null ) { + String typeId =module[module.length-1].getModuleType().getId(); + if( typeId.equals(IBPELModuleFacetConstants.BPEL20_MODULE_TYPE)) + return true; + if( typeId.equals(JBTBPELModuleFactoryDelegate.LEGACY_MODULE_TYPE)) + return true; + } return false; } Modified: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java 2010-10-04 08:45:46 UTC (rev 25439) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java 2010-10-04 08:56:13 UTC (rev 25440) @@ -7,6 +7,7 @@ import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer; +import org.jboss.tools.bpel.runtimes.module.JBTBPELModuleFactoryDelegate; import org.jboss.tools.bpel.runtimes.module.JBTBPELPublisher; public class BPELModuleContentProvider implements ITreeContentProvider { @@ -18,7 +19,7 @@ IModule[] module = ((ModuleServer)parentElement).module; IModule mod = module.length > 0 ? module[module.length-1] : null; String typeId = mod.getModuleType().getId(); - if( mod != null && typeId.equals(IBPELModuleFacetConstants.BPEL20_MODULE_TYPE)) { + if( mod != null && (typeId.equals(IBPELModuleFacetConstants.BPEL20_MODULE_TYPE) || typeId.equals(JBTBPELModuleFactoryDelegate.LEGACY_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);