Author: rob.stryker(a)jboss.com Date: 2010-10-04 04:25:36 -0400 (Mon, 04 Oct 2010) New Revision: 25437 Added: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELModuleFactoryDelegate.java Removed: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java Modified: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml Log: Server with registered legacy bpel module on it (jbt.bpel.module) should now delegate to the eclipse bpel factory instead. This is in the case that the project has already been migrated to use the new facets. 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 07:11:21 UTC (rev 25436) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2010-10-04 08:25:36 UTC (rev 25437) @@ -43,7 +43,7 @@ point="org.eclipse.wst.server.core.moduleFactories"> <moduleFactory projects="true" - class="org.jboss.tools.bpel.runtimes.module.BPELModuleFactoryDelegate" + class="org.jboss.tools.bpel.runtimes.module.JBTBPELModuleFactoryDelegate" id="org.jboss.tools.bpel.runtimes.module.moduleFactory"> <moduleType versions="1.1, 2.0" @@ -137,5 +137,25 @@ zipDelegate="false"> </publisher> </extension> - + + <extension + point="org.eclipse.wst.common.project.facet.core.runtimes"> + <supported> + <runtime-component id="org.jboss.ide.eclipse.as.runtime.component" version="4.2"/> + <facet id="bpel.facet.core" version="1.1,2.0"/> + </supported> + <supported> + <runtime-component id="org.jboss.ide.eclipse.as.runtime.component" version="5.0"/> + <facet id="bpel.facet.core" version="1.1,2.0"/> + </supported> + <supported> + <runtime-component id="org.jboss.ide.eclipse.as.runtime.component" version="5.1"/> + <facet id="bpel.facet.core" version="1.1,2.0"/> + </supported> + <supported> + <runtime-component id="org.jboss.ide.eclipse.as.runtime.component" version="6.0"/> + <facet id="bpel.facet.core" version="1.1,2.0"/> + </supported> + </extension> + </plugin> Deleted: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2010-10-04 07:11:21 UTC (rev 25436) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2010-10-04 08:25:36 UTC (rev 25437) @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 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: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.bpel.runtimes.module; - -import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.model.ModuleDelegate; -import org.eclipse.wst.server.core.model.ModuleFactoryDelegate; - -/** - * The purpose of this class is to redirect requests to locate an - * already-migrated project module. For example, if a project - * previously was of module-type jbt.bpel.module and has since been - * migrated properly, old servers may still search for a jbt.bpel.module - * module ID. - * - * This factory does not create any modules, but rather only returns - * new modules from the eclipse bpel factory when the server is requesting - * a legacy id. - */ -public class BPELModuleFactoryDelegate extends ModuleFactoryDelegate { - public static final String FACTORY_ID = "org.jboss.tools.bpel.runtimes.module.moduleFactory"; - public static final String LEGACY_MODULE_TYPE = "jbt.bpel.module"; - - public BPELModuleFactoryDelegate() { - super(); - } - - @Override - public ModuleDelegate getModuleDelegate(IModule module) { - return null; - } - - @Override - public IModule[] getModules() { - return new IModule[]{}; - } - - @Override - public IModule findModule(String id) { - return null; - } -} \ No newline at end of file Copied: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELModuleFactoryDelegate.java (from rev 25436, workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java) =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELModuleFactoryDelegate.java (rev 0) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELModuleFactoryDelegate.java 2010-10-04 08:25:36 UTC (rev 25437) @@ -0,0 +1,51 @@ +/******************************************************************************* + * Copyright (c) 2009 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.bpel.runtimes.module; + +import org.eclipse.bpel.runtimes.module.BPELModuleFactoryDelegate; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.model.ModuleDelegate; +import org.eclipse.wst.server.core.model.ModuleFactoryDelegate; + +/** + * The purpose of this class is to redirect requests to locate an + * already-migrated project module. For example, if a project + * previously was of module-type jbt.bpel.module and has since been + * migrated properly, old servers may still search for a jbt.bpel.module + * module ID. + * + * This factory does not create any modules, but rather only returns + * new modules from the eclipse bpel factory when the server is requesting + * a legacy id. + */ +public class JBTBPELModuleFactoryDelegate extends ModuleFactoryDelegate { + public static final String FACTORY_ID = "org.jboss.tools.bpel.runtimes.module.moduleFactory"; + public static final String LEGACY_MODULE_TYPE = "jbt.bpel.module"; + + public JBTBPELModuleFactoryDelegate() { + super(); + } + + @Override + public ModuleDelegate getModuleDelegate(IModule module) { + return BPELModuleFactoryDelegate.factoryInstance().getModuleDelegate(module); + } + + @Override + public IModule[] getModules() { + return new IModule[]{}; + } + + @Override + public IModule findModule(String id) { + return BPELModuleFactoryDelegate.factoryInstance().findModule(id); + } +} \ No newline at end of file