Author: rob.stryker(a)jboss.com Date: 2011-06-10 03:55:13 -0400 (Fri, 10 Jun 2011) New Revision: 32002 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java Log: JBIDE-8961 - error message for renameTo failing Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-06-10 07:48:52 UTC (rev 32001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-06-10 07:55:13 UTC (rev 32002) @@ -44,7 +44,7 @@ FullPublishFail=Full publish failed for module {0} IncrementalPublishFail=Incremental publish failed for module {0} -PublishRenameFailure=Error renaming {0} to {1} +PublishRenameFailure=Error renaming {0} to {1}. \n\nThis may be caused by your server's temporary deploy directory being on a different filesystem than the final destination.\n\nYou may adjust these settings in the server editor. DeleteModuleFail=Unable to delete module {0} DeleteModuleFail2=Some files were not removed from the server CountModifiedMembers={0} files modified in module {1} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2011-06-10 07:48:52 UTC (rev 32001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2011-06-10 07:55:13 UTC (rev 32002) @@ -58,15 +58,21 @@ // Publishing.JST public static final int JST_PUB_FULL_SUCCESS = JST_PUBLISHER_CODE | 1; - public static final int JST_PUB_FULL_FAIL = JST_PUBLISHER_CODE | 2; + public static final int JST_PUB_FULL_FAIL = JST_PUBLISHER_CODE | ISTATUS_CODE_ERROR | 2; public static final int JST_PUB_INC_SUCCESS = JST_PUBLISHER_CODE | 3; - public static final int JST_PUB_INC_FAIL = JST_PUBLISHER_CODE | 4; + public static final int JST_PUB_INC_FAIL = JST_PUBLISHER_CODE | ISTATUS_CODE_ERROR | 4; public static final int JST_PUB_REMOVE_SUCCESS = JST_PUBLISHER_CODE | 5; - public static final int JST_PUB_REMOVE_FAIL = JST_PUBLISHER_CODE | 6; - public static final int JST_PUB_COPY_BINARY_FAIL = JST_PUBLISHER_CODE | 7; - public static final int JST_PUB_FILE_DELETE_FAIL = JST_PUBLISHER_CODE | 8; - public static final int JST_PUB_ASSEMBLE_FAIL = JST_PUBLISHER_CODE | 9; + public static final int JST_PUB_REMOVE_FAIL = JST_PUBLISHER_CODE | ISTATUS_CODE_ERROR | 6; + public static final int JST_PUB_COPY_BINARY_FAIL = JST_PUBLISHER_CODE | ISTATUS_CODE_ERROR | 7; + public static final int JST_PUB_FILE_DELETE_FAIL = JST_PUBLISHER_CODE | ISTATUS_CODE_ERROR | 8; + public static final int JST_PUB_ASSEMBLE_FAIL = JST_PUBLISHER_CODE | ISTATUS_CODE_ERROR | 9; + //newer status codes + public static final int JST_PUB_SUCCESS = JST_PUBLISHER_CODE | 10; + public static final int JST_PUB_FAIL = JST_PUBLISHER_CODE | ISTATUS_CODE_ERROR | 11; + + + // Publishing.single public static final int SINGLE_FILE_SUCCESS_MASK = 0x1; public static final int SINGLE_FILE_TYPE_MASK = 0x2; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2011-06-10 07:48:52 UTC (rev 32001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2011-06-10 07:55:13 UTC (rev 32002) @@ -39,6 +39,7 @@ import org.eclipse.wst.server.core.model.IModuleResource; import org.eclipse.wst.server.core.model.IModuleResourceDelta; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher; import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; import org.jboss.ide.eclipse.as.core.util.ServerConverter; @@ -139,7 +140,7 @@ try { in = new FileInputStream(file); } catch (IOException e) { - return new IStatus[] {new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, + return new IStatus[] {new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, NLS.bind(Messages.errorReading, file.getAbsolutePath()), e)}; } IStatus ret = copyFile(in, deployRootFolder.append(relativePath), file.lastModified(), mf); @@ -164,7 +165,7 @@ return Status.OK_STATUS; } catch (Exception e) { //Trace.trace(Trace.SEVERE, "Error copying file", e); - return new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorCopyingFile, new String[] {to, e.getLocalizedMessage()}), e); + return new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, NLS.bind(Messages.errorCopyingFile, new String[] {to, e.getLocalizedMessage()}), e); } finally { try { if (in != null) @@ -195,7 +196,7 @@ throw e; } catch (Exception e) { IPath path = mf.getModuleRelativePath().append(mf.getName()); - return new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorCopyingFile, path.toOSString(), e.getLocalizedMessage()), null); + return new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, NLS.bind(Messages.errorCopyingFile, path.toOSString(), e.getLocalizedMessage()), null); } finally { if (tempFile != null && tempFile.exists()) tempFile.deleteOnExit(); @@ -245,14 +246,14 @@ } } if (!safeRename(tempFile, file, 10)) - throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, + throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_ASSEMBLE_FAIL, NLS.bind(org.jboss.ide.eclipse.as.core.Messages.PublishRenameFailure, tempFile.toString(), file.getAbsolutePath()), null)); } private void throwOnErrorStatus(File file, IStatus status) throws CoreException { if (!status.isOK()) { - MultiStatus status2 = new MultiStatus(ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorDeleting, file.toString()), null); + MultiStatus status2 = new MultiStatus(ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, NLS.bind(Messages.errorDeleting, file.toString()), null); status2.add(status); throw new CoreException(status2); } @@ -313,7 +314,7 @@ results = deleteDirectory(resource.toFile(), monitor); } else { if( !file.delete()) { - IStatus s = new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorDeleting, resource.toFile().getAbsolutePath()), null); + IStatus s = new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, NLS.bind(Messages.errorDeleting, resource.toFile().getAbsolutePath()), null); results = new IStatus[]{s}; } } @@ -330,7 +331,7 @@ */ private IStatus[] deleteDirectory(File dir, IProgressMonitor monitor) { if (!dir.exists() || !dir.isDirectory()) - return new IStatus[] { new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorNotADirectory, dir.getAbsolutePath()), null) }; + return new IStatus[] { new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, NLS.bind(Messages.errorNotADirectory, dir.getAbsolutePath()), null) }; List<IStatus> status = new ArrayList<IStatus>(2); @@ -346,7 +347,7 @@ File current = files[i]; if (current.isFile()) { if (!current.delete()) { - status.add(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorDeleting, files[i].getAbsolutePath()), null)); + status.add(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, NLS.bind(Messages.errorDeleting, files[i].getAbsolutePath()), null)); deleteCurrent = false; } monitor.worked(10); @@ -361,11 +362,11 @@ } } if (deleteCurrent && !dir.delete()) - status.add(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorDeleting, dir.getAbsolutePath()), null)); + status.add(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, NLS.bind(Messages.errorDeleting, dir.getAbsolutePath()), null)); monitor.done(); } catch (Exception e) { //Trace.trace(Trace.SEVERE, "Error deleting directory " + dir.getAbsolutePath(), e); - status.add(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, e.getLocalizedMessage(), null)); + status.add(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, e.getLocalizedMessage(), null)); } return status.toArray(new IStatus[status.size()]); @@ -506,7 +507,7 @@ IPath path2 = path.append(resource.getModuleRelativePath()).append(resource.getName()); IStatus[] stat = handler.deleteResource(path2, monitor); if( stat.length > 0 && !stat[0].isOK()) { - status.add(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorDeleting, path2), null)); + status.add(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, NLS.bind(Messages.errorDeleting, path2), null)); } }