geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hanhongf...@apache.org
Subject svn commit: r1127422 [4/7] - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.j2ee.v11.jaxbmodel/ org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/ org.apache.geronimo.j2ee.v11.jaxbmodel/src...
Date Wed, 25 May 2011 08:16:31 GMT
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoV21FacetInstallDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoV21FacetInstallDelegate.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoV21FacetInstallDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoV21FacetInstallDelegate.java Wed May 25 08:16:27 2011
@@ -17,6 +17,7 @@
 package org.apache.geronimo.st.v21.core.operations;
 
 import org.apache.geronimo.st.core.GeronimoFacetInstallDelegate;
+import org.apache.geronimo.st.v21.core.Activator;
 import org.apache.geronimo.st.v21.core.internal.Trace;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jst.common.project.facet.JavaProjectFacetCreationDataModelProvider;
@@ -31,12 +32,12 @@ import org.eclipse.wst.common.frameworks
 public class GeronimoV21FacetInstallDelegate extends GeronimoFacetInstallDelegate {
 
 	public IDataModelOperation createDeploymentPlanCreationOp(IProject project, Object config) {
-		Trace.tracePoint("Entry", "GeronimoV21FacetInstallDelegate.createDeploymentPlanCreationOp", project, config);
+		Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoV21FacetInstallDelegate.createDeploymentPlanCreationOp", project, config);
 		
 		IDataModel model = DataModelFactory.createDataModel(new JavaProjectFacetCreationDataModelProvider());
 		model.setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
 		
-		Trace.tracePoint("Exit ", "GeronimoV21FacetInstallDelegate.createDeploymentPlanCreationOp");
+		Trace.tracePoint("Exit ", Activator.traceOperations, "GeronimoV21FacetInstallDelegate.createDeploymentPlanCreationOp");
 		return new V21DeploymentPlanCreationOperation(model, config);		
 	}
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java Wed May 25 08:16:27 2011
@@ -30,7 +30,7 @@ import org.apache.geronimo.jee.deploymen
 import org.apache.geronimo.jee.openejb.OpenejbJar;
 import org.apache.geronimo.jee.web.WebApp;
 import org.apache.geronimo.st.core.operations.DeploymentPlanCreationOperation;
-import org.apache.geronimo.st.core.Activator;
+import org.apache.geronimo.st.v21.core.Activator;
 import org.apache.geronimo.st.core.DeploymentPlanInstallConfig;
 import org.apache.geronimo.st.v21.core.internal.Trace;
 import org.eclipse.core.resources.IFile;
@@ -61,7 +61,7 @@ public class V21DeploymentPlanCreationOp
 
 	public V21DeploymentPlanCreationOperation(IDataModel model, Object config) {
 		super(model, config);
-  		Trace.tracePoint("Constructor", "V21DeploymentPlanCreationOperation", model, config);
+  		Trace.tracePoint("Constructor", Activator.traceOperations, "V21DeploymentPlanCreationOperation", model, config);
 	}
 	
 	
@@ -71,7 +71,7 @@ public class V21DeploymentPlanCreationOp
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoApplicationDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
 	public JAXBElement createGeronimoApplicationDeploymentPlan(IFile dpFile) throws Exception {
-		Trace.tracePoint("Entry",
+		Trace.tracePoint("Entry", Activator.traceOperations,
 				"V21DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan", dpFile);
 
 		org.apache.geronimo.jee.application.ObjectFactory applicationFactory = new org.apache.geronimo.jee.application.ObjectFactory();
@@ -83,7 +83,7 @@ public class V21DeploymentPlanCreationOp
 		JAXBElement jaxbElement = applicationFactory.createApplication(application);
 		JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
 
-		Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan",
+		Trace.tracePoint("Exit ", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan",
 				applicationFactory.createApplication(application));
 		return applicationFactory.createApplication(application);
 	}
@@ -95,7 +95,7 @@ public class V21DeploymentPlanCreationOp
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoWebDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
 	public JAXBElement createGeronimoWebDeploymentPlan(IFile dpFile) throws Exception {
-  		Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan",
+  		Trace.tracePoint("Entry", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan",
 				dpFile, dpFile.getFullPath());
 		org.apache.geronimo.jee.web.ObjectFactory webFactory = new org.apache.geronimo.jee.web.ObjectFactory();
 		WebApp web = webFactory.createWebApp();
@@ -107,10 +107,10 @@ public class V21DeploymentPlanCreationOp
 		try {
 			JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
 		} catch(Exception e) {
-			Activator.log(0, "marshalDeploymentPlan exception", e);
+			Trace.trace(Trace.ERROR, "marshalDeploymentPlan exception", e, Activator.logOperations);
 		}
 
-		Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan", jaxbElement);
+		Trace.tracePoint("Exit ", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan", jaxbElement);
 		return jaxbElement;
 	}
 
@@ -121,7 +121,7 @@ public class V21DeploymentPlanCreationOp
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createOpenEjbDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
 	public JAXBElement createOpenEjbDeploymentPlan(IFile dpFile) throws Exception {
-  		Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", dpFile);
+  		Trace.tracePoint("Entry", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", dpFile);
 
 		org.apache.geronimo.jee.openejb.ObjectFactory ejbFactory = new org.apache.geronimo.jee.openejb.ObjectFactory();
 		OpenejbJar ejbJar = ejbFactory.createOpenejbJar();
@@ -131,7 +131,7 @@ public class V21DeploymentPlanCreationOp
 		JAXBElement jaxbElement = ejbFactory.createOpenejbJar(ejbJar);
 		JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
 
-		Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", jaxbElement);
+		Trace.tracePoint("Exit ", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", jaxbElement);
 		return jaxbElement;
 	}
 
@@ -142,7 +142,7 @@ public class V21DeploymentPlanCreationOp
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createConnectorDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
 	public JAXBElement createConnectorDeploymentPlan(IFile dpFile) throws Exception {
-  		Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createConnectorDeploymentPlan", dpFile);
+  		Trace.tracePoint("Entry", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createConnectorDeploymentPlan", dpFile);
 
 		org.apache.geronimo.jee.connector.ObjectFactory connectorFactory = new org.apache.geronimo.jee.connector.ObjectFactory();
 		Connector connector = connectorFactory.createConnector();
@@ -154,7 +154,7 @@ public class V21DeploymentPlanCreationOp
 		JAXBElement jaxbElement = connectorFactory.createConnector(connector);
 		JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
 
-		Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createConnectorDeploymentPlan", jaxbElement);
+		Trace.tracePoint("Exit ", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createConnectorDeploymentPlan", jaxbElement);
 		return jaxbElement;
 	}
 
@@ -165,7 +165,7 @@ public class V21DeploymentPlanCreationOp
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoApplicationDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
 	public JAXBElement createGeronimoApplicationClientDeploymentPlan(IFile dpFile) throws Exception {
-		Trace.tracePoint("Entry","V21DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan", dpFile);
+		Trace.tracePoint("Entry", Activator.traceOperations,"V21DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan", dpFile);
 
 		org.apache.geronimo.jee.applicationclient.ObjectFactory applicationClientFactory = new org.apache.geronimo.jee.applicationclient.ObjectFactory();
 		ApplicationClient applicationClient = applicationClientFactory.createApplicationClient();
@@ -176,13 +176,13 @@ public class V21DeploymentPlanCreationOp
 		JAXBElement jaxbElement = applicationClientFactory.createApplicationClient(applicationClient);
 		JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
 
-		Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan", applicationClientFactory.createApplicationClient(applicationClient));
+		Trace.tracePoint("Exit ", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan", applicationClientFactory.createApplicationClient(applicationClient));
 		return applicationClientFactory.createApplicationClient(applicationClient);
 	}
 
 	
 	public Environment getConfigEnvironment() {
-        Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.getConfigEnvironment");
+        Trace.tracePoint("Entry", Activator.traceOperations, "V21DeploymentPlanCreationOperation.getConfigEnvironment");
 		
 		if (config != null && config instanceof DeploymentPlanInstallConfig) {
 			cfg = (DeploymentPlanInstallConfig) config;
@@ -210,13 +210,13 @@ public class V21DeploymentPlanCreationOp
 			env.setDependencies(dt);
 		}
 
-   	    Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.getConfigEnvironment", env);
+   	    Trace.tracePoint("Exit ", Activator.traceOperations, "V21DeploymentPlanCreationOperation.getConfigEnvironment", env);
 		return env;
 	}
 
 	
 	public static Artifact createArtifact(String groupId, String artifactId, String version, String type) {
-  		Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createArtifact", groupId, artifactId, version, type);
+  		Trace.tracePoint("Entry", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createArtifact", groupId, artifactId, version, type);
 
 		org.apache.geronimo.jee.deployment.ObjectFactory serviceFactory = new org.apache.geronimo.jee.deployment.ObjectFactory();
 		Artifact artifact = serviceFactory.createArtifact();
@@ -229,13 +229,13 @@ public class V21DeploymentPlanCreationOp
 			artifact.setVersion(version);
 		artifact.setType(type);
 		
-  		Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createArtifact", artifact);
+  		Trace.tracePoint("Exit ", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createArtifact", artifact);
 		return artifact;
 	}
 
 	
 	public static Dependency createDependency(String groupId, String artifactId, String version, String type) {
-  		Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createDependency", groupId, artifactId, version, type);
+  		Trace.tracePoint("Entry", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createDependency", groupId, artifactId, version, type);
 
 		org.apache.geronimo.jee.deployment.ObjectFactory serviceFactory = new org.apache.geronimo.jee.deployment.ObjectFactory();
 		Dependency dependency = serviceFactory.createDependency();
@@ -247,14 +247,14 @@ public class V21DeploymentPlanCreationOp
 			dependency.setVersion(version);
 		dependency.setType(type);
 		
-        Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createDependency", dependency);
+        Trace.tracePoint("Exit ", Activator.traceOperations, "V21DeploymentPlanCreationOperation.createDependency", dependency);
 		return dependency;
 	}
 
 	
 	private static boolean hasValue(String attribute) {
-  		Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.hasValue", attribute);
-  		Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.hasValue", (attribute != null && attribute.trim().length() != 0) );
+  		Trace.tracePoint("Entry", Activator.traceOperations, "V21DeploymentPlanCreationOperation.hasValue", attribute);
+  		Trace.tracePoint("Exit ", Activator.traceOperations, "V21DeploymentPlanCreationOperation.hasValue", (attribute != null && attribute.trim().length() != 0) );
 		
 		return attribute != null && attribute.trim().length() != 0;
 	}

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/plugin/JAXB21PluginUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/plugin/JAXB21PluginUtils.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/plugin/JAXB21PluginUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/plugin/JAXB21PluginUtils.java Wed May 25 08:16:27 2011
@@ -93,19 +93,19 @@ public class JAXB21PluginUtils {
             ByteArrayInputStream inBuffer = new ByteArrayInputStream(outBuffer.toByteArray());
             outputStream.write(outBuffer.toByteArray());
         } catch (JAXBException jaxbException) {
-            Trace.tracePoint("JAXBException", "JAXBUtils.marshalDeploymentPlan()");
+            Trace.tracePoint("JAXBException", Activator.logPlugin, "JAXBUtils.marshalDeploymentPlan()");
             throw jaxbException;
         } catch (IOException coreException) {
-            Trace.tracePoint("IOException", "JAXBUtils.marshalDeploymentPlan()");
+            Trace.tracePoint("IOException", Activator.logPlugin, "JAXBUtils.marshalDeploymentPlan()");
             throw coreException;
         } catch (ParserConfigurationException e) {
-            Trace.tracePoint("ParserConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
+            Trace.tracePoint("ParserConfigurationException", Activator.logPlugin, "JAXBUtils.marshalDeploymentPlan()");
             throw e;
         } catch (TransformerConfigurationException e) {
-            Trace.tracePoint("TransformerConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
+            Trace.tracePoint("TransformerConfigurationException", Activator.logPlugin, "JAXBUtils.marshalDeploymentPlan()");
             throw e;
         } catch (TransformerException e) {
-            Trace.tracePoint("TransformerException", "JAXBUtils.marshalDeploymentPlan()");
+            Trace.tracePoint("TransformerException", Activator.logPlugin, "JAXBUtils.marshalDeploymentPlan()");
             throw e;
         }
     }
@@ -122,13 +122,13 @@ public class JAXB21PluginUtils {
             JAXBElement plan = (JAXBElement) unmarshaller.unmarshal(source);
             return plan;
         } catch (JAXBException e) {
-            Trace.tracePoint("JAXBException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            Trace.tracePoint("JAXBException", Activator.logPlugin, "JAXBUtils.unmarshalFilterDeploymentPlan()");
             e.printStackTrace();
         } catch (ParserConfigurationException e) {
-            Trace.tracePoint("ParserConfigurationException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            Trace.tracePoint("ParserConfigurationException", Activator.logPlugin, "JAXBUtils.unmarshalFilterDeploymentPlan()");
             e.printStackTrace();
         } catch (SAXException e) {
-            Trace.tracePoint("SAXException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            Trace.tracePoint("SAXException", Activator.logPlugin, "JAXBUtils.unmarshalFilterDeploymentPlan()");
             e.printStackTrace();
         }
         return null;
@@ -139,7 +139,7 @@ public class JAXB21PluginUtils {
             return JAXBContext.newInstance( 
                     "org.apache.geronimo.system.plugin.model", Activator.class.getClassLoader() );
         } catch (JAXBException e) {
-            Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
+            Trace.tracePoint("JAXBException", Activator.logPlugin, "JAXBContext.newInstance");
             e.printStackTrace();
         }
         return null;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.options
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.options?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.options (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.options Wed May 25 08:16:27 2011
@@ -1 +1,12 @@
-org.apache.geronimo.st.v21.ui/debug=true
\ No newline at end of file
+org.apache.geronimo.st.v21.ui/debug=true
+org.apache.geronimo.st.v21.ui/console=true
+
+org.apache.geronimo.st.v21.ui/log/wizards=true
+org.apache.geronimo.st.v21.ui/log/editors=true
+org.apache.geronimo.st.v21.ui/log/pages=true
+org.apache.geronimo.st.v21.ui/log/sections=true
+
+org.apache.geronimo.st.v21.ui/trace/wizards=false
+org.apache.geronimo.st.v21.ui/trace/editors=false
+org.apache.geronimo.st.v21.ui/trace/pages=false
+org.apache.geronimo.st.v21.ui/trace/sections=false
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/Activator.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/Activator.java Wed May 25 08:16:27 2011
@@ -16,6 +16,8 @@
  */
 package org.apache.geronimo.st.v21.ui;
 
+import org.apache.geronimo.st.v21.ui.internal.Trace;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -29,10 +31,38 @@ public class Activator extends AbstractU
 
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.apache.geronimo.st.v21.ui";
-
+	public static boolean console;
+	public static boolean logWizards;
+	public static boolean logEditors;
+	public static boolean logPages;
+	public static boolean logSections;
+	
+	public static boolean traceWizards;
+	public static boolean traceEditors;
+	public static boolean tracePages;
+	public static boolean traceSections;
+	
+	static {
+		try {
+			console = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v11.ui/console"));
+			
+			logWizards = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v11.ui/log/wizards"));
+			logEditors = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v11.ui/log/editors"));
+			logPages = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v11.ui/log/pages"));
+			logSections = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v11.ui/log/sections"));
+			
+			traceWizards = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v11.ui/trace/wizards"));
+			traceEditors = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v11.ui/trace/editors"));
+			tracePages = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v11.ui/trace/pages"));
+			traceSections = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v11.ui/trace/sections"));
+		} catch(NumberFormatException e) {
+    		Trace.trace(Trace.ERROR, e.getMessage(), true);
+    	} catch(NullPointerException e) {
+    		Trace.trace(Trace.ERROR, e.getMessage(), true);
+    	}
+	}
 	// The shared instance
 	private static Activator plugin;
-
 	/**
 	 * The constructor
 	 */

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java Wed May 25 08:16:27 2011
@@ -16,8 +16,8 @@
  */
 package org.apache.geronimo.st.v21.ui.internal;
 
+import org.apache.geronimo.runtime.common.log.Logger;
 import org.apache.geronimo.st.v21.ui.Activator;
-import org.eclipse.core.runtime.IStatus;
 
 /**
  * Helper class to route trace output.
@@ -29,18 +29,26 @@ public class Trace {
     /**
      * Finest trace event.
      */
-    public static byte INFO = 0;
+    public static int INFO = 1;
 
     /**
      * Warning trace event.
      */
-    public static byte WARNING = 1;
+    public static int WARNING = 2;
 
     /**
-     * Severe trace event.
+     * error trace event.
      */
-    public static byte SEVERE = 2;
-
+    public static int ERROR = 4;
+    /**
+     * cancel trace event.
+     */
+    public static int CANCEL = 8;
+    
+    private static Logger log;
+    static {
+    	log = Logger.getInstance();
+    }
     /**
      * Trace constructor comment.
      */
@@ -56,8 +64,8 @@ public class Trace {
      * @param s
      *            a message
      */
-    public static void trace(byte level, String s) {
-        trace(level, s, null);
+    public static void trace(int level, String s, boolean opt) {
+        trace(level, s, null, opt);
     }
 
     /**
@@ -70,13 +78,17 @@ public class Trace {
      * @param t
      *            a throwable
      */
-    public static void trace(byte level, String s, Throwable t) {
+    public static void trace(int level, String s, Throwable t, boolean opt) {
         if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
             return;
-
-        System.out.println(Activator.PLUGIN_ID + ":  " + s);
-        if (t != null)
-            t.printStackTrace();
+        if(opt) {
+        	log.trace(level, Activator.PLUGIN_ID, s, t);
+        }
+        if(Activator.console) {
+            System.out.println(Activator.PLUGIN_ID + ":  " + s);
+            if (t != null)
+                t.printStackTrace();
+        }
     }
 
     /**
@@ -93,33 +105,33 @@ public class Trace {
      *            or
      *            Return value if the trace point is an "Exit"
      */
-    public static void trace(String tracePoint, String classDotMethod) {
-        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()" );
+    public static void trace(String tracePoint, String classDotMethod, boolean opt) {
+        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()", opt);
     }   
-    public static void trace(String tracePoint, String classDotMethod, Object parm1) {
-        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "] )" );
+    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1) {
+        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "] )" , opt);
     }
 
-    public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2) {
+    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2) {
         trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
-                                                                 "parm2=[" + (parm2 == null ? null : parm2.toString()) + "] )" );
+                                                                 "parm2=[" + (parm2 == null ? null : parm2.toString()) + "] )" , opt );
     }
-    public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3) {
+    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2, Object parm3) {
         trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
                                                                  "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
-                                                                 "parm3=[" + (parm3 == null ? null : parm3.toString()) + "] )" );
+                                                                 "parm3=[" + (parm3 == null ? null : parm3.toString()) + "] )" , opt );
     }
-    public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4) {
+    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4) {
         trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
                                                                  "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
                                                                  "parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
-                                                                 "parm4=[" + (parm4 == null ? null : parm4.toString()) + "] )" );
+                                                                 "parm4=[" + (parm4 == null ? null : parm4.toString()) + "] )" , opt );
     }
-    public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4, Object parm5) {
+    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4, Object parm5) {
         trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
                                                                  "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
                                                                  "parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
                                                                  "parm4=[" + (parm4 == null ? null : parm4.toString()) + "], " +
-                                                                 "parm5=[" + (parm5 == null ? null : parm5.toString()) + "] )" );
+                                                                 "parm5=[" + (parm5 == null ? null : parm5.toString()) + "] )" , opt );
     }
 }
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerPluginSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerPluginSection.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerPluginSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerPluginSection.java Wed May 25 08:16:27 2011
@@ -21,6 +21,7 @@ import org.apache.geronimo.st.v21.core.i
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractServerEditorSection;
 import org.apache.geronimo.st.v21.core.operations.GeronimoServerV21PluginManager;
+import org.apache.geronimo.st.v21.ui.Activator;
 import org.apache.geronimo.st.v21.ui.wizards.ServerCustomAssemblyWizard;
 import org.apache.geronimo.st.v21.ui.wizards.ServerPluginManagerDialog;
 import org.apache.geronimo.st.v21.ui.wizards.ServerPluginManagerWizard;
@@ -58,7 +59,7 @@ public class ServerPluginSection extends
     public void createSection(Composite parent) {
         super.createSection(parent);
     
-        Trace.tracePoint("Entry", "ServerPluginSection.createSection", parent);
+        Trace.tracePoint("Entry", Activator.traceSections, "ServerPluginSection.createSection", parent);
     
         FormToolkit toolkit = getFormToolkit(parent.getDisplay());
         
@@ -123,7 +124,7 @@ public class ServerPluginSection extends
             }
         });
     
-        Trace.tracePoint("Exit", "ServerPluginSection.createSection");
+        Trace.tracePoint("Exit", Activator.traceSections, "ServerPluginSection.createSection");
     }
 
     private boolean isServerRunning () {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java Wed May 25 08:16:27 2011
@@ -19,6 +19,7 @@ package org.apache.geronimo.st.v21.ui.wi
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.core.DeploymentPlanInstallConfig;
+import org.apache.geronimo.st.v21.ui.Activator;
 import org.apache.geronimo.st.v21.ui.internal.Trace;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -44,12 +45,12 @@ public class FacetInstallPage extends Ab
 
     public FacetInstallPage() {
         super("geronimo.plan.install");
-        Trace.trace("Constructor Entry", "FacetInstallPage");
+        Trace.trace("Constructor Entry", "FacetInstallPage", Activator.traceWizards);
         
         setTitle(Messages.geronimoDeploymentPlan);
         setDescription(Messages.configGeronimoDeploymentPlan);
         
-        Trace.trace("Constructor Exit", "FacetInstallPage");
+        Trace.trace("Constructor Exit", "FacetInstallPage", Activator.traceWizards);
     }
 
     /*
@@ -58,11 +59,11 @@ public class FacetInstallPage extends Ab
      * @see org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setConfig(java.lang.Object)
      */
     public void setConfig(Object config) {
-        Trace.trace("Entry", "FacetInstallPage.setConfig", config);
+        Trace.trace("Entry", Activator.traceWizards, "FacetInstallPage.setConfig", config);
 
         this.config = (DeploymentPlanInstallConfig) config;
         
-        Trace.trace("Exit", "FacetInstallPage.setConfig");
+        Trace.trace("Exit", "FacetInstallPage.setConfig", Activator.traceWizards);
     }
 
     /*
@@ -71,7 +72,7 @@ public class FacetInstallPage extends Ab
      * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
      */
     public void createControl(Composite parent) {
-        Trace.trace("Entry", "FacetInstallPage.createControl", parent);
+        Trace.trace("Entry", Activator.traceWizards, "FacetInstallPage.createControl", parent);
         
         Composite composite = new Composite(parent, SWT.NONE);
         composite.setLayout(new GridLayout(2, false));
@@ -112,7 +113,7 @@ public class FacetInstallPage extends Ab
         
         setControl(composite);
         
-        Trace.trace("Exit", "FacetInstallPage.createControl");      
+        Trace.trace("Exit", "FacetInstallPage.createControl", Activator.traceWizards);      
     }
 
     /*
@@ -121,15 +122,15 @@ public class FacetInstallPage extends Ab
      * @see org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage#transferStateToConfig()
      */
     public void transferStateToConfig() {
-        Trace.trace("Entry", "FacetInstallPage.transferStateToConfig");     
-    
+        Trace.trace("Entry", "FacetInstallPage.transferStateToConfig", Activator.traceWizards);
+        
         config.setGroupId(groupText.getText());
         config.setArtifactId(artifactText.getText());
         config.setVersion(versionText.getText());
         config.setType(typeText.getText());
         config.setSharedLib(sharedLib.getSelection());
         
-        Trace.trace("Exit", "FacetInstallPage.transferStateToConfig");      
+        Trace.trace("Exit", "FacetInstallPage.transferStateToConfig", Activator.traceWizards);      
     }
 
     private static GridData createGridData() {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF Wed May 25 08:16:27 2011
@@ -6,6 +6,7 @@ Bundle-Version: 3.0.0
 Bundle-Activator: org.apache.geronimo.st.v22.core.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
+Import-Package: org.apache.geronimo.runtime.common.log
 Require-Bundle: org.apache.geronimo.runtime.v22,
  org.apache.geronimo.jaxbmodel.common, 
  org.apache.geronimo.st.v21.core,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoServerBehaviour.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoServerBehaviour.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoServerBehaviour.java Wed May 25 08:16:27 2011
@@ -47,7 +47,7 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.wst.server.core.IModule;
 import org.eclipse.wst.server.core.IServer;
 import org.eclipse.wst.server.core.internal.IModulePublishHelper;
-
+import org.apache.geronimo.st.v21.core.Activator;
 /**
  * @version $Rev: 540136 $ $Date: 2007-05-21 09:15:31 -0400 (Mon, 21 May 2007) $
  */
@@ -83,7 +83,7 @@ public class GeronimoServerBehaviour ext
 				throw e;
 			} catch (Exception e) {
 				Trace.trace(Trace.WARNING, "Kernel connection failed. "
-						+ e.getMessage());
+						+ e.getMessage(), Activator.traceCore);
 			}
 		}
 		return kernel;
@@ -98,7 +98,7 @@ public class GeronimoServerBehaviour ext
 		try {
 			return getKernel() != null && kernel.isRunning();
 		} catch (SecurityException e) {
-			Trace.trace(Trace.SEVERE, "Invalid username and/or password.", e);
+			Trace.trace(Trace.ERROR, "Invalid username and/or password.", e, Activator.logCore);
 
 			pingThread.interrupt();
 			if (getServer().getServerState() != IServer.STATE_STOPPED) {
@@ -106,7 +106,7 @@ public class GeronimoServerBehaviour ext
 
 			}
 		} catch (Exception e) {
-			Activator.log(Status.WARNING, "Geronimo Server may have been terminated manually outside of workspace.", e);
+			Trace.trace(Trace.WARNING, "Geronimo Server may have been terminated manually outside of workspace.", e, Activator.logCore);
 			kernel = null;
 		}
 		return false;
@@ -168,7 +168,7 @@ public class GeronimoServerBehaviour ext
 					e.printStackTrace();
 				}
 			} else {
-				Trace.trace(Trace.INFO, "configLists is empty");
+				Trace.trace(Trace.INFO, "configLists is empty", Activator.traceCore);
 			}
 		}
 		return false;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoV22ServerInfo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoV22ServerInfo.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoV22ServerInfo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoV22ServerInfo.java Wed May 25 08:16:27 2011
@@ -41,6 +41,7 @@ import org.apache.geronimo.kernel.NoSuch
 import org.apache.geronimo.kernel.NoSuchOperationException;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
+import org.apache.geronimo.st.v21.core.Activator;
 import org.apache.geronimo.st.v21.core.IGeronimoServerInfo;
 import org.apache.geronimo.st.v21.core.internal.Trace;
 import org.apache.geronimo.system.jmx.KernelDelegate;
@@ -149,7 +150,7 @@ public class GeronimoV22ServerInfo imple
                 } catch (SecurityException e) {
                 } catch (Exception e) {
                     Trace.trace(Trace.WARNING, "Kernel connection failed. "
-                            + e.getMessage());
+                            + e.getMessage(), Activator.logCore);
                 }
             }
         }
@@ -284,15 +285,15 @@ public class GeronimoV22ServerInfo imple
                     }
                 } catch (GBeanNotFoundException e) {
                     Trace.trace(Trace.WARNING, "GBean Not Found. "
-                            + e.getMessage());
+                            + e.getMessage(), Activator.logCore);
                 } catch (NoSuchOperationException e) {
                     Trace.trace(Trace.WARNING, "The operation cant invoked. "
-                            + e.getMessage());
+                            + e.getMessage(), Activator.logCore);
                 } catch (InternalKernelException e) {
                     throw e;
                 } catch (Exception e) {
                     Trace.trace(Trace.WARNING, "Kernel connection failed.  "
-                            + e.getMessage());
+                            + e.getMessage(), Activator.logCore);
                 }
 
             }
@@ -376,7 +377,7 @@ public class GeronimoV22ServerInfo imple
                 } catch (NoSuchAttributeException e) {
                 } catch (Exception e) {
                     Trace.trace(Trace.WARNING, "Kernel connection failed. "
-                            + e.getMessage());
+                            + e.getMessage(), Activator.logCore);
                 }
             }
         }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/internal/Trace.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/internal/Trace.java Wed May 25 08:16:27 2011
@@ -16,6 +16,7 @@
  */
 package org.apache.geronimo.st.v22.core.internal;
 
+import org.apache.geronimo.runtime.common.log.Logger;
 import org.apache.geronimo.st.v21.core.Activator;
 import org.eclipse.core.runtime.IStatus;
 
@@ -29,21 +30,29 @@ public class Trace {
     /**
      * Finest trace event.
      */
-    public static byte INFO = 0;
+    public static int INFO = 1;
 
     /**
      * Warning trace event.
      */
-    public static byte WARNING = 1;
+    public static int WARNING = 2;
 
     /**
-     * Severe trace event.
+     * error trace event.
      */
-    public static byte SEVERE = 2;
+    public static int ERROR = 4;
+    /**
+     * cancel trace event.
+     */
+    public static int CANCEL = 8;
 
     /**
      * Trace constructor comment.
      */
+    private static Logger log;
+    static {
+    	log = Logger.getInstance();
+    }
     private Trace() {
         super();
     }
@@ -56,8 +65,8 @@ public class Trace {
      * @param s
      *            a message
      */
-    public static void trace(byte level, String s) {
-        trace(level, s, null);
+    public static void trace(int level, String s, boolean opt) {
+        trace(level, s, null, opt);
     }
 
     /**
@@ -70,15 +79,17 @@ public class Trace {
      * @param t
      *            a throwable
      */
-    public static void trace(byte level, String s, Throwable t) {
-    	if (Activator.getDefault() == null
-				|| !Activator.getDefault().isDebugging())
-			return;
-
-        System.out.println(Activator.PLUGIN_ID + ":  " + s);
-        if (t != null)
-            t.printStackTrace();
-        
+    public static void trace(int level, String s, Throwable t, boolean opt) {
+        if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
+            return;
+        if(opt) {
+        	log.trace(level, Activator.PLUGIN_ID, s, t);
+        }
+        if(Activator.console) {
+            System.out.println(Activator.PLUGIN_ID + ":  " + s);
+            if (t != null)
+                t.printStackTrace();
+        }
     }
 
     /**
@@ -95,20 +106,20 @@ public class Trace {
      *            or
      *            Return value if the trace point is an "Exit"
      */
-    public static void tracePoint(String tracePoint, String classDotMethod) {
-        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()" );
+    public static void tracePoint(String tracePoint, String classDotMethod, boolean opt) {
+        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()", opt);
     }   
-    public static void tracePoint(String tracePoint, String classDotMethod, Object... parms) {
+    public static void tracePoint(String tracePoint, boolean opt, String classDotMethod, Object... parms) {
         if ( parms == null ) {
-            trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( null )" );
+            trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( null )" , opt);
         }
         else {
-            trace(Trace.INFO, tracePoint + ": " + classDotMethod + "(" );
+            trace(Trace.INFO, tracePoint + ": " + classDotMethod + "(" , opt);
             for ( int ii=0; ii<parms.length; ii++) {
                 Object parm = parms[ii];
-                trace(Trace.INFO, "    parm" + (ii+1) + "=[" + (parm == null ? null : parm.toString()) + "]" );
+                trace(Trace.INFO, "    parm" + (ii+1) + "=[" + (parm == null ? null : parm.toString()) + "]" , opt);
             }
-            trace(Trace.INFO, ")" );
+            trace(Trace.INFO, ")" ,opt);
         }
-    }   
+    } 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerV22PluginManager.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerV22PluginManager.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerV22PluginManager.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerV22PluginManager.java Wed May 25 08:16:27 2011
@@ -57,6 +57,7 @@ import org.apache.geronimo.st.core.Commo
 import org.apache.geronimo.st.core.GeronimoConnectionFactory;
 import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
 import org.apache.geronimo.st.core.operations.IGeronimoServerPluginManager;
+import org.apache.geronimo.st.v21.core.Activator;
 import org.apache.geronimo.st.v21.core.internal.Trace;
 import org.apache.geronimo.st.v22.core.plugin.JAXB22PluginUtils;
 import org.apache.geronimo.system.jmx.KernelDelegate;
@@ -101,9 +102,9 @@ public class GeronimoServerV22PluginMana
         } catch (Exception e) {
             e.printStackTrace();
             Trace.trace(Trace.WARNING, "Kernel connection failed. "
-                + e.getMessage());
+                + e.getMessage(), Activator.logOperations);
         }
-        Trace.tracePoint("Constructor", "GeronimoServerPluginManager");
+        Trace.tracePoint("Constructor", "GeronimoServerPluginManager", Activator.traceOperations);
     }
     
     private PluginInstaller getPluginInstaller() {
@@ -115,7 +116,7 @@ public class GeronimoServerV22PluginMana
     }
     
     public List<String> getPluginList () {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.getPluginList");
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.getPluginList");
 
         String name;
         boolean added;
@@ -143,14 +144,14 @@ public class GeronimoServerV22PluginMana
             }
         }
 
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.getPluginList", pluginList);
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.getPluginList", pluginList);
         return pluginList;
     }
 
     // mimics org.apache.geronimo.console.car.AssemblyViewHandler.actionAfterView
     public void assembleServer (String group, String artifact, String version,
                         String format, String relativeServerPath, int[] selected) {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.assembleServer",
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.assembleServer",
                 group, artifact, version, format);
 
         PluginListType selectedPlugins = new PluginListType();
@@ -177,12 +178,12 @@ public class GeronimoServerV22PluginMana
         catch (Exception e) {
             e.printStackTrace();
         }
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.assembleServer");
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.assembleServer");
     }
 
     // mimics org.apache.geronimo.console.util.KernelManagementHelper.getConfigurations()
     public List<String> getConfigurationList () {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.getConfigurationList");
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.getConfigurationList");
 
         ConfigurationManager mgr = getConfigurationManager();
         List<AbstractName> stores = mgr.listStores();
@@ -202,7 +203,7 @@ public class GeronimoServerV22PluginMana
         }
         Collections.sort(results);
 
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.getConfigurationList", results);
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.getConfigurationList", results);
         return results;
     }
 
@@ -217,7 +218,7 @@ public class GeronimoServerV22PluginMana
     // mimics org.apache.geronimo.system.plugin.PluginInstallerGBean.updatePluginMetadata
     // but puts the metadata in our local directory
     public void savePluginXML (String configId, Object pluginMetaData) {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.savePluginXML", configId, pluginMetaData);
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.savePluginXML", configId, pluginMetaData);
 
         PluginType metadata = (PluginType) pluginMetaData;
         
@@ -258,12 +259,12 @@ public class GeronimoServerV22PluginMana
                 input.close();
                 if (!dir.delete()) {
                     String message = CommonMessages.bind(CommonMessages.errorDeletePlugin, dir.getAbsolutePath());
-                    Trace.tracePoint("Throw", "GeronimoServerPluginManager.savePluginXML", message);
+                    Trace.tracePoint("Throw", Activator.traceOperations, "GeronimoServerPluginManager.savePluginXML", message);
                     throw new Exception(message);
                 }
                 if (!temp.renameTo(dir)) {
                     String message = CommonMessages.bind(CommonMessages.errorMovePlugin, temp.getAbsolutePath(), dir.getAbsolutePath());
-                    Trace.tracePoint("Throw", "GeronimoServerPluginManager.savePluginXML", message);
+                    Trace.tracePoint("Throw", Activator.traceOperations, "GeronimoServerPluginManager.savePluginXML", message);
                     throw new Exception(message);
                 }
             } catch (Exception e) {
@@ -273,7 +274,7 @@ public class GeronimoServerV22PluginMana
             File meta = new File(addFilename(dir.getAbsolutePath(), artifact), "META-INF");
             if (!meta.isDirectory() || !meta.canRead()) {
                 String message = CommonMessages.bind(CommonMessages.badPlugin, artifact);
-                Trace.tracePoint("Throw", "GeronimoServerPluginManager.savePluginXML", message);
+                Trace.tracePoint("Throw", Activator.traceOperations, "GeronimoServerPluginManager.savePluginXML", message);
                 throw new IllegalArgumentException(message);
             }
             File xml = new File(meta, "geronimo-plugin.xml");
@@ -282,7 +283,7 @@ public class GeronimoServerV22PluginMana
                 if (!xml.isFile()) {
                     if (!xml.createNewFile()) {
                         String message = CommonMessages.bind(CommonMessages.errorCreateMetadata, artifact);
-                        Trace.tracePoint("Throw", "GeronimoServerPluginManager.savePluginXML", message);
+                        Trace.tracePoint("Throw", Activator.traceOperations, "GeronimoServerPluginManager.savePluginXML", message);
                         throw new RuntimeException(message);
                     }
                 }
@@ -301,12 +302,12 @@ public class GeronimoServerV22PluginMana
             }
         }
 
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.savePluginXML");
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.savePluginXML");
     }
 
     // mimics org.apache.geronimo.system.configuration.RepositoryConfigurationStore.exportConfiguration
     public void exportCAR (String localRepoDir, String configId) throws Exception {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.exportCAR", localRepoDir, configId);
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.exportCAR", localRepoDir, configId);
 
         Artifact artifact = Artifact.create(configId);
         String filename = createDirectoryStructure (localRepoDir, artifact);
@@ -315,11 +316,11 @@ public class GeronimoServerV22PluginMana
         File serverArtifact = new File(getArtifactLocation (artifact));
         writeToDirectory(serverArtifact, outputDir);
 
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.exportCAR");
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.exportCAR");
     }
 
     private void writeToDirectory(File inputDir, File outputDir) throws Exception {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.writeToZip", inputDir);
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.writeToZip", inputDir);
 
         outputDir.mkdirs();
         File[] all = inputDir.listFiles();
@@ -345,11 +346,11 @@ public class GeronimoServerV22PluginMana
                 }
             }
         }
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.writeToZip");
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.writeToZip");
     }
 
     public void updatePluginList (String localRepoDir, Object data) throws Exception {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.updatePluginList", localRepoDir, data);
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.updatePluginList", localRepoDir, data);
 
         PluginType metadata = (PluginType) data;
         
@@ -386,11 +387,11 @@ public class GeronimoServerV22PluginMana
                 }
             }
         }
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.updatePluginList");
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.updatePluginList");
     }
 
     public PluginListType readPluginList (String localRepoDir) {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.readPluginList", localRepoDir);
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.readPluginList", localRepoDir);
 
         PluginListType pluginList = null;
         File listFile = new File (localRepoDir, "geronimo-plugins.xml");
@@ -414,7 +415,7 @@ public class GeronimoServerV22PluginMana
             pluginList = factory.createPluginListType();
         }
 
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.readPluginList", pluginList);
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.readPluginList", pluginList);
         return pluginList;
     }
 
@@ -493,14 +494,14 @@ public class GeronimoServerV22PluginMana
     }
 
     private ConfigurationManager getConfigurationManager () {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.getConfigurationManager");
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.getConfigurationManager");
 
         if (kernel != null) {
-            Trace.tracePoint("Exit", "GeronimoServerPluginManager.getConfigurationManager");
+            Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.getConfigurationManager");
             return ConfigurationUtil.getEditableConfigurationManager(kernel);
         }
 
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.getConfigurationManager returns null");
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.getConfigurationManager returns null");
         return null;
     }
 
@@ -562,7 +563,7 @@ public class GeronimoServerV22PluginMana
 
 
     public boolean validatePlugin (Object pluginObject) {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.validatePlugin", pluginObject);
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.validatePlugin", pluginObject);
         
         PluginType plugin = (PluginType) pluginObject;
         
@@ -573,14 +574,14 @@ public class GeronimoServerV22PluginMana
             e.printStackTrace();
             valid = false;
         }
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.validatePlugin", valid);
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.validatePlugin", valid);
         return valid;
     }
 
     // mimics org.apache.geronimo.system.plugin.PluginInstallerGbean.install
     // but uses our local directory to get the plugins
     public ArrayList<String> installPlugins (String localRepoDir, List plugins) {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.installPlugins", localRepoDir, pluginList);
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.installPlugins", localRepoDir, pluginList);
         ArrayList<String> eventLog = new ArrayList<String>();
         List<PluginType> pluginList = (List<PluginType>)plugins;
 
@@ -653,13 +654,13 @@ public class GeronimoServerV22PluginMana
             e.printStackTrace();
         }
 
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.installPlugins", eventLog.toString());
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.installPlugins", eventLog.toString());
         return eventLog;
     }
 
     // mimics org.apache.geronimo.system.plugin.PluginInstallerGbean.verifyPrerequisistes
     private void verifyPrerequisites(PluginType plugin) throws Exception {
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.verifyPrerequisites", plugin);
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.verifyPrerequisites", plugin);
         List<Dependency> missingPrereqs = getMissingPrerequisites(plugin);
         if (!missingPrereqs.isEmpty()) {
             PluginArtifactType metadata = plugin.getPluginArtifact().get(0);
@@ -674,20 +675,20 @@ public class GeronimoServerV22PluginMana
                 }
             }
             buf.append(CommonMessages.installed);
-            Trace.tracePoint("Throw", "GeronimoServerPluginManager.verifyPrerequisites", buf.toString());
+            Trace.tracePoint("Throw", Activator.traceOperations, "GeronimoServerPluginManager.verifyPrerequisites", buf.toString());
             throw new Exception(buf.toString());
         }
 
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.verifyPrerequisites");
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.verifyPrerequisites");
     }
 
     // mimics org.apache.geronimo.system.plugin.PluginInstallerGbean.getMissingPrerequisistes
     private List<Dependency> getMissingPrerequisites(PluginType plugin) {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.getMissingPrerequisites", plugin);
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.getMissingPrerequisites", plugin);
 
         if (plugin.getPluginArtifact().size() != 1) {
             String message = CommonMessages.bind(CommonMessages.configSizeMismatch, plugin.getPluginArtifact().size());
-            Trace.tracePoint("Throw", "GeronimoServerPluginManager.getMissingPrerequisites", message);
+            Trace.tracePoint("Throw", Activator.traceOperations, "GeronimoServerPluginManager.getMissingPrerequisites", message);
             throw new IllegalArgumentException(message);
         }
 
@@ -702,18 +703,18 @@ public class GeronimoServerV22PluginMana
                     missingPrereqs.add(new Dependency(artifact, ImportType.ALL));
                 }
             } catch (Exception e) {
-                Trace.tracePoint("Throw", "GeronimoServerPluginManager.getMissingPrerequisites", CommonMessages.noDefaultServer);
+                Trace.tracePoint("Throw", Activator.traceOperations, "GeronimoServerPluginManager.getMissingPrerequisites", CommonMessages.noDefaultServer);
                 throw new RuntimeException(CommonMessages.noDefaultServer);
             }
         }
 
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.getMissingPrerequisites", missingPrereqs);
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.getMissingPrerequisites", missingPrereqs);
         return missingPrereqs;
     }
     
     //Extract the car file
     private void writeToRepository(File inputDir, File outputDir) throws Exception {
-        Trace.tracePoint("Entry", "GeronimoServerPluginManager.writeToRepository", inputDir,outputDir);
+        Trace.tracePoint("Entry", Activator.traceOperations, "GeronimoServerPluginManager.writeToRepository", inputDir,outputDir);
 
         outputDir.mkdirs();
         File[] all = inputDir.listFiles();
@@ -773,7 +774,7 @@ public class GeronimoServerV22PluginMana
                 }
             }
         }
-        Trace.tracePoint("Exit", "GeronimoServerPluginManager.writeToRepository");
+        Trace.tracePoint("Exit", Activator.traceOperations, "GeronimoServerPluginManager.writeToRepository");
     }
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/plugin/JAXB22PluginUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/plugin/JAXB22PluginUtils.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/plugin/JAXB22PluginUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/plugin/JAXB22PluginUtils.java Wed May 25 08:16:27 2011
@@ -93,19 +93,19 @@ public class JAXB22PluginUtils {
             ByteArrayInputStream inBuffer = new ByteArrayInputStream(outBuffer.toByteArray());
             outputStream.write(outBuffer.toByteArray());
         } catch (JAXBException jaxbException) {
-            Trace.tracePoint("JAXBException", "JAXBUtils.marshalDeploymentPlan()");
+            Trace.tracePoint("JAXBException", Activator.logPlugin, "JAXBUtils.marshalDeploymentPlan()");
             throw jaxbException;
         } catch (IOException coreException) {
-            Trace.tracePoint("IOException", "JAXBUtils.marshalDeploymentPlan()");
+            Trace.tracePoint("IOException", Activator.logPlugin, "JAXBUtils.marshalDeploymentPlan()");
             throw coreException;
         } catch (ParserConfigurationException e) {
-            Trace.tracePoint("ParserConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
+            Trace.tracePoint("ParserConfigurationException", Activator.logPlugin, "JAXBUtils.marshalDeploymentPlan()");
             throw e;
         } catch (TransformerConfigurationException e) {
-            Trace.tracePoint("TransformerConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
+            Trace.tracePoint("TransformerConfigurationException", Activator.logPlugin, "JAXBUtils.marshalDeploymentPlan()");
             throw e;
         } catch (TransformerException e) {
-            Trace.tracePoint("TransformerException", "JAXBUtils.marshalDeploymentPlan()");
+            Trace.tracePoint("TransformerException", Activator.logPlugin, "JAXBUtils.marshalDeploymentPlan()");
             throw e;
         }
     }
@@ -122,13 +122,13 @@ public class JAXB22PluginUtils {
             JAXBElement plan = (JAXBElement) unmarshaller.unmarshal(source);
             return plan;
         } catch (JAXBException e) {
-            Trace.tracePoint("JAXBException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            Trace.tracePoint("JAXBException", Activator.logPlugin, "JAXBUtils.unmarshalFilterDeploymentPlan()");
             e.printStackTrace();
         } catch (ParserConfigurationException e) {
-            Trace.tracePoint("ParserConfigurationException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            Trace.tracePoint("ParserConfigurationException", Activator.logPlugin, "JAXBUtils.unmarshalFilterDeploymentPlan()");
             e.printStackTrace();
         } catch (SAXException e) {
-            Trace.tracePoint("SAXException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            Trace.tracePoint("SAXException", Activator.logPlugin, "JAXBUtils.unmarshalFilterDeploymentPlan()");
             e.printStackTrace();
         }
         return null;
@@ -139,7 +139,7 @@ public class JAXB22PluginUtils {
             return JAXBContext.newInstance( 
                     "org.apache.geronimo.system.plugin.model", Activator.class.getClassLoader() );
         } catch (JAXBException e) {
-            Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
+            Trace.tracePoint("JAXBException", Activator.logPlugin, "JAXBContext.newInstance");
             e.printStackTrace();
         }
         return null;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF Wed May 25 08:16:27 2011
@@ -8,7 +8,7 @@ Require-Bundle: org.apache.geronimo.runt
  org.apache.geronimo.st.v21.ui, 
  org.apache.geronimo.jee.v21.jaxbmodel,
  org.apache.geronimo.jee.v22.jaxbmodel,
- org.apache.geronimo.st.v22.core, 
+ org.apache.geronimo.st.v22.core,
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.commands,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.options
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.options?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.options (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.options Wed May 25 08:16:27 2011
@@ -1 +1,20 @@
-org.apache.geronimo.st.v30.core/debug=true
\ No newline at end of file
+org.apache.geronimo.st.v30.core/debug=true
+org.apache.geronimo.st.v30.core/console=true
+
+org.apache.geronimo.st.v30.core/log/core=true
+org.apache.geronimo.st.v30.core/log/commands=true
+org.apache.geronimo.st.v30.core/log/descriptor=true
+org.apache.geronimo.st.v30.core/log/factes=true
+org.apache.geronimo.st.v30.core/log/internal=true
+org.apache.geronimo.st.v30.core/log/jaxb=true
+org.apache.geronimo.st.v30.core/log/operations=true
+org.apache.geronimo.st.v30.core/log/osgi=true
+
+org.apache.geronimo.st.v30.core/trace/core=false
+org.apache.geronimo.st.v30.core/trace/commands=false
+org.apache.geronimo.st.v30.core/trace/descriptor=false
+org.apache.geronimo.st.v30.core/trace/factes=false
+org.apache.geronimo.st.v30.core/trace/internal=false
+org.apache.geronimo.st.v30.core/trace/jaxb=false
+org.apache.geronimo.st.v30.core/trace/operations=false
+org.apache.geronimo.st.v30.core/trace/osgi=false
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF Wed May 25 08:16:27 2011
@@ -6,10 +6,11 @@ Bundle-Version: 3.0.0
 Bundle-Activator: org.apache.geronimo.st.v30.core.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
+Import-Package: org.apache.geronimo.runtime.common.log
 Require-Bundle: 
- org.apache.geronimo.runtime.common,
  org.apache.geronimo.runtime.v30,
  org.apache.geronimo.jaxbmodel.common,
+ org.apache.geronimo.runtime.common,
  org.apache.geronimo.st.v30.jaxbmodel,
  org.apache.geronimo.st.core,
  org.eclipse.core.commands,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java Wed May 25 08:16:27 2011
@@ -16,6 +16,8 @@
  */
 package org.apache.geronimo.st.v30.core;
 
+import org.apache.geronimo.st.v30.core.internal.Trace;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.wst.server.core.IServer;
@@ -31,10 +33,55 @@ import org.osgi.framework.BundleContext;
  * @version $Rev$ $Date$
  */
 public class Activator extends Plugin {
-
     // The plug-in ID
     public static final String PLUGIN_ID = "org.apache.geronimo.st.v30.core";
+    /* trace and log switchers */
+    public static boolean console;
+    public static boolean logCore;
+    public static boolean logCommands;
+    public static boolean logDesc;
+    public static boolean logFacets;
+    public static boolean logInternal;
+    public static boolean logJaxb;
+    public static boolean logOperations;
+    public static boolean logOsgi;
+    
+    public static boolean traceCore;
+    public static boolean traceCommands;
+    public static boolean traceDesc;
+    public static boolean traceFacets;
+    public static boolean traceInternal;
+    public static boolean traceJaxb;
+    public static boolean traceOperations;
+    public static boolean traceOsgi;
+    /* end here */
+    static {
+    	try {
+    		console = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/console"));
+    		logCore = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/log/core"));
+    		logCommands = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/log/commands"));
+    		logDesc = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/log/descriptor"));
+    		logFacets = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/log/factes"));
+    		logInternal = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/log/internal"));
+    		logJaxb = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/log/jaxb"));
+    		logOperations = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/log/operations"));
+    		logOsgi = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/log/osgi"));
+    		
+    		traceCore = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/trace/core"));
+    		traceCommands = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/trace/commands"));
+    		traceDesc = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/trace/descriptor"));
+    		traceFacets = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/trace/factes"));
+    		traceInternal = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/trace/internal"));
+    		traceJaxb = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/trace/jaxb"));
+    		traceOperations = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/trace/operations"));
+    		traceOsgi = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.v30.core/trace/osgi"));
+    	} catch(NumberFormatException e) {
+    		Trace.trace(Trace.ERROR, e.getMessage(), true);
+    	} catch(NullPointerException e) {
+    		Trace.trace(Trace.ERROR, e.getMessage(), true);
+    	}
 
+    }
     // The shared instance
     private static Activator plugin;
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/ClasspathContainersHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/ClasspathContainersHelper.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/ClasspathContainersHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/ClasspathContainersHelper.java Wed May 25 08:16:27 2011
@@ -42,7 +42,7 @@ public class ClasspathContainersHelper {
     // instance properties in servers.xml
     // 
     public static List<String> queryWorkspace() {
-        Trace.tracePoint("ENTRY", "ClasspathContainersHelper.queryWorkspace");
+        Trace.tracePoint("ENTRY", "ClasspathContainersHelper.queryWorkspace", Activator.traceCore);
 
         ArrayList<String> containers = new ArrayList<String>();
 
@@ -71,7 +71,7 @@ public class ClasspathContainersHelper {
         }
 
         Collections.sort( containers );
-        Trace.tracePoint("EXIT", "ClasspathContainersHelper.queryWorkspace", containers);
+        Trace.tracePoint("EXIT", Activator.traceCore, "ClasspathContainersHelper.queryWorkspace", containers);
         return containers;
     }
 
@@ -80,7 +80,7 @@ public class ClasspathContainersHelper {
     // Query the workspace to find the classapth entries for a specific classpath container,
     // 
     public static List<IClasspathEntry> queryWorkspace( String containerPath ) {
-        Trace.tracePoint("ENTRY", "ClasspathContainersHelper.queryWorkspace", containerPath );
+        Trace.tracePoint("ENTRY", Activator.traceCore, "ClasspathContainersHelper.queryWorkspace", containerPath );
 
         List<IClasspathEntry> classpathEntries = new ArrayList<IClasspathEntry>();
 
@@ -117,7 +117,7 @@ public class ClasspathContainersHelper {
             }
         }
 
-        Trace.tracePoint("EXIT", "ClasspathContainersHelper.queryWorkspace", classpathEntries);
+        Trace.tracePoint("EXIT", Activator.traceCore, "ClasspathContainersHelper.queryWorkspace", classpathEntries);
         return classpathEntries;
     }
 



Mime
View raw message