Author: dennyxu Date: 2009-08-28 01:49:57 -0400 (Fri, 28 Aug 2009) New Revision: 17343 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/.project trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java Log: JBIDE-4831:New Deploy Descriptor wizard look up bepl files wrongly Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/.project =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/.project 2009-08-28 04:02:00 UTC (rev 17342) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/.project 2009-08-28 05:49:57 UTC (rev 17343) @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.bpel.apache.ode.deploy.ui</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.bpel.apache.ode.deploy.ui</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2009-08-28 04:02:00 UTC (rev 17342) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2009-08-28 05:49:57 UTC (rev 17343) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: ODE Deploy Descriptor UI Plug-in -Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.ui; singleton:=true +Bundle-Name: Riftsaw Deploy Descriptor UI Plug-in +Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.ui;singleton:=true Bundle-Version: 0.4.0.qualifier Bundle-Activator: org.eclipse.bpel.apache.ode.deploy.ui.Activator Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)", @@ -19,7 +19,9 @@ org.eclipse.core.databinding;bundle-version="[1.1.0,2.0.0)", org.eclipse.jface.databinding;bundle-version="[1.2.0,2.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)", - org.eclipse.bpel.ui;bundle-version="0.4.0" + org.eclipse.bpel.ui;bundle-version="0.4.0", + org.eclipse.jdt.core;bundle-version="3.5.0", + org.eclipse.wst.common.modulecore;bundle-version="1.1.300" Eclipse-LazyStart: true Bundle-Vendor: Eclipse.org Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2009-08-28 04:02:00 UTC (rev 17342) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2009-08-28 05:49:57 UTC (rev 17343) @@ -25,6 +25,7 @@ import org.eclipse.bpel.apache.ode.deploy.model.dd.ddFactory; import org.eclipse.bpel.model.Process; 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; @@ -38,6 +39,14 @@ import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragmentRoot; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.internal.core.JavaProject; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualResource; import org.eclipse.wst.wsdl.Definition; import org.eclipse.wst.wsdl.Port; import org.eclipse.wst.wsdl.Service; @@ -210,6 +219,7 @@ public static List<IFile> getAllFilesInProject(IProject project) { + final List<IFile> files = new ArrayList<IFile>(); IResourceVisitor visitor = new IResourceVisitor() { public boolean visit(org.eclipse.core.resources.IResource resource) throws org.eclipse.core.runtime.CoreException { @@ -220,15 +230,53 @@ } }; try { - project.accept(visitor); + IResource[] reses = getSourceContainers(project); + for(IResource res : reses){ + if(res instanceof IFolder){ + res.accept(visitor); + } + } } catch (CoreException e) { - // TODO Auto-generated catch block e.printStackTrace(); } return files; } + public static IResource[] getSourceContainers(IProject project) { + IJavaProject jProject = JavaCore.create(project); + if (jProject == null) + return new IResource[0]; + List list = new ArrayList(); + IVirtualComponent vc = ComponentCore.createComponent(project); + + IPackageFragmentRoot[] roots; + try { + roots = jProject.getPackageFragmentRoots(); + for (int i = 0; i < roots.length; i++) { + if (roots[i].getKind() != IPackageFragmentRoot.K_SOURCE) + continue; + IResource resource = roots[i].getResource(); + list.add(resource); +// if (null != resource) { +// IVirtualResource[] vResources = ComponentCore.createResources(resource); +// boolean found = false; +// for (int j = 0; !found && j < vResources.length; j++) { +// if (vResources[j].getComponent().equals(vc)) { +// if (!list.contains(roots[i])) +// list.add(roots[i]); +// found = true; +// } +// } +// } + } + } catch (JavaModelException e) { +// Logger.getLogger().logError(e); + } + return (IResource[]) list.toArray(new IResource[list.size()]); + } + + public static IFile getIFileForURI(URI uri) { if(uri == null) return null; Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2009-08-28 04:02:00 UTC (rev 17342) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2009-08-28 05:49:57 UTC (rev 17343) @@ -1,9 +1,18 @@ package org.eclipse.bpel.apache.ode.deploy.ui.wizards; +import java.io.File; + import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspaceDescription; +import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jface.dialogs.IDialogPage; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardPage; @@ -97,6 +106,7 @@ if (ssel.size() > 1) return; Object obj = ssel.getFirstElement(); + if (obj instanceof IResource) { IContainer container; if (obj instanceof IContainer) @@ -104,6 +114,24 @@ else container = ((IResource) obj).getParent(); containerText.setText(container.getFullPath().toString()); + } else if (obj instanceof IJavaElement) { + + IPath path = ((IJavaElement) obj).getPath(); + IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); + if (!(obj instanceof IJavaProject)) { + IFolder containerFolder = root.getFolder(path); + while (!containerFolder.exists()) { + obj = ((IJavaElement) obj).getParent(); + if (obj instanceof IJavaElement) { + path = ((IJavaElement) obj).getPath(); + containerFolder = root.getFolder(path); + } + + } + } + if (path != null) { + containerText.setText(path.toOSString()); + } } } }