[jbosstools-commits] JBoss Tools SVN: r25436 - in workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes: META-INF and 4 other directories.

Author: rob.stryker(a)jboss.com Date: 2010-10-04 03:11:21 -0400 (Mon, 04 Oct 2010) New Revision: 25436 Removed: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IRuntimesUIConstants.java workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/facets/ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployable.java workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactAdapterFactory.java workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleArtifact.java workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleDelegate.java workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/Messages.java workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/messages.properties workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/utils/ Modified: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 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/RuntimesPlugin.java 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/JBTBPELPublisher.java 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/BPELModuleLabelProvider.java Log: workspace progress for bpel migration planned for later Modified: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2010-10-04 07:11:21 UTC (rev 25436) @@ -27,14 +27,15 @@ org.eclipse.wst.web, org.jboss.ide.eclipse.as.core;resolution:=optional, org.jboss.ide.eclipse.archives.webtools;resolution:=optional, - org.jboss.tools.jmx.core;resolution:=optional, org.eclipse.wst.server.ui;resolution:=optional, - org.eclipse.ui.navigator + org.eclipse.ui.navigator, + org.jboss.ide.eclipse.as.ui;bundle-version="2.2.0", + org.jboss.ide.eclipse.as.wtp.ui;bundle-version="2.2.0", + org.eclipse.bpel.runtimes;bundle-version="0.5.0", + org.jboss.tools.jmx.core;bundle-version="1.2.0" Eclipse-LazyStart: true Export-Package: org.jboss.tools.bpel.runtimes, - org.jboss.tools.bpel.runtimes.facets, - org.jboss.tools.bpel.runtimes.module, - org.jboss.tools.bpel.runtimes.ui.wizards + org.jboss.tools.bpel.runtimes.module Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 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 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2010-10-04 07:11:21 UTC (rev 25436) @@ -13,31 +13,7 @@ <!--=========================================================================--> <plugin> - -<!--=========================================================================--> -<!-- New BPEL Project Wizard --> -<!--=========================================================================--> - <extension - point="org.eclipse.ui.newWizards"> - <wizard - name="%NEW_BPEL_PROJECT" - icon="icons/ctool16/new_bpelprj.gif" - category="org.eclipse.bpel.wizards" - project="true" - class="org.jboss.tools.bpel.runtimes.ui.wizards.NewBPELProjectWizard" - id="org.jboss.tools.bpel.runtimes.wizards.newBPELProject"> - <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"> - <page class="org.jboss.tools.bpel.runtimes.ui.wizards.BPELFacetInstallPage"/> - </wizard-pages> - </extension> - - <!--=========================================================================--> <!-- BPEL ModuleType --> <!--=========================================================================--> @@ -60,67 +36,6 @@ </extension> <!--=========================================================================--> -<!-- BPEL Facet --> -<!--=========================================================================--> - - <extension point="org.eclipse.wst.common.project.facet.core.facets"> - - <project-facet id="jbt.bpel.facet.core"> - <label>%BPEL_CORE_FACET_LABEL</label> - <description>%BPEL_CORE_FACET_DESCRIPTION</description> - </project-facet> - - <project-facet-version facet="jbt.bpel.facet.core" version="2.0"> - <group-member - id="modules"> - </group-member> - <constraint> - <and> - <conflicts group="modules"/> - </and> - </constraint> - </project-facet-version> - - <action facet="jbt.bpel.facet.core" version="2.0" type="INSTALL" id="bpel.facet.core.install"> - <delegate class="org.jboss.tools.bpel.runtimes.facets.BPELCoreFacetInstallDelegate"/> - <config-factory class="org.jboss.tools.bpel.runtimes.facets.BPELFacetInstallDataModelProvider"/> - </action> - - - <category id="bpel.category"> - <label>%BPEL_FACET_CATEGORY_LABEL</label> - <description>%bpelCoreFacetDescription</description> - </category> - - <template id="jbt.template.bpel.core"> - <label>%BPEL_FACET_TEMPLATE_LABEL</label> - <fixed facet="jbt.bpel.facet.core"/> - </template> - - </extension> - -<!--=========================================================================--> -<!-- BPEL Virtual Component --> -<!--=========================================================================--> - - <extension - point="org.eclipse.wst.common.modulecore.componentimpl"> - <componentimpl - typeID="jbt.bpel.facet.core" - class="org.jboss.tools.bpel.runtimes.facets.BPELVirtualComponent"> - </componentimpl> - </extension> - - -<!--=========================================================================--> -<!-- BPEL Facet Image --> -<!--=========================================================================--> - - <extension point="org.eclipse.wst.common.project.facet.ui.images"> - <image facet="jbt.bpel.facet.core" path="icons/obj16/bpelfacet.gif"/> - </extension> - -<!--=========================================================================--> <!-- BPEL Module Factory --> <!--=========================================================================--> @@ -137,57 +52,8 @@ </moduleFactory> </extension> -<!--=========================================================================--> -<!-- BPEL Module ArtifactAdapters --> -<!--=========================================================================--> - - <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"> - <enablement> - <with variable="selection"> - <adapt type="org.eclipse.core.resources.IProject"/> - </with> - </enablement> - </moduleArtifactAdapter> - <moduleArtifactAdapter - id="org.jboss.tools.bpel.runtimes.module.artifactAdapter2" - class="org.jboss.tools.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory"> - <enablement> - <with variable="selection"> - <adapt type="org.eclipse.core.resources.IFile"/> - </with> - </enablement> - </moduleArtifactAdapter> - </extension> <!--=========================================================================--> -<!-- BPEL Runtime Adapters --> -<!--=========================================================================--> - - <extension point="org.eclipse.core.runtime.adapters"> - <factory - class="org.jboss.tools.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory" - adaptableType="org.eclipse.core.resources.IProject"> - <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/> - </factory> - <factory - class="org.jboss.tools.bpel.runtimes.module.BPELDeployableArtifactAdapterFactory" - adaptableType="org.eclipse.core.resources.IFile"> - <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> - -<!--=========================================================================--> <!-- TO MAKE PROCESSES ACTUALLY LAUNCHABLE VIA RUN ON SERVER --> <!-- --> <!-- Implement org.eclipse.wst.server.core.clients in order to specify the --> @@ -263,5 +129,13 @@ </includes> </viewerContentBinding> </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> </plugin> Deleted: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IBPELModuleFacetConstants.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 University College London Software Systems Engineering - * All rights reserved. This program and the accompanying materials - * are 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: - * Bruno Wassermann - initial API and implementation - *******************************************************************************/ -package org.jboss.tools.bpel.runtimes; - -/** - * - * - * @author Bruno Wassermann, written Jun 29, 2006 - */ -public interface IBPELModuleFacetConstants { - - public final static String BPEL_CONTENT_FOLDER = "BPELFacetInstallDataModelProvider.contentRoot"; - public final static String BPEL_CONTENT_DEFAULT_FOLDER = "bpelContent"; - - - // module types - public final static String BPEL_MODULE_TYPE = "jbt.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$ - - // facet - public final static String BPEL_PROJECT_FACET = "jbt.bpel.facet.core"; //$NON-NLS-1$ - - // bpel file extension - public final static String BPEL_FILE_EXTENSION = "bpel"; //$NON-NLS-1$ - public final static String DOT_BPEL_FILE_EXTENSION = "." + BPEL_FILE_EXTENSION; //$NON-NLS-1$ - - // default content folder - public final static String BPEL_CONTENT = "bpelContent"; //$NON-NLS-1$ -} Deleted: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IRuntimesUIConstants.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IRuntimesUIConstants.java 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/IRuntimesUIConstants.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 University College London Software Systems Engineering - * All rights reserved. This program and the accompanying materials - * are 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: - * Bruno Wassermann - initial API and implementation - *******************************************************************************/ -package org.jboss.tools.bpel.runtimes; - -/** - * A bunch of constants for use by the UI elements of the runtimes plug-in. - * - * @author Bruno Wassermann, written Jun 30, 2006 - */ -public interface IRuntimesUIConstants { - - /* - * Icons - */ - - // Icons path - public final String ICON_PATH = "icons/"; //$NON-NLS-1$ - - // Wizard banner - public final String ICON_NEWPRJ_WIZARD_BANNER = "wizban/newprj_bpel_wiz_banner.gif"; //$NON-NLS-1$ - - // Facet icons - public final String ICON_BPEL_FACET = "obj/bpelfacet.gif"; //$NON-NLS-1$ - - // Workbench icons - public final String ICON_BPEL_PRJ = "obj16/prj_bpel.gif"; //$NON-NLS-1$ - - // New icons - public final String ICON_BPEL_NEW_PRJ = "ctool16/new_bpelprj.gif"; //$NON-NLS-1$ - - /* - * End of icons - */ - -} Modified: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/RuntimesPlugin.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/RuntimesPlugin.java 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/RuntimesPlugin.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -13,6 +13,7 @@ import java.net.MalformedURLException; import java.net.URL; +import org.eclipse.bpel.runtimes.IRuntimesUIConstants; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; Deleted: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployable.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployable.java 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployable.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -1,37 +0,0 @@ -package org.jboss.tools.bpel.runtimes.module; - -import org.eclipse.core.resources.IProject; -import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.web.internal.deployables.FlatComponentDeployable; - -public class BPELDeployable extends FlatComponentDeployable { - - public BPELDeployable(IProject project) { - super(project); - } - - public BPELDeployable(IProject project, IVirtualComponent aComponent) { - super(project, aComponent); - } - - @Override - public boolean shouldCache() { - return true; - } - - /* - * (non-Javadoc) - * @see org.eclipse.bpel.runtimes.module.FlatComponentDeployable#getParticipants() - */ - protected IFlattenParticipant[] getParticipants() { - /* - * No work really needs to be done here. The BPEL project - * doesn't need to map source in instead, it doesn't need to - * update a manifest file, it doesn't need to add in classpath dependencies, etc etc - * - * Just standard traversals as of now. - */ - return super.getParticipants(); - } -} Deleted: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactAdapterFactory.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactAdapterFactory.java 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactAdapterFactory.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 University College London Software Systems Engineering - * All rights reserved. This program and the accompanying materials - * are 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: - * Bruno Wassermann - initial API and implementation - *******************************************************************************/ -package org.jboss.tools.bpel.runtimes.module; - -import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.debug.ui.actions.ILaunchable; -import org.eclipse.wst.server.core.IModuleArtifact; -import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate; - -/** - * Preliminary implementation of <code>ModuleArtifactAdapterDelegate</code> - * and <code>I</code>for BPEL modules. - * - * @author Bruno Wassermann, written Aug 14, 2006 - */ -public class BPELDeployableArtifactAdapterFactory extends - ModuleArtifactAdapterDelegate implements IAdapterFactory -{ - - /** - * - */ - public BPELDeployableArtifactAdapterFactory() { - super(); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate#getModuleArtifact(java.lang.Object) - */ - @Override - public IModuleArtifact getModuleArtifact(Object obj) { - return null; // TODO FIX THIS - //return BPELDeployableArtifactUtil.getModuleObject(obj); - } - - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) - */ - public Object getAdapter(Object adaptableObject, Class adapterType) { - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() - */ - public Class[] getAdapterList() { - - // TODO replace ILaunchable with interface of BPEL module artifacts once available - return new Class[]{ILaunchable.class}; - } - -} Deleted: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELDeployableArtifactUtil.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -1,102 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 University College London Software Systems Engineering - * All rights reserved. This program and the accompanying materials - * are 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: - * Bruno Wassermann - initial API and implementation - *******************************************************************************/ -package org.jboss.tools.bpel.runtimes.module; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.jem.util.logger.proxy.Logger; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.server.core.IModuleArtifact; -import org.jboss.tools.bpel.runtimes.IBPELModuleFacetConstants; - -/** - * Utility to adapt an object (in this case an <code>IProject</code< or an - * <code>IFile</code>) toa <code>BPELModuleArtifact</code>. - * - * @author Bruno Wassermann, written Aug 14, 2006 - */ -public class BPELDeployableArtifactUtil { - - public BPELDeployableArtifactUtil() { - super(); - } - - /** - * Adapt an object to an <code>IModuleArtifact</code> - * - * @param obj - * @return <code>IModuleArtifact</code> - */ - public static IModuleArtifact getModuleObject(Object obj) { - if (obj instanceof IProject) { - return getModuleObject((IProject) obj); - } - - if (obj instanceof IFile) { - return getModuleObject((IFile) obj); - } - - return null; - } - - protected static IModuleArtifact getModuleObject(IProject project) { - return null; - } - - protected static IModuleArtifact getModuleObject(IFile file) { - // TODO implement; last impl was totally wrong -// BPELModuleDelegate moduleDelegate = new BPELModuleDelegate(file.getProject(), file); -// IStatus fileStatus = moduleDelegate.validate(); -// -// if (IStatus.OK != fileStatus.getCode()) return null; // not a valid BPEL file -// -// IModule[] modules = ServerUtil.getModules(IBPELModuleFacetConstants.BPEL_MODULE_TYPE); -// -// for (int i=0; i<modules.length; i++) { -// -// if (modules[i].getProject().equals(file.getProject()) -// && modules[i].getName().equals(file.getName())) -// { -// return new BPELModuleArtifact(modules[i], file); -// } -// } - return null; - } - - /* - * TODO in case fixed BPEL facet is not set anymore, may be able to set - * the facet programmatically as a fix for the time being - * - * TODO figure out new plugin.xml syntax for fixed facet from dynamic web - * project - * - * TODO this is a duplicate method (BPELModuleFactory.getVersion()). - * Replace this with a utility method somewhere. - */ - private static String getVersion(IProject project) { - IFacetedProject facetedProject = null; - try { - facetedProject = ProjectFacetsManager.create(project); - if (facetedProject != null - && ProjectFacetsManager.isProjectFacetDefined(IBPELModuleFacetConstants.BPEL_PROJECT_FACET)) - { - IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IBPELModuleFacetConstants.BPEL_PROJECT_FACET); - - return facetedProject.getInstalledVersion(projectFacet).getVersionString(); - } - } catch (Exception e) { - Logger.getLogger().write(e); - } - return IBPELModuleFacetConstants.BPEL20_VERSION; - } -} Deleted: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleArtifact.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleArtifact.java 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleArtifact.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 University College London Software Systems Engineering - * All rights reserved. This program and the accompanying materials - * are 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: - * Bruno Wassermann - initial API and implementation - *******************************************************************************/ -package org.jboss.tools.bpel.runtimes.module; - -import org.eclipse.core.resources.IFile; -import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.IModuleArtifact; - -/** - * Representing a simple BPEL module as an <code>IModuleArtifact</code>. Not - * sure at this stage what is needed to actually launch deployed BPEL process, - * so this implementation is going to change considerably in the near future. - * - * @author Bruno Wassermann, written Aug 14, 2006 - */ -public class BPELModuleArtifact implements IModuleArtifact { - - private IModule module; - private IFile file; - - /** - * Constructor accepting module and corresponding bpel file. - * - * @param module <code>IModule</code> - * @param file <code>IFile</code> the corresponding bpel file - */ - public BPELModuleArtifact(IModule module, IFile file) { - super(); - this.module = module; - this.file = file; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.server.core.IModuleArtifact#getModule() - */ - public IModule getModule() { - return module; - } - - public IFile getFile() { - return file; - } - - /** - * @see Object#toString() - */ - @Override - public String toString() { - return "BPELModuleArtifact [module=" + module + "]"; - } - -} Deleted: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleDelegate.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleDelegate.java 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleDelegate.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -1,58 +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 java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.internal.resources.Folder; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceVisitor; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.model.IModuleFile; -import org.eclipse.wst.server.core.model.IModuleFolder; -import org.eclipse.wst.server.core.model.IModuleResource; -import org.eclipse.wst.server.core.model.ModuleDelegate; -import org.eclipse.wst.server.core.util.ModuleFile; -import org.eclipse.wst.server.core.util.ModuleFolder; -import org.eclipse.wst.server.core.util.ProjectModule; -import org.jboss.ide.eclipse.as.wtp.core.modules.JBTProjectModuleDelegate; -import org.jboss.tools.bpel.runtimes.IBPELModuleFacetConstants; -import org.jboss.tools.bpel.runtimes.RuntimesPlugin; - -public class BPELModuleDelegate extends JBTProjectModuleDelegate { - - public BPELModuleDelegate(IProject project) { - super(project); - } - - @Override - protected String getFactoryId() { - return BPELModuleFactoryDelegate.FACTORY_ID; - } - - public IModule[] getModules() { - return new IModule[]{}; - } - - public boolean isBinary() { - return false; - } -} Modified: 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 06:42:25 UTC (rev 25435) +++ 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) @@ -10,164 +10,41 @@ ******************************************************************************/ package org.jboss.tools.bpel.runtimes.module; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.StructureEdit; -import org.eclipse.wst.common.componentcore.internal.util.FacetedProjectUtilities; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.internal.ModuleFactory; -import org.eclipse.wst.server.core.internal.ServerPlugin; import org.eclipse.wst.server.core.model.ModuleDelegate; -import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate; -import org.eclipse.wst.web.internal.deployables.FlatComponentDeployable; -import org.jboss.tools.bpel.runtimes.IBPELModuleFacetConstants; +import org.eclipse.wst.server.core.model.ModuleFactoryDelegate; -public class BPELModuleFactoryDelegate extends ProjectModuleFactoryDelegate implements IResourceChangeListener { - protected Map <IModule, FlatComponentDeployable> moduleDelegates = new HashMap<IModule, FlatComponentDeployable>(5); - +/** + * 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 MODULE_TYPE = IBPELModuleFacetConstants.BPEL_MODULE_TYPE; - public static BPELModuleFactoryDelegate FACTORY; - public static BPELModuleFactoryDelegate factoryInstance() { - if( FACTORY == null ) { - ensureFactoryLoaded(FACTORY_ID); - } - return FACTORY; - } - public static void ensureFactoryLoaded(String factoryId) { - ModuleFactory[] factories = ServerPlugin.getModuleFactories(); - for( int i = 0; i < factories.length; i++ ) { - if( factories[i].getId().equals(factoryId)) { - factories[i].getDelegate(new NullProgressMonitor()); - } - } - } + public static final String LEGACY_MODULE_TYPE = "jbt.bpel.module"; public BPELModuleFactoryDelegate() { super(); } + @Override - public void initialize() { - super.initialize(); - if( getId().equals(FACTORY)) - FACTORY = this; - ResourcesPlugin.getWorkspace().addResourceChangeListener(this); - } - - @Override - protected IModule[] createModules(IProject project) { - IVirtualComponent component = ComponentCore.createComponent(project); - if(component != null) - return createModuleDelegates(component); + public ModuleDelegate getModuleDelegate(IModule module) { return null; } - @Override - public ModuleDelegate getModuleDelegate(IModule module) { - if (module == null) - return null; - - ModuleDelegate md = moduleDelegates.get(module); -// if( md == null && ((Module)module).getInternalId().startsWith(BINARY_PREFIX)) -// return createDelegate(module); - - if (md == null) { - createModules(module.getProject()); - md = moduleDelegates.get(module); - } - return md; + public IModule[] getModules() { + return new IModule[]{}; } - - protected boolean canHandleProject(IProject p) { - return FacetedProjectUtilities.isProjectOfType(p, IBPELModuleFacetConstants.BPEL_PROJECT_FACET); - } - protected IModule[] createModuleDelegates(IVirtualComponent component) { - if(component == null){ - return null; - } - - List<IModule> projectModules = new ArrayList<IModule>(); - try { - if (canHandleProject(component.getProject())) { - String type = IBPELModuleFacetConstants.BPEL_MODULE_TYPE; - String version = IBPELModuleFacetConstants.BPEL20_VERSION; - IModule module = createModule(component.getName(), component.getName(), type, version, component.getProject()); - FlatComponentDeployable moduleDelegate = createModuleDelegate(component.getProject(), component); - moduleDelegates.put(module, moduleDelegate); - projectModules.add(module); - } else { - return null; - } - } catch (Exception e) { -// e.printStackTrace(); -// J2EEPlugin.logError(e); - } - return projectModules.toArray(new IModule[projectModules.size()]); - } - - protected FlatComponentDeployable createModuleDelegate(IProject project, IVirtualComponent component) { - return new BPELDeployable(project, component); - } - - /** - * Returns the list of resources that the module should listen to for state - * changes. The paths should be project relative paths. Subclasses can - * override this method to provide the paths. - * - * @return a possibly empty array of paths - */ @Override - protected IPath[] getListenerPaths() { - return new IPath[] { new Path(".project"), // nature //$NON-NLS-1$ - new Path(StructureEdit.MODULE_META_FILE_NAME), // component - new Path(".settings/org.eclipse.wst.common.project.facet.core.xml") // facets //$NON-NLS-1$ - }; + public IModule findModule(String id) { + return null; } - - @Override - protected void clearCache(IProject project) { - super.clearCache(project); - List<IModule> modulesToRemove = null; - for (Iterator<IModule> iterator = moduleDelegates.keySet().iterator(); iterator.hasNext();) { - IModule module = iterator.next(); - if (module.getProject().equals(project)) { - if (modulesToRemove == null) { - modulesToRemove = new ArrayList<IModule>(); - } - modulesToRemove.add(module); - } - } - if (modulesToRemove != null) { - for (IModule module : modulesToRemove) { - moduleDelegates.remove(module); - } - } - } - - public void resourceChanged(IResourceChangeEvent event) { - cleanAllDelegates(); - } - - protected void cleanAllDelegates() { - Iterator<FlatComponentDeployable> i = moduleDelegates.values().iterator(); - while(i.hasNext()) { - i.next().clearCache(); - } - modulesChanged(); - } } \ No newline at end of file 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 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -20,6 +20,7 @@ import java.util.Calendar; import java.util.Iterator; +import org.eclipse.bpel.runtimes.IBPELModuleFacetConstants; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -47,7 +48,6 @@ import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.IWTPConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; -import org.jboss.tools.bpel.runtimes.IBPELModuleFacetConstants; import org.jboss.tools.jmx.core.IMemento; import org.jboss.tools.jmx.core.util.XMLMemento; @@ -71,7 +71,7 @@ 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.BPEL_MODULE_TYPE)) + && module[module.length-1].getModuleType().getId().equals(IBPELModuleFacetConstants.BPEL20_MODULE_TYPE)) return true; return false; } Deleted: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/Messages.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/Messages.java 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/Messages.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 University College London Software Systems Engineering - * All rights reserved. This program and the accompanying materials - * are 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: - * Bruno Wassermann - initial API and implementation - *******************************************************************************/ -package org.jboss.tools.bpel.runtimes.module; - -import org.eclipse.osgi.util.NLS; - -/** - * Module-related messages. - * - * @author Bruno Wassermann, written 17 Jul 2006 - */ -public class Messages extends NLS { - - private static final String BUNDLE_NAME = "org.jboss.tools.bpel.runtimes.module.messages"; //$NON-NLS-1$ - - private Messages() { - } - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - // module validation - public static String InvalidFileExtension; -} Deleted: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/messages.properties =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/messages.properties 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/messages.properties 2010-10-04 07:11:21 UTC (rev 25436) @@ -1 +0,0 @@ -InvalidFileExtension=BPEL module file resource must end with bpel file extension. 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 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleContentProvider.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -1,12 +1,12 @@ package org.jboss.tools.bpel.runtimes.ui.view.server; +import org.eclipse.bpel.runtimes.IBPELModuleFacetConstants; import org.eclipse.core.resources.IProject; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; 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.IBPELModuleFacetConstants; import org.jboss.tools.bpel.runtimes.module.JBTBPELPublisher; public class BPELModuleContentProvider implements ITreeContentProvider { @@ -18,7 +18,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.BPEL_MODULE_TYPE)) { + if( mod != null && typeId.equals(IBPELModuleFacetConstants.BPEL20_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: workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleLabelProvider.java =================================================================== --- workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleLabelProvider.java 2010-10-04 06:42:25 UTC (rev 25435) +++ workspace/rstryker/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleLabelProvider.java 2010-10-04 07:11:21 UTC (rev 25436) @@ -1,9 +1,9 @@ package org.jboss.tools.bpel.runtimes.ui.view.server; +import org.eclipse.bpel.runtimes.IRuntimesUIConstants; import org.eclipse.core.runtime.Path; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; -import org.jboss.tools.bpel.runtimes.IRuntimesUIConstants; import org.jboss.tools.bpel.runtimes.RuntimesPlugin; import org.jboss.tools.bpel.runtimes.ui.view.server.BPELModuleContentProvider.BPELVersionDeployment;