From 4aab60f8fd5d0c5b30a4212844be28024b1f05c9 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 17 Aug 2006 09:23:32 +0000
Subject: [PATCH] Move Mutex to rse.services/src, set compliance to J2SE-1.4
---
.../.settings/org.eclipse.jdt.core.prefs | 4 +-
.../services/ssh/files/SftpFileService.java | 1 +
.../org.eclipse.rse.services/.classpath | 4 +-
rse/plugins/org.eclipse.rse.services/.options | 1 +
.../.settings/org.eclipse.jdt.core.prefs | 8 ++++
.../.settings/org.eclipse.jdt.ui.prefs | 7 +++
.../META-INF/MANIFEST.MF | 1 +
.../org/eclipse/rse/services/Activator.java | 43 ++++++++++++++++++-
.../src/org/eclipse/rse/services}/Mutex.java | 4 +-
9 files changed, 65 insertions(+), 8 deletions(-)
create mode 100644 rse/plugins/org.eclipse.rse.services/.options
create mode 100644 rse/plugins/org.eclipse.rse.services/.settings/org.eclipse.jdt.core.prefs
create mode 100644 rse/plugins/org.eclipse.rse.services/.settings/org.eclipse.jdt.ui.prefs
rename rse/plugins/{org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files => org.eclipse.rse.services/src/org/eclipse/rse/services}/Mutex.java (98%)
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.rse.services.ssh/.settings/org.eclipse.jdt.core.prefs
index 18f0a1b35e2..c4268e6c868 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/.settings/org.eclipse.jdt.core.prefs
+++ b/rse/plugins/org.eclipse.rse.services.ssh/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
#Fri Jul 07 11:19:10 CEST 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java
index 9e717c50281..efa332dd5cc 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java
+++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java
@@ -33,6 +33,7 @@ import com.jcraft.jsch.Session;
import com.jcraft.jsch.SftpATTRS;
import com.jcraft.jsch.SftpProgressMonitor;
+import org.eclipse.rse.services.Mutex;
import org.eclipse.rse.services.clientserver.NamePatternMatcher;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.services.files.AbstractFileService;
diff --git a/rse/plugins/org.eclipse.rse.services/.classpath b/rse/plugins/org.eclipse.rse.services/.classpath
index e2ec6637df2..cffa600eb8b 100644
--- a/rse/plugins/org.eclipse.rse.services/.classpath
+++ b/rse/plugins/org.eclipse.rse.services/.classpath
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/rse/plugins/org.eclipse.rse.services/.options b/rse/plugins/org.eclipse.rse.services/.options
new file mode 100644
index 00000000000..128d2c41851
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services/.options
@@ -0,0 +1 @@
+org.eclipse.rse.services/debug = true
diff --git a/rse/plugins/org.eclipse.rse.services/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.rse.services/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c4268e6c868
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Fri Jul 07 11:19:10 CEST 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/rse/plugins/org.eclipse.rse.services/.settings/org.eclipse.jdt.ui.prefs b/rse/plugins/org.eclipse.rse.services/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..07346397cae
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,7 @@
+#Fri Jul 07 11:19:10 CEST 2006
+eclipse.preferences.version=1
+internal.default.compliance=user
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;org.eclipse.rse;
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
diff --git a/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
index 9a4395cc816..aa28e323493 100644
--- a/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@ Export-Package: org.eclipse.rse.services,
org.eclipse.rse.services.processes,
org.eclipse.rse.services.search,
org.eclipse.rse.services.shells
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Activator.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Activator.java
index cd1f00da69f..b6833c4daec 100644
--- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Activator.java
+++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Activator.java
@@ -16,8 +16,13 @@
package org.eclipse.rse.services;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
import org.osgi.framework.BundleContext;
@@ -72,5 +77,41 @@ public class Activator extends Plugin {
IStatus status = new Status(IStatus.ERROR, id, 0, "Unexpected exception", t);
log.log(status);
}
-
+
+ //----------------------------------------------------
+
+ private static Boolean fTracingOn = null;
+ public static boolean isTracingOn() {
+ if (fTracingOn==null) {
+ String id = plugin.getBundle().getSymbolicName();
+ String val = Platform.getDebugOption(id + "/debug"); //$NON-NLS-1$
+ if ("true".equals(val)) { //$NON-NLS-1$
+ fTracingOn = Boolean.TRUE;
+ } else {
+ fTracingOn = Boolean.FALSE;
+ }
+ }
+ return fTracingOn.booleanValue();
+ }
+ public static String getTimestamp() {
+ try {
+ DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); //$NON-NLS-1$
+ return formatter.format(new Date());
+ } catch (Exception e) {
+ // If there were problems writing out the date, ignore and
+ // continue since that shouldn't stop us from logging the rest
+ // of the information
+ }
+ return Long.toString(System.currentTimeMillis());
+ }
+ public static void trace(String msg) {
+ if (isTracingOn()) {
+ String fullMsg = getTimestamp() + " | " + Thread.currentThread().getName() + " | " + msg; //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println(fullMsg);
+ System.out.flush();
+ }
+ }
+
+ //---------------------------------------------------
+
}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/Mutex.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Mutex.java
similarity index 98%
rename from rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/Mutex.java
rename to rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Mutex.java
index b9d996779d1..60816c069db 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/Mutex.java
+++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Mutex.java
@@ -9,7 +9,7 @@
* Martin Oberhuber (Wind River) - initial API and implementation
*******************************************************************************/
-package org.eclipse.rse.services.ssh.files;
+package org.eclipse.rse.services;
import java.util.Iterator;
import java.util.LinkedList;
@@ -17,8 +17,6 @@ import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.services.ssh.Activator;
-
/**
* A Mutual Exclusion Lock for Threads that need to access a resource
* in a serialized manner.