Allow Trace to be used within application debugger

2 files changed, 20 insertions, 4 deletions

diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/Trace.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/Trace.java
index b3dc01d28..ae64edc1e 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/Trace.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/Trace.java
@@ -25,8 +25,16 @@ public class Trace {
     static {
         try {
             ON = Platform.inDebugMode();
-            isEclipse = true;
-            pluginName = ProviderPlugin.PROVIDERPLUGIN_ID;
+            String val = System.getProperty(ProviderPlugin.PROVIDERPLUGIN_ID+".Trace");
+            if (val != null) {
+                setTrace(true);
+                isEclipse = false;
+                // No eclipse Platform available
+                System.out.println("WARNING:  Eclipse platform not being use for trace...overridden by system property org.eclipse.ecf.provider.Trace");                    
+            } else {
+                isEclipse = true;
+                pluginName = ProviderPlugin.PROVIDERPLUGIN_ID;
+            }
         } catch (Exception e) {
             try {
                 String val = System.getProperty(ProviderPlugin.PROVIDERPLUGIN_ID+".Trace");
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/Trace.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/Trace.java
index cd5d3e7a0..7d54b42ff 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/Trace.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/Trace.java
@@ -25,8 +25,16 @@ public class Trace {
     static {
         try {
             ON = Platform.inDebugMode();
-            isEclipse = true;
-            pluginName = ECFPlugin.PLUGIN_ID;
+            String val = System.getProperty(ECFPlugin.PLUGIN_ID+".Trace");
+            if (val != null) {
+                setTrace(true);
+                isEclipse = false;
+                // No eclipse Platform available
+                System.out.println("WARNING:  Eclipse platform not available for trace...overridden by system property org.eclipse.ecf.provider.Trace");
+            } else {
+                isEclipse = true;
+                pluginName = ECFPlugin.PLUGIN_ID;
+            }
         } catch (Exception e) {
             try {
                 String val = System.getProperty(ECFPlugin.PLUGIN_ID+".Trace");