Author: dennyxu Date: 2008-11-13 23:50:46 -0500 (Thu, 13 Nov 2008) New Revision: 11777 Added: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java Removed: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDeployable.java Log: JBIDE-3192: ESB deployment doesn't pick up all classes Deleted: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDeployable.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDeployable.java 2008-11-14 03:35:58 UTC (rev 11776) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDeployable.java 2008-11-14 04:50:46 UTC (rev 11777) @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 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.esb.core.module; - -import org.eclipse.core.resources.IProject; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -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.IModule; -import org.eclipse.wst.web.internal.deployables.ComponentDeployable; -import org.jboss.tools.esb.core.ESBProjectConstant; - -public class JBossESBModuleDeployable extends ComponentDeployable { - - public JBossESBModuleDeployable(IProject project, IVirtualComponent component) { - super(project); - } - - - public String getURI(IModule module) { - IVirtualComponent comp = ComponentCore.createComponent(module.getProject()); - String aURI = null; - if (comp !=null) { - if (!comp.isBinary() && isProjectOfType(module.getProject(),ESBProjectConstant.ESB_PROJECT_FACET)) { - IVirtualReference ref = component.getReference(comp.getName()); - aURI = ref.getRuntimePath().append(comp.getName()+".esb").toString(); //$NON-NLS-1$ - } - } - - if (aURI !=null && aURI.length()>1 && aURI.startsWith("/")) //$NON-NLS-1$ - aURI = aURI.substring(1); - return aURI; - } - - public String getVersion() { - IFacetedProject facetedProject = null; - try { - facetedProject = ProjectFacetsManager.create(component.getProject()); - if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(ESBProjectConstant.ESB_PROJECT_FACET)) { - IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET); - return facetedProject.getInstalledVersion(projectFacet).getVersionString(); - } - } catch (Exception e) { - //Ignore - } - return "4.2"; //$NON-NLS-1$ - } - - -} Added: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java 2008-11-14 04:50:46 UTC (rev 11777) @@ -0,0 +1,48 @@ +package org.jboss.tools.esb.core.module; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +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.IModule; +import org.eclipse.wst.server.core.model.ModuleDelegate; +import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate; +import org.jboss.tools.esb.core.ESBProjectConstant; +import org.jboss.tools.esb.core.ESBProjectCorePlugin; + +public class JBossESBModuleFactory extends ProjectModuleFactoryDelegate { + + public JBossESBModuleFactory() { + } + + @Override + public ModuleDelegate getModuleDelegate(IModule module) { + if(module instanceof JBossESBModule){ + IProject project = module.getProject(); + return new JBossESBModuleDelegate(project); + } + return null; + } + + protected IModule[] createModules(IProject project) { + IFacetedProject facetProject; + try { + facetProject = ProjectFacetsManager.create(project); + if (facetProject == null) { + return null; + } + IProjectFacet esbFacet = ProjectFacetsManager.getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET); + + if(facetProject.hasProjectFacet(esbFacet)){ + JBossESBModule module = new JBossESBModule(project, this, this.getId()); + return new IModule[]{ module }; + } + } catch (CoreException e) { + ESBProjectCorePlugin.getDefault().getLog().log(e.getStatus()); + } + return null; + + } + +}