Author: rob.stryker(a)jboss.com Date: 2011-10-21 02:09:16 -0400 (Fri, 21 Oct 2011) New Revision: 35884 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java Log: JBIDE-9711 - to trunk, default osgi suffix, and code if temp deploy folder is deleted to remake the dir Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java 2011-10-21 03:28:41 UTC (rev 35883) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java 2011-10-21 06:09:16 UTC (rev 35884) @@ -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: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-10-21 03:28:41 UTC (rev 35883) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-10-21 06:09:16 UTC (rev 35884) @@ -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; }