10:20 a.m.
Author: bbrodt
Date: 2011-10-10 11:20:49 -0400 (Mon, 10 Oct 2011)
New Revision: 35514
Added:
trunk/bpel/.project
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
Log:
Merge workspace/bbrodt/o.j.t.bpel.runtimes with trunk/bpel - see
https://issues.jboss.org/browse/JBDS-1810
Added: trunk/bpel/.project
===================================================================
--- trunk/bpel/.project (rev 0)
+++ trunk/bpel/.project 2011-10-10 15:20:49 UTC (rev 35514)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.bpel-trunk</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2011-10-10 15:13:43 UTC
(rev 35513)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2011-10-10 15:20:49 UTC
(rev 35514)
@@ -32,12 +32,13 @@
<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>
+ -->
<!--=========================================================================-->
@@ -107,7 +108,8 @@
</and>
</constraint>
</project-facet-version>
-
+
+<!--
<action facet="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"/>
@@ -116,6 +118,7 @@
<action facet="bpel.facet.core" version="2.0"
type="UNINSTALL" id="bpel.facet.core.uninstall">
<delegate
class="org.jboss.tools.bpel.runtimes.facets.BPELCoreFacetUninstallDelegate"/>
</action>
+-->
<category id="bpel.category">
<label>%BPEL_FACET_CATEGORY_LABEL</label>
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java
===================================================================
---
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2011-10-10
15:13:43 UTC (rev 35513)
+++
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2011-10-10
15:20:49 UTC (rev 35514)
@@ -95,7 +95,7 @@
protected boolean canHandleProject(IProject p) {
// https://issues.jboss.org/browse/JBIDE-8533
// Added support for deprecated jbt.bpel.facet.core
- return FacetedProjectUtilities.isProjectOfType(p,
IBPELModuleFacetConstants.BPEL_PROJECT_FACET) ||
+ return //FacetedProjectUtilities.isProjectOfType(p,
IBPELModuleFacetConstants.BPEL_PROJECT_FACET) ||
FacetedProjectUtilities.isProjectOfType(p,
IBPELModuleFacetConstants.JBT_BPEL_PROJECT_FACET);
}
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
===================================================================
---
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2011-10-10
15:13:43 UTC (rev 35513)
+++
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2011-10-10
15:20:49 UTC (rev 35514)
@@ -72,7 +72,10 @@
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.BPEL_MODULE_TYPE)
||
+ module[module.length-1].getModuleType().getId().equals("bpel.module"))
+ )
return true;
return false;
}
@@ -104,17 +107,15 @@
// org.eclipse.wst.server.ui.internal.wizard.ModifyModulesWizard
// but there is no WizardFragment extension point for this class...
//
- if (status!=null) {
+ if (status!=null && !status.isOK()) {
final IStatus s = status;
- if (!s.isOK()) {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- MessageDialog.openWarning(Display.getDefault()
- .getActiveShell(), Messages.DeployError, s
- .getMessage());
- }
- });
- }
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ MessageDialog.openWarning(Display.getDefault()
+ .getActiveShell(), Messages.DeployError, s
+ .getMessage());
+ }
+ });
}
return status == null ? Status.OK_STATUS : status;
}
@@ -140,7 +141,7 @@
}
}
if (!hasDeployXML) {
- MultiStatus ms = new MultiStatus(JBossServerCorePlugin.PLUGIN_ID,
IEventCodes.JST_PUB_FULL_FAIL,
+ Status ms = new Status(IStatus.ERROR,JBossServerCorePlugin.PLUGIN_ID,
IEventCodes.JST_PUB_FULL_FAIL,
NLS.bind(Messages.MissingDeployXML, last.getName()), null);
return ms;
}