[jbosstools-commits] JBoss Tools SVN: r35892 - in branches/jbosstools-3.3.0.M4/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers and 1 other directory.
Author: rob.stryker(a)jboss.com
Date: 2011-10-21 05:12:36 -0400 (Fri, 21 Oct 2011)
New Revision: 35892
Modified:
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
Log:
JBIDE-9711 - osgi project deployment errors for m4
Modified:
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java
===================================================================
---
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java 2011-10-21
08:50:05 UTC (rev 35891)
+++
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java 2011-10-21
09:12:36 UTC (rev 35892)
@@ -5,6 +5,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.pde.core.plugin.PluginRegistry;
import org.eclipse.pde.internal.core.exports.FeatureExportInfo;
import org.eclipse.pde.internal.core.exports.PluginExportOperation;
@@ -39,6 +40,9 @@
IDeployableServer server2 = ServerConverter.getDeployableServer(server);
IPath destination = PublishUtil.getDeployPath(method, module, server2);
String remoteTempDeployRoot = getDeployRoot(module,
ServerConverter.getDeployableServer(server));
+ if( new Path(remoteTempDeployRoot).toFile().exists())
+ new Path(remoteTempDeployRoot).toFile().mkdirs();
+
IPath presumedSourcePath = PublishUtil.getDeployPath(module, remoteTempDeployRoot,
server2);
String name = presumedSourcePath.lastSegment();
IPath realSourcePathFolder =
presumedSourcePath.removeLastSegments(1).append("plugins"); //$NON-NLS-1$
Modified:
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
---
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-10-21
08:50:05 UTC (rev 35891)
+++
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-10-21
09:12:36 UTC (rev 35892)
@@ -263,6 +263,8 @@
suffix = ""; //$NON-NLS-1$
else if( "jst.jboss.sar".equals(type)) //$NON-NLS-1$
suffix = IWTPConstants.EXT_SAR;
+ if( suffix == null )
+ suffix = IWTPConstants.EXT_JAR;
return suffix;
}