Author: Grid.Qian Date: 2010-09-15 03:08:37 -0400 (Wed, 15 Sep 2010) New Revision: 24927 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/wizards/ODEDeployWizardPage.java trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java Log: commit for JBIDE-6588 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 2010-09-15 05:44:17 UTC (rev 24926) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-09-15 07:08:37 UTC (rev 24927) @@ -44,6 +44,9 @@ import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.ModuleCoreNature; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.wsdl.Definition; import org.eclipse.wst.wsdl.Port; import org.eclipse.wst.wsdl.Service; @@ -247,7 +250,7 @@ } }; try { - IResource[] reses = project.getFolder("bpelContent").members(); + IResource[] reses = project.getFolder(getWebContentRootPath(project)).members(); for (IResource res : reses) { res.accept(visitor); @@ -359,4 +362,19 @@ } return false; } + + public static IPath getWebContentRootPath(IProject project) { + if (project == null) + return null; + + if (!ModuleCoreNature.isFlexibleProject(project)) + return null; + + IPath path = null; + IVirtualComponent component = ComponentCore.createComponent(project); + if (component != null && component.exists()) { + path = component.getRootFolder().getProjectRelativePath(); + } + return path; + } } 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 2010-09-15 05:44:17 UTC (rev 24926) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2010-09-15 07:08:37 UTC (rev 24927) @@ -2,6 +2,7 @@ import java.io.File; +import org.eclipse.bpel.apache.ode.deploy.ui.util.DeployUtils; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -111,7 +112,7 @@ if (obj instanceof IResource) { IProject project; project = ((IResource) obj).getProject(); - IContainer bpelContent = project.getFolder("bpelContent"); + IContainer bpelContent = project.getFolder(DeployUtils.getWebContentRootPath(project)); if (bpelContent != null) { containerText.setText(bpelContent.getFullPath().toString()); } else { Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-09-15 05:44:17 UTC (rev 24926) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-09-15 07:08:37 UTC (rev 24927) @@ -28,7 +28,10 @@ org.eclipse.wst.xsd.ui, org.eclipse.wst.wsdl.ui, org.eclipse.wst.xml.ui, - org.eclipse.ui.console;bundle-version="3.5.0" + org.eclipse.ui.console;bundle-version="3.5.0", + org.eclipse.wst.common.modulecore, + org.eclipse.wst.common.emfworkbench.integration, + org.eclipse.jem.util Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.bpel.ui, org.eclipse.bpel.ui.actions, Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java 2010-09-15 05:44:17 UTC (rev 24926) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/ImportsSection.java 2010-09-15 07:08:37 UTC (rev 24927) @@ -360,7 +360,7 @@ if (result.length < 1) { return; } - + AddImportCommand cmd = new AddImportCommand(BPELUtils .getProcess(getInput()), result[0]); if (cmd.canDoExecute() && cmd.wouldCreateDuplicateImport() == false) { Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-09-15 05:44:17 UTC (rev 24926) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-09-15 07:08:37 UTC (rev 24927) @@ -20,6 +20,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IPath; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.swt.widgets.Display; @@ -30,6 +31,9 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.ModuleCoreNature; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; /** * Wizard for the new process template. @@ -220,7 +224,7 @@ project = container.getProject(); } if (project != null) { - IContainer bpelContent = project.getFolder("bpelContent"); + IContainer bpelContent = project.getFolder(getWebContentRootPath(project)); if (bpelContent != null) { return bpelContent; } @@ -228,6 +232,21 @@ return null; } + static IPath getWebContentRootPath(IProject project) { + if (project == null) + return null; + + if (!ModuleCoreNature.isFlexibleProject(project)) + return null; + + IPath path = null; + IVirtualComponent component = ComponentCore.createComponent(project); + if (component != null && component.exists()) { + path = component.getRootFolder().getProjectRelativePath(); + } + return path; + } + /** * * Final condition for the wizard to finish