Author: dennyxu Date: 2009-08-19 04:49:39 -0400 (Wed, 19 Aug 2009) New Revision: 17148 Added: trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/BPELFacetProjectCreationDataModelProvider.java Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.runtimes/plugin.xml trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java Log: JBIDE-4787:Refactor BPEL project wizard and BPEL deployment Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2009-08-19 08:25:09 UTC (rev 17147) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2009-08-19 08:49:39 UTC (rev 17148) @@ -21,7 +21,8 @@ org.eclipse.bpel.model;bundle-version="0.4.0", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)", org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)", - javax.wsdl;bundle-version="[1.5.0,1.6.0)" + javax.wsdl;bundle-version="[1.5.0,1.6.0)", + org.eclipse.jst.common.frameworks;bundle-version="1.1.300" Eclipse-LazyStart: true Export-Package: org.eclipse.bpel.runtimes, org.eclipse.bpel.runtimes.facets, Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/plugin.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/plugin.xml 2009-08-19 08:25:09 UTC (rev 17147) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/plugin.xml 2009-08-19 08:49:39 UTC (rev 17148) @@ -78,6 +78,12 @@ <fixed facet="bpel.facet.core"> </fixed> + <fixed + facet="jst.utility"> + </fixed> + <fixed + facet="jst.java"> + </fixed> <!-- <fixed facet="bpel.facet.core"/>--> </template> @@ -101,10 +107,10 @@ projects="true" class="org.eclipse.bpel.runtimes.module.BPELModuleFactoryDelegate" id="org.eclipse.bpel.runtimes.module.moduleFactory"> - <moduleType + <!--moduleType versions="1.1, 2.0" types="bpel.module"> - </moduleType> + </moduleType--> </moduleFactory> </extension> Added: trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/BPELFacetProjectCreationDataModelProvider.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/BPELFacetProjectCreationDataModelProvider.java (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/BPELFacetProjectCreationDataModelProvider.java 2009-08-19 08:49:39 UTC (rev 17148) @@ -0,0 +1,30 @@ +package org.eclipse.bpel.runtimes.ui.wizards; + +import java.util.ArrayList; +import java.util.Collection; + +import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties; +import org.eclipse.jst.common.project.facet.JavaFacetUtils; +import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; + +public class BPELFacetProjectCreationDataModelProvider extends + FacetProjectCreationDataModelProvider { + + @Override + public void init() { + super.init(); + + Collection<IProjectFacet> requiredFacets = new ArrayList<IProjectFacet>(); + requiredFacets.add(JavaFacetUtils.JAVA_FACET); +// requiredFacets.add(IJ2EEFacetConstants.UTILITY_FACET); + setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets); + + FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP); + IDataModel javaFacet = map.getFacetDataModel(JavaFacetUtils.JAVA_FACET.getId()); + javaFacet.setStringProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, "bpel"); + } + + +} Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java 2009-08-19 08:25:09 UTC (rev 17147) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java 2009-08-19 08:49:39 UTC (rev 17148) @@ -16,7 +16,6 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.ui.INewWizard; -import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; @@ -68,7 +67,7 @@ * BPEL projects at this stage. May have to reconsider at some point and * build a BPELFacetProjectCreationDataModelProvider. */ - return DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider()); + return DataModelFactory.createDataModel(new BPELFacetProjectCreationDataModelProvider()); } /** @@ -102,8 +101,17 @@ */ @Override protected IWizardPage createFirstPage() { + return new NewBPELProjectWizardPage1(model, "newBPELProject"); // $NON-NLS-1$ } + + public IWizardPage getNextPage( final IWizardPage page ){ + if(page instanceof NewBPELProjectWizardPage1){ + return null; + } + return super.getNextPage(page); + } + } Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java 2009-08-19 08:25:09 UTC (rev 17147) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java 2009-08-19 08:49:39 UTC (rev 17148) @@ -13,6 +13,11 @@ import org.eclipse.bpel.runtimes.IBPELModuleFacetConstants; import org.eclipse.bpel.runtimes.IRuntimesUIConstants; import org.eclipse.bpel.runtimes.RuntimesPlugin; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.PlatformUI; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage; @@ -38,7 +43,18 @@ } protected String getModuleTypeID() { - return IBPELModuleFacetConstants.BPEL20_PROJECT_FACET; + return "";//IBPELModuleFacetConstants.BPEL20_PROJECT_FACET; } + protected Composite createTopLevelComposite(Composite parent) { + Composite top = new Composite(parent, SWT.NONE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(top, getInfopopID()); + top.setLayout(new GridLayout()); + top.setLayoutData(new GridData(GridData.FILL_BOTH)); + createProjectGroup(top); +// createServerTargetComposite(top); +// createPrimaryFacetComposite(top); +// createPresetPanel(top); + return top; + } }