Attachment 114796 Details for Bug 250140 – updated patch to deal with compat issues with old IBM dstore server

[patch] updated patch to deal with compat issues with old IBM dstore server

patch.txt (text/plain), 13.54 KB, created by David McKnight

on 2008-10-10 10:19:45 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2008-10-10 10:19:45 EDT

Size: 13.54 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java,v
>retrieving revision 1.74
>diff -u -r1.74 DStoreFileService.java
>--- src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java	23 Jul 2008 19:01:56 -0000	1.74
>+++ src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java	10 Oct 2008 14:18:55 -0000
>@@ -48,6 +48,7 @@
>  * Martin Oberhuber (Wind River) - [235463][ftp][dstore] Incorrect case sensitivity reported on windows-remote
>  * David McKnight   (IBM)        - [236039][dstore][efs] DStoreInputStream can report EOF too early - clean up how it waits for the local temp file to be created
>  * David McKnight   (IBM)        - [240710] [dstore] DStoreFileService.getFile() fails with NPE for valid root files
>+ * David McKnight   (IBM)        - [250140] backport of Save conflict dialog appears when saving files in the editor
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.services.dstore.files;
>@@ -74,6 +75,7 @@
> import org.eclipse.dstore.core.model.DataStore;
> import org.eclipse.dstore.core.model.DataStoreAttributes;
> import org.eclipse.dstore.core.model.DataStoreResources;
>+import org.eclipse.dstore.core.model.DataStoreSchema;
> import org.eclipse.dstore.core.model.IDataStoreProvider;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
>@@ -195,8 +197,31 @@
> 		return IUniversalDataStoreConstants.UNIVERSAL_FILESYSTEM_MINER_ID;
> 	}
> 
>-	protected String getByteStreamHandlerId()
>+	protected DataElement getMinerElement()
>+	{
>+		super.getMinerElement();
>+		if (_minerElement == null){
>+			// could be back-level version
>+			_minerElement = getMinerElement("com.ibm.etools.systems.universal.miners.UniversalFileSystemMiner"); //$NON-NLS-1$
>+		}
>+		return _minerElement;
>+	}
>+
>+	private boolean isOldIBMMiner()
> 	{
>+		if (_minerElement != null){
>+			return _minerElement.getSource().equals("com.ibm.etools.systems.universal.miners.UniversalFileSystemMiner"); //$NON-NLS-1$
>+		}
>+		return false;
>+	}
>+	
>+	protected String getByteStreamHandlerId()
>+	{	
>+		if (isOldIBMMiner())
>+		{
>+			// if so, use the old id
>+			return "com.ibm.etools.systems.universal.miners.UniversalByteStreamHandler"; //$NON-NLS-1$
>+		}
> 		return UniversalByteStreamHandler.class.getName();
> 	}
> 
>@@ -457,11 +482,27 @@
> 		boolean transferSuccessful = false;
> 
> 		long totalBytes = file.length();
>+		
>+		DataElement uploadLog = findUploadLog();
>+		String remotePath = remoteParent + getSeparator(remoteParent) + remoteFile;
>+		
>+		DataStore ds = getDataStore();
>+		DataElement result = ds.find(uploadLog, DE.A_NAME, remotePath,1);
>+		if (result == null) 
>+		{
>+			result = ds.createObject(uploadLog, "uploadstatus", remotePath);
>+			result.setAttribute(DE.A_SOURCE, "running");
>+			result.setAttribute(DE.A_VALUE, "");
>+			
>+			DataElement cmd = getDataStore().findCommandDescriptor(DataStoreSchema.C_SET);
>+			
>+			DataElement setstatus = ds.command(cmd, uploadLog, true);
>+		}
> 
> 		try
> 		{
> 			String byteStreamHandlerId = getByteStreamHandlerId();
>-			String remotePath = remoteParent + getSeparator(remoteParent) + remoteFile;
>+
> 
> 			// create an empty file and append data to it later
> 			// this handles the case of uploading empty files as well
>@@ -473,9 +514,6 @@
> 				//subMonitor = new SubProgressMonitor(monitor, (int)totalBytes);
> 			}
> 
>-
>-//			DataElement uploadLog = findUploadLog();
>-			findUploadLog();
> //			listener = new FileTransferStatusListener(remotePath, shell, monitor, getConnectorService(), ds, uploadLog);
> 	//		ds.getDomainNotifier().addDomainListener(listener);
> 
>@@ -583,6 +621,7 @@
> 
> 				available = bufInputStream.available();
> 			}
>+			
> 	//		if (listener.uploadHasFailed())
> 		//	{
> 		//		showUploadFailedMessage(listener, source);
>@@ -639,26 +678,18 @@
> 			{
> 			    if (transferSuccessful)
> 			    {
>-
>-
>-//					try
>-//					{
>-//						listener.waitForUpdate(null, 2);
>-//
>-//					}
>-//					catch (InterruptedException e)
>-//					{
>-//						UniversalSystemPlugin.logError(CLASSNAME + " InterruptedException while waiting for command", e);
>-//					}
>-
>+			    	String resultStr = result.getSource();
>+			    	while (!resultStr.equals("success"))
>+			    	{
>+			    		// sleep until the upload is complete
>+			    		try {
>+			    			Thread.sleep(200);
>+			    		}
>+			    		catch (InterruptedException e){			    			
>+			    		}
>+			    		resultStr = result.getSource();
>+			    	}
> 			    }
>-
>-				//ds.getDomainNotifier().removeDomainListener(listener);
>-
>-//				if (listener.uploadHasFailed())
>-//				{
>-//					showUploadFailedMessage(listener, source);
>-//				}
> 			}
> 		}
> 	}
>@@ -1130,8 +1161,25 @@
> 			de = getElementFor(name);
> 		}
> 		
>+		
> 		// with 207095, it's possible to get here unconnected such that there is no element
> 		if (de != null) {
>+			if (isOldIBMMiner()){
>+				// only accepts filters for file queries
>+				if (!de.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)){
>+					StringBuffer buf = new StringBuffer(remoteParent);
>+					String sep = getSeparator(remoteParent);
>+					if (sep.length()>0 && !remoteParent.endsWith(sep)) {
>+					    buf.append(sep);
>+					}
>+					buf.append(name);
>+					String fullPath = buf.toString();
>+					de.setAttribute(DE.A_NAME, fullPath);
>+					de.setAttribute(DE.A_VALUE, fullPath);
>+					de.setAttribute(DE.A_TYPE, IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR);
>+				}
>+			}
>+			
> 			dsQueryCommand(de, null,  IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT, monitor);
> 			//getFile call should also need to convert this DataElement into a HostFile using
> 			//convertToHostFile() call.  This way, this DataElement will be put into _fileMap.
>@@ -1152,9 +1200,25 @@
> 
> 		// construct default array of commands
> 		String[] queryStrings = new String[remoteParents.length];
>+		boolean oldMiner = isOldIBMMiner();
>+		
> 		for (int i = 0; i < queryStrings.length; i++)
> 		{
> 			queryStrings[i] = IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT;
>+			if (oldMiner){
>+				if (!subjects[i].getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)){
>+					StringBuffer buf = new StringBuffer(remoteParents[i]);
>+					String sep = getSeparator(remoteParents[i]);
>+					if (sep.length()>0 && !remoteParents[i].endsWith(sep)) {
>+					    buf.append(sep);
>+					}
>+					buf.append(names[i]);
>+					String fullPath = buf.toString();
>+					subjects[i].setAttribute(DE.A_NAME, fullPath);
>+					subjects[i].setAttribute(DE.A_VALUE, fullPath);
>+					subjects[i].setAttribute(DE.A_TYPE, IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR);
>+				}
>+			}
> 		}
> 
> 		dsQueryCommandMulti(subjects, null, queryStrings, monitor);
>#P org.eclipse.rse.files.ui
>Index: src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java,v
>retrieving revision 1.28
>diff -u -r1.28 SystemUniversalTempFileListener.java
>--- src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java	2 Jul 2008 15:01:50 -0000	1.28
>+++ src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java	10 Oct 2008 14:18:56 -0000
>@@ -23,6 +23,7 @@
>  * Kevin Doyle 		(IBM)		 - [204810] Saving file in Eclipse does not update remote file
>  * Kevin Doyle 		(IBM)		 - [210389] Display error dialog when setting file not read-only fails when saving
>  * David McKnight   (IBM)        - [235221] Files truncated on exit of Eclipse
>+ * David McKnight   (IBM)        - [250140] backport of Save conflict dialog appears when saving files in the editor
>  ********************************************************************************/
> 
> package org.eclipse.rse.files.ui.resources;
>@@ -302,12 +303,10 @@
> 				}
> 
> 				// waiting to make sure the file's timestamp is uptodate
>-				Thread.sleep(1000);
>+				remoteFile = waitForTimestampToBeUpToDate(remoteFile, monitor);
> 				
>-				// get the remote file object again so that we have a fresh remote timestamp
>-				remoteFile.markStale(true);
>-				remoteFile = fs.getRemoteFileObject(remoteFile.getAbsolutePath(), monitor);
> 				
>+							
> 				registry.fireEvent(new SystemResourceChangeEvent(remoteFile, ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE, remoteFile));
> 			
> 				long ts = remoteFile.getLastModified();
>@@ -374,4 +373,45 @@
> 			e.printStackTrace();
> 		}
> 	}
>+	
>+	private IRemoteFile waitForTimestampToBeUpToDate(IRemoteFile remoteFile, IProgressMonitor monitor)
>+	{
>+		IRemoteFileSubSystem fs = remoteFile.getParentRemoteFileSubSystem();
>+		String path = remoteFile.getAbsolutePath();
>+		long originalTimestamp = remoteFile.getLastModified();
>+		try {
>+			long timestamp = originalTimestamp;
>+
>+			boolean fileUpdated = false;
>+			boolean timestampChanging = true;
>+			
>+			while (timestampChanging || !fileUpdated){	// wait until the timestamp stops changing AND timestamp did change at least once		
>+				try {
>+					Thread.sleep(500); // sleep 
>+				}
>+				catch (InterruptedException e){				
>+				}
>+			
>+				// query the remote file again
>+				remoteFile.markStale(true);
>+				remoteFile = fs.getRemoteFileObject(path, monitor);
>+
>+				// what's the timestamp now?
>+				long nextTimestamp = remoteFile.getLastModified();		
>+
>+				timestampChanging = (timestamp != nextTimestamp);
>+
>+				if (!fileUpdated){	// indicate the file has changed if the timestamp has			
>+					fileUpdated = timestampChanging;
>+				}
>+				
>+				timestamp = nextTimestamp;
>+			}
>+		}
>+		catch (SystemMessageException e){
>+			
>+		}
>+		
>+		return remoteFile;
>+	}
> }
>\ No newline at end of file
>Index: src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java,v
>retrieving revision 1.18
>diff -u -r1.18 SystemUploadConflictAction.java
>--- src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java	2 Jul 2008 15:01:49 -0000	1.18
>+++ src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java	10 Oct 2008 14:18:57 -0000
>@@ -21,6 +21,7 @@
>  * David McKnight   (IBM)        - [224377] "open with" menu does not have "other" option
>  * Xuan Chen        (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
>  * David McKnight   (IBM)        - [235221] Files truncated on exit of Eclipse
>+ * David McKnight   (IBM)        - [250140] backport of Save conflict dialog appears when saving files in the editor
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.files.ui.actions;
>@@ -197,16 +198,12 @@
>             {
>             	IRemoteFileSubSystem fs = _remoteFile.getParentRemoteFileSubSystem();
>             	SystemIFileProperties properties = new SystemIFileProperties(_tempFile);
>+            	
>                 fs.upload(_tempFile.getLocation().makeAbsolute().toOSString(), _remoteFile, SystemEncodingUtil.ENCODING_UTF_8, monitor);
>+
>                 // wait for timestamp to update before re-fetching remote file
>-                try {
>-                	Thread.sleep(1000);
>-                }
>-                catch (Exception e){
>-                	
>-                }
>-                _remoteFile.markStale(true);
>-                _remoteFile = fs.getRemoteFileObject(_remoteFile.getAbsolutePath(), new NullProgressMonitor());
>+                _remoteFile = waitForTimestampToBeUpToDate(_remoteFile, monitor);
>+
>                 long ts = _remoteFile.getLastModified();
>                 properties.setRemoteFileTimeStamp(ts);
>                 properties.setDirty(false);
>@@ -222,6 +219,47 @@
>             }
>             return Status.OK_STATUS;
> 		}
>+		
>+		private IRemoteFile waitForTimestampToBeUpToDate(IRemoteFile remoteFile, IProgressMonitor monitor)
>+		{
>+			IRemoteFileSubSystem fs = remoteFile.getParentRemoteFileSubSystem();
>+			String path = remoteFile.getAbsolutePath();
>+			long originalTimestamp = remoteFile.getLastModified();
>+			try {
>+				long timestamp = originalTimestamp;
>+
>+				boolean fileUpdated = false;
>+				boolean timestampChanging = true;
>+				
>+				while (timestampChanging || !fileUpdated){	// wait until the timestamp stops changing AND timestamp did change at least once		
>+					try {
>+						Thread.sleep(500); // sleep 
>+					}
>+					catch (InterruptedException e){				
>+					}
>+				
>+					// query the remote file again
>+					remoteFile.markStale(true);
>+					remoteFile = fs.getRemoteFileObject(path, monitor);
>+
>+					// what's the timestamp now?
>+					long nextTimestamp = remoteFile.getLastModified();		
>+
>+					timestampChanging = (timestamp != nextTimestamp);
>+
>+					if (!fileUpdated){	// indicate the file has changed if the timestamp has			
>+						fileUpdated = timestampChanging;
>+					}
>+					
>+					timestamp = nextTimestamp;
>+				}
>+			}
>+			catch (SystemMessageException e){
>+				
>+			}
>+			
>+			return remoteFile;
>+		}		
> 	}
> 
> 	/**

Actions: View | Diff

Attachments on bug 250140: 114607 | 114795 | 114796 | 115398 | 115401 | 115408 | 115693 | 117341 | 117370