From 6701ea687a9290f98fdcc117e58d30022d3e8e64 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 28 Apr 2006 17:44:57 +0000 Subject: [PATCH] classify and decorate using raw description --- rse/plugins/org.eclipse.rse.files.ui/plugin.xml | 15 +++++++++++---- .../miners/filesystem/FileClassifier.java | 6 ++++-- .../serverruntime/scripts/aix/auth.pl | 13 ++++++++++++- .../serverruntime/scripts/linux/auth.pl | 14 ++++++++++++-- .../serverruntime/scripts/unix/auth.pl | 12 +++++++++++- 5 files changed, 50 insertions(+), 10 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml index ce75c3a92ac..f59dc5cee8e 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml +++ b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml @@ -249,7 +249,7 @@ Contributors: - + @@ -264,9 +264,11 @@ Contributors: - - + + + + @@ -295,7 +297,12 @@ Contributors: - + + + + + + diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/FileClassifier.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/FileClassifier.java index afda370049b..6a70f400f3e 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/FileClassifier.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/FileClassifier.java @@ -402,7 +402,8 @@ public class FileClassifier extends Thread if (_systemSupportsClassFilesOnly) { return type; } - +/* DKM - let the client have the raw type instead of doing this for it + * boolean matchesLib = (fulltype.indexOf(STR_SHARED_OBJECT) > -1) || (fulltype.indexOf(STR_OBJECT_MODULE) > -1) || (fulltype.indexOf(STR_ARCHIVE) > -1); boolean matchesExe = (fulltype.indexOf(STR_EXECUTABLE) > -1); @@ -435,10 +436,11 @@ public class FileClassifier extends Thread { type = STR_DIRECTORY; } + */ // finally, if the full type contains the symbolic link string, then we // know // we have a symbolic link - else if (fulltype.startsWith(symbolicLinkStr)) + if (fulltype.startsWith(symbolicLinkStr)) { type = resolveSymbolicLink(parentFile, name, fulltype, symbolicLinkStr, resolveLink, specialEncoding); } diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl index 15580d4cf09..71b9d7bcc98 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/auth.pl @@ -15,6 +15,16 @@ else $timeoutIN = $ARGV[3]; $ticketIN = $ARGV[4]; + if (defined($ARGV[5])) + { + $javaHome = $ARGV[5]; + $javaExe = "$javaHome/bin/java"; + } + else + { + $javaExe = "java" + } + $pwdIN = ; chomp($pwdIN); @@ -36,7 +46,8 @@ else if ($passwd eq $encryptedPWD) { print("success\n"); - system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'"); + + system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'"); 1; } else diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl index 8ca83ce06c0..7d857b0410c 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/auth.pl @@ -15,6 +15,16 @@ else $timeoutIN = $ARGV[3]; $ticketIN = $ARGV[4]; + if (defined($ARGV[5])) + { + $javaHome = $ARGV[5]; + $javaExe = "$javaHome/bin/java"; + } + else + { + $javaExe = "java" + } + $pwdIN = ; chomp($pwdIN); @@ -45,8 +55,8 @@ else $suOptions="-"; } - system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'"); - 1; + system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'"); + 1; } else { diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl index 8ca83ce06c0..87009b9e2d3 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl +++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/auth.pl @@ -15,6 +15,16 @@ else $timeoutIN = $ARGV[3]; $ticketIN = $ARGV[4]; + if (defined($ARGV[5])) + { + $javaHome = $ARGV[5]; + $javaExe = "$javaHome/bin/java"; + } + else + { + $javaExe = "java" + } + $pwdIN = ; chomp($pwdIN); @@ -45,7 +55,7 @@ else $suOptions="-"; } - system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'"); + system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'"); 1; } else