You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ha...@apache.org on 2011/05/25 10:16:31 UTC
svn commit: r1127422 [6/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...
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/SynchronizeProjectOnServerTask.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/SynchronizeProjectOnServerTask.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/SynchronizeProjectOnServerTask.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/SynchronizeProjectOnServerTask.java Wed May 25 08:16:27 2011
@@ -59,7 +59,7 @@ public class SynchronizeProjectOnServerT
@Override
public void run() {
- Trace.tracePoint("Entry ", "SynchronizeProjectOnServerTask.run");
+ Trace.tracePoint("Entry ", Activator.traceCore, "SynchronizeProjectOnServerTask.run");
if (canUpdateState()) {
@@ -113,13 +113,13 @@ public class SynchronizeProjectOnServerT
removedModules.toArray(removedModules2);
removeModules(removedModules2);
} else {
- Trace.trace(Trace.INFO, "SynchronizeProjectOnServerTask: no configuration is removed outside eclipse on server: " + this.server.getId());
+ Trace.trace(Trace.INFO, "SynchronizeProjectOnServerTask: no configuration is removed outside eclipse on server: " + this.server.getId(), Activator.traceCore);
}
}
} else {
- Trace.trace(Trace.INFO, "SynchronizeProjectOnServerTask: no project has been deployed on server: " + this.server.getId());
+ Trace.trace(Trace.INFO, "SynchronizeProjectOnServerTask: no project has been deployed on server: " + this.server.getId(), Activator.traceCore);
}
} catch (Exception e) {
@@ -127,7 +127,7 @@ public class SynchronizeProjectOnServerT
}
}
- Trace.tracePoint("Exit ", "SynchronizeProjectOnServerTask.run");
+ Trace.tracePoint("Exit ", Activator.traceCore, "SynchronizeProjectOnServerTask.run");
}
private void setModuleState(IModule[] modules, int state) {
@@ -154,7 +154,7 @@ public class SynchronizeProjectOnServerT
private void removeModules(IModule[] remove) {
- Trace.tracePoint("Entry ", "SynchronizeProjectOnServerTask.removeModules", remove);
+ Trace.tracePoint("Entry ", Activator.traceCore, "SynchronizeProjectOnServerTask.removeModules", remove);
IServerWorkingCopy wc = server.createWorkingCopy();
IProgressMonitor monitor = new NullProgressMonitor();
@@ -169,10 +169,10 @@ public class SynchronizeProjectOnServerT
}
}
} catch (CoreException e) {
- Trace.trace(Trace.WARNING, "Could not remove module in SynchronizeProjectOnServerTask", e);
+ Trace.trace(Trace.WARNING, "Could not remove module in SynchronizeProjectOnServerTask", e, Activator.logCore);
}
- Trace.tracePoint("Exit ", "SynchronizeProjectOnServerTask.removeModules");
+ Trace.tracePoint("Exit ", Activator.traceCore, "SynchronizeProjectOnServerTask.removeModules");
}
private boolean canUpdateState() {
@@ -189,7 +189,7 @@ public class SynchronizeProjectOnServerT
if (isSameConnectionURL(gs, thisServer)) {
if (!isSameRuntimeLocation(server) && server.getServerState() != IServer.STATE_STOPPED) {
Trace.trace(Trace.WARNING, server.getId()
- + " Cannot update server state. URL conflict between multiple servers.");
+ + " Cannot update server state. URL conflict between multiple servers.", Activator.logCore);
return false;
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/UpdateServerStateTask.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/UpdateServerStateTask.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/UpdateServerStateTask.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/UpdateServerStateTask.java Wed May 25 08:16:27 2011
@@ -18,6 +18,7 @@ package org.apache.geronimo.st.v30.core;
import java.util.TimerTask;
+import org.apache.geronimo.st.v30.core.Activator;
import org.apache.geronimo.st.v30.core.internal.Trace;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.wst.server.core.IServer;
@@ -66,7 +67,8 @@ public class UpdateServerStateTask exten
if (gs != null && !this.server.getId().equals(server.getId())) {
if (isSameConnectionURL(gs, thisServer)) {
if (!isSameRuntimeLocation(server) && server.getServerState() != IServer.STATE_STOPPED) {
- Trace.trace(Trace.WARNING, server.getId() + " Cannot update server state. URL conflict between multiple servers.");
+ Trace.trace(Trace.WARNING, server.getId() + " Cannot update server state. " +
+ " URL conflict between multiple servers.", Activator.logCore);
return false;
}
}
@@ -85,7 +87,7 @@ public class UpdateServerStateTask exten
}
private void updateServerState() {
- Trace.trace(Trace.INFO, ">> " + server.getId() + " Updating Server State.");
+ Trace.trace(Trace.INFO, ">> " + server.getId() + " Updating Server State.", Activator.traceCore);
try {
switch (server.getServerState()) {
case IServer.STATE_STOPPED:
@@ -105,7 +107,7 @@ public class UpdateServerStateTask exten
} catch (Exception e) {
e.printStackTrace();
}
- Trace.trace(Trace.INFO, "<< " + server.getId() + " Updating Server State.");
+ Trace.trace(Trace.INFO, "<< " + server.getId() + " Updating Server State.", Activator.traceCore);
}
private void updateFromStopped() throws CoreException {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/DeployCommand.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/commands/DeployCommand.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/commands/DeployCommand.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/DeployCommand.java Wed May 25 08:16:27 2011
@@ -52,7 +52,7 @@ abstract public class DeployCommand exte
* @return A File representation of the zipped/jar file
*/
public File getTargetFile() throws CoreException {
- Trace.tracePoint("Entry", "DeployCommand.getTargetFile");
+ Trace.tracePoint("Entry", Activator.traceCommands, "DeployCommand.getTargetFile");
IModule module = getModule();
File file = DeploymentUtils.getTargetFile(getServer(), module);
@@ -62,7 +62,7 @@ abstract public class DeployCommand exte
Messages.bind(Messages.moduleExportError, module.getProject().getName())));
}
- Trace.tracePoint("Exit ", "DeployCommand.getTargetFile", file);
+ Trace.tracePoint("Exit ", Activator.traceCommands, "DeployCommand.getTargetFile", file);
return file;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/DistributeCommand.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/commands/DistributeCommand.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/commands/DistributeCommand.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/DistributeCommand.java Wed May 25 08:16:27 2011
@@ -22,6 +22,7 @@ import javax.enterprise.deploy.shared.Co
import javax.enterprise.deploy.spi.DeploymentManager;
import javax.enterprise.deploy.spi.Target;
+import org.apache.geronimo.st.v30.core.Activator;
import org.apache.geronimo.st.v30.core.internal.Trace;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -54,9 +55,9 @@ class DistributeCommand extends DeployCo
if (targets == null)
targets = dm.getTargets();
- Trace.trace(Trace.INFO, "Available targets: ");
+ Trace.trace(Trace.INFO, "Available targets: ", Activator.traceCommands);
for ( int ii=0; ii<targets.length; ii++ ) {
- Trace.trace(Trace.INFO, "--> Target[" + ii + "]: " + targets[ii]);
+ Trace.trace(Trace.INFO, "--> Target[" + ii + "]: " + targets[ii], Activator.traceCommands);
}
//
@@ -68,8 +69,8 @@ class DistributeCommand extends DeployCo
Target[] defaultTarget = new Target[1];
defaultTarget[0] = targets[0];
- Trace.trace(Trace.INFO, "Using default target:");
- Trace.trace(Trace.INFO, "--> " + defaultTarget[0]);
+ Trace.trace(Trace.INFO, "Using default target:", Activator.traceCommands);
+ Trace.trace(Trace.INFO, "--> " + defaultTarget[0], Activator.traceCommands);
File file = getTargetFile();
return new DeploymentCmdStatus(Status.OK_STATUS, dm.distribute( defaultTarget, file, null));
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/SynchronizedDeploymentOp.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/commands/SynchronizedDeploymentOp.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/commands/SynchronizedDeploymentOp.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/SynchronizedDeploymentOp.java Wed May 25 08:16:27 2011
@@ -79,7 +79,7 @@ public class SynchronizedDeploymentOp im
}
private synchronized ProgressObject run() throws Exception {
- Trace.trace(Trace.INFO, "--> run()");
+ Trace.trace(Trace.INFO, "--> run()", Activator.traceCommands);
IStatus ds = command.execute(_monitor);
@@ -96,19 +96,19 @@ public class SynchronizedDeploymentOp im
po.removeProgressListener(this);
if (timedOut) {
- Trace.trace(Trace.SEVERE, "Command Timed Out!");
+ Trace.trace(Trace.ERROR, "Command Timed Out!", Activator.logCommands);
status = new MultiStatus(Activator.PLUGIN_ID, 0, "", null);
status.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, command.getCommandType() + " timed out.", null));
}
}
- Trace.trace(Trace.INFO, "<-- run()");
+ Trace.trace(Trace.INFO, "<-- run()", Activator.traceCommands);
return po;
}
private synchronized void sendNotification() {
timedOut = false;
- Trace.trace(Trace.INFO, "notifyAll()");
+ Trace.trace(Trace.INFO, "notifyAll()", Activator.traceCommands);
notifyAll();
}
@@ -121,7 +121,7 @@ public class SynchronizedDeploymentOp im
DeploymentStatus deploymentStatus = event.getDeploymentStatus();
if (deploymentStatus != null) {
DeploymentStatusMessage dsm = new DeploymentStatusMessage(deploymentStatus);
- Trace.trace(Trace.INFO, dsm.toString());
+ Trace.trace(Trace.INFO, dsm.toString(), Activator.traceCommands);
_monitor.subTask(dsm.toString());
if (command.getCommandType() == deploymentStatus.getCommand()) {
if (deploymentStatus.isCompleted()) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/facets/DeploymentPlanCreationOperation.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/facets/DeploymentPlanCreationOperation.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/facets/DeploymentPlanCreationOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/facets/DeploymentPlanCreationOperation.java Wed May 25 08:16:27 2011
@@ -126,7 +126,7 @@ public class DeploymentPlanCreationOpera
* @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.traceFacets,
"DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan", dpFile);
org.apache.geronimo.jee.application.ObjectFactory applicationFactory = new org.apache.geronimo.jee.application.ObjectFactory();
@@ -138,7 +138,7 @@ public class DeploymentPlanCreationOpera
JAXBElement jaxbElement = applicationFactory.createApplication(application);
JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
- Trace.tracePoint("Exit ", "DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan",
+ Trace.tracePoint("Exit ", Activator.traceFacets, "DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan",
applicationFactory.createApplication(application));
return applicationFactory.createApplication(application);
}
@@ -150,7 +150,7 @@ public class DeploymentPlanCreationOpera
* @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoWebDeploymentPlan(org.eclipse.core.resources.IFile)
*/
public JAXBElement createGeronimoWebDeploymentPlan(IFile dpFile) throws Exception {
- Trace.tracePoint("Entry", "DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan",
+ Trace.tracePoint("Entry", Activator.traceFacets, "DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan",
dpFile, dpFile.getFullPath());
org.apache.geronimo.jee.web.ObjectFactory webFactory = new org.apache.geronimo.jee.web.ObjectFactory();
@@ -164,7 +164,7 @@ public class DeploymentPlanCreationOpera
JAXBElement jaxbElement = webFactory.createWebApp(web);
JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
- Trace.tracePoint("Exit ", "DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan", jaxbElement);
+ Trace.tracePoint("Exit ", Activator.traceFacets, "DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan", jaxbElement);
return jaxbElement;
}
@@ -175,7 +175,7 @@ public class DeploymentPlanCreationOpera
* @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createOpenEjbDeploymentPlan(org.eclipse.core.resources.IFile)
*/
public JAXBElement createOpenEjbDeploymentPlan(IFile dpFile) throws Exception {
- Trace.tracePoint("Entry", "DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", dpFile);
+ Trace.tracePoint("Entry", Activator.traceFacets, "DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", dpFile);
org.apache.geronimo.jee.openejb.ObjectFactory ejbFactory = new org.apache.geronimo.jee.openejb.ObjectFactory();
OpenejbJar ejbJar = ejbFactory.createOpenejbJar();
@@ -185,7 +185,7 @@ public class DeploymentPlanCreationOpera
JAXBElement jaxbElement = ejbFactory.createOpenejbJar(ejbJar);
JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
- Trace.tracePoint("Exit ", "DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", jaxbElement);
+ Trace.tracePoint("Exit ", Activator.traceFacets, "DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", jaxbElement);
return jaxbElement;
}
@@ -196,7 +196,7 @@ public class DeploymentPlanCreationOpera
* @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createConnectorDeploymentPlan(org.eclipse.core.resources.IFile)
*/
public JAXBElement createConnectorDeploymentPlan(IFile dpFile) throws Exception {
- Trace.tracePoint("Entry", "DeploymentPlanCreationOperation.createConnectorDeploymentPlan", dpFile);
+ Trace.tracePoint("Entry", Activator.traceFacets, "DeploymentPlanCreationOperation.createConnectorDeploymentPlan", dpFile);
org.apache.geronimo.jee.connector.ObjectFactory connectorFactory = new org.apache.geronimo.jee.connector.ObjectFactory();
Connector connector = connectorFactory.createConnector();
@@ -208,7 +208,7 @@ public class DeploymentPlanCreationOpera
JAXBElement jaxbElement = connectorFactory.createConnector(connector);
JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
- Trace.tracePoint("Exit ", "DeploymentPlanCreationOperation.createConnectorDeploymentPlan", jaxbElement);
+ Trace.tracePoint("Exit ", Activator.traceFacets, "DeploymentPlanCreationOperation.createConnectorDeploymentPlan", jaxbElement);
return jaxbElement;
}
@@ -219,7 +219,7 @@ public class DeploymentPlanCreationOpera
* @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoApplicationDeploymentPlan(org.eclipse.core.resources.IFile)
*/
public JAXBElement createGeronimoApplicationClientDeploymentPlan(IFile dpFile) throws Exception {
- Trace.tracePoint("Entry","DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan", dpFile);
+ Trace.tracePoint("Entry", Activator.traceFacets,"DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan", dpFile);
org.apache.geronimo.jee.applicationclient.ObjectFactory applicationClientFactory = new org.apache.geronimo.jee.applicationclient.ObjectFactory();
ApplicationClient applicationClient = applicationClientFactory.createApplicationClient();
@@ -230,13 +230,13 @@ public class DeploymentPlanCreationOpera
JAXBElement jaxbElement = applicationClientFactory.createApplicationClient(applicationClient);
JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
- Trace.tracePoint("Exit ", "DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan", applicationClientFactory.createApplicationClient(applicationClient));
+ Trace.tracePoint("Exit ", Activator.traceFacets, "DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan", applicationClientFactory.createApplicationClient(applicationClient));
return applicationClientFactory.createApplicationClient(applicationClient);
}
public Environment getConfigEnvironment() {
- Trace.tracePoint("Entry", "DeploymentPlanCreationOperation.getConfigEnvironment");
+ Trace.tracePoint("Entry", Activator.traceFacets, "DeploymentPlanCreationOperation.getConfigEnvironment");
String groupId = cfg != null && hasValue(cfg.getGroupId()) ? cfg.getGroupId()
: "default";
@@ -260,13 +260,13 @@ public class DeploymentPlanCreationOpera
env.setDependencies(dt);
}
- Trace.tracePoint("Exit ", "DeploymentPlanCreationOperation.getConfigEnvironment", env);
+ Trace.tracePoint("Exit ", Activator.traceFacets, "DeploymentPlanCreationOperation.getConfigEnvironment", env);
return env;
}
public static Artifact createArtifact(String groupId, String artifactId, String version, String type) {
- Trace.tracePoint("Entry", "DeploymentPlanCreationOperation.createArtifact", groupId, artifactId, version, type);
+ Trace.tracePoint("Entry", Activator.traceFacets, "DeploymentPlanCreationOperation.createArtifact", groupId, artifactId, version, type);
org.apache.geronimo.jee.deployment.ObjectFactory serviceFactory = new org.apache.geronimo.jee.deployment.ObjectFactory();
Artifact artifact = serviceFactory.createArtifact();
@@ -279,13 +279,13 @@ public class DeploymentPlanCreationOpera
artifact.setVersion(version);
artifact.setType(type);
- Trace.tracePoint("Exit ", "DeploymentPlanCreationOperation.createArtifact", artifact);
+ Trace.tracePoint("Exit ", Activator.traceFacets, "DeploymentPlanCreationOperation.createArtifact", artifact);
return artifact;
}
public static Dependency createDependency(String groupId, String artifactId, String version, String type) {
- Trace.tracePoint("Entry", "DeploymentPlanCreationOperation.createDependency", groupId, artifactId, version, type);
+ Trace.tracePoint("Entry", Activator.traceFacets, "DeploymentPlanCreationOperation.createDependency", groupId, artifactId, version, type);
org.apache.geronimo.jee.deployment.ObjectFactory serviceFactory = new org.apache.geronimo.jee.deployment.ObjectFactory();
Dependency dependency = serviceFactory.createDependency();
@@ -297,14 +297,14 @@ public class DeploymentPlanCreationOpera
dependency.setVersion(version);
dependency.setType(type);
- Trace.tracePoint("Exit ", "DeploymentPlanCreationOperation.createDependency", dependency);
+ Trace.tracePoint("Exit ", Activator.traceFacets, "DeploymentPlanCreationOperation.createDependency", dependency);
return dependency;
}
private static boolean hasValue(String attribute) {
- Trace.tracePoint("Entry", "DeploymentPlanCreationOperation.hasValue", attribute);
- Trace.tracePoint("Exit ", "DeploymentPlanCreationOperation.hasValue", (attribute != null && attribute.trim().length() != 0) );
+ Trace.tracePoint("Entry", Activator.traceFacets, "DeploymentPlanCreationOperation.hasValue", attribute);
+ Trace.tracePoint("Exit ", Activator.traceFacets, "DeploymentPlanCreationOperation.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.v30.core/src/main/java/org/apache/geronimo/st/v30/core/facets/DeploymentPlanInstallConfig.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/facets/DeploymentPlanInstallConfig.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/facets/DeploymentPlanInstallConfig.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/facets/DeploymentPlanInstallConfig.java Wed May 25 08:16:27 2011
@@ -16,6 +16,7 @@
*/
package org.apache.geronimo.st.v30.core.facets;
+import org.apache.geronimo.st.v30.core.Activator;
import org.apache.geronimo.st.v30.core.internal.Trace;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
@@ -44,7 +45,7 @@ public class DeploymentPlanInstallConfig
public static final class Factory implements IActionConfigFactory {
public Object create() {
- Trace.tracePoint("Entry/Exit", "DeploymentPlanInstallConfig.create");
+ Trace.tracePoint("Entry/Exit", Activator.traceFacets, "DeploymentPlanInstallConfig.create");
enableGenerationDDByDefault();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/facets/GeronimoJEEFacetInstallDelegate.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/facets/GeronimoJEEFacetInstallDelegate.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/facets/GeronimoJEEFacetInstallDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/facets/GeronimoJEEFacetInstallDelegate.java Wed May 25 08:16:27 2011
@@ -16,6 +16,7 @@
*/
package org.apache.geronimo.st.v30.core.facets;
+import org.apache.geronimo.st.v30.core.Activator;
import org.apache.geronimo.st.v30.core.internal.Trace;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IProject;
@@ -56,7 +57,7 @@ public class GeronimoJEEFacetInstallDele
* @throws CoreException if the delegate fails for any reason
*/
public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
- Trace.tracePoint("Entry", "GeronimoJEEFacetInstallDelegate.execute", project, fv, config, monitor);
+ Trace.tracePoint("Entry", Activator.traceFacets, "GeronimoJEEFacetInstallDelegate.execute", project, fv, config, monitor);
try {
createDeploymentPlanCreationOp(project, config).execute(monitor, null);
@@ -77,16 +78,16 @@ public class GeronimoJEEFacetInstallDele
}
}
- Trace.tracePoint("Exit ", "GeronimoJEEFacetInstallDelegate.execute");
+ Trace.tracePoint("Exit ", Activator.traceFacets, "GeronimoJEEFacetInstallDelegate.execute");
}
public IDataModelOperation createDeploymentPlanCreationOp(IProject project, Object config) {
- Trace.tracePoint("Entry", "GeronimoJEEFacetInstallDelegate.createDeploymentPlanCreationOp", project, config);
+ Trace.tracePoint("Entry", Activator.traceFacets, "GeronimoJEEFacetInstallDelegate.createDeploymentPlanCreationOp", project, config);
IDataModel model = DataModelFactory.createDataModel(new JavaProjectFacetCreationDataModelProvider());
model.setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
- Trace.tracePoint("Exit ", "GeronimoJEEFacetInstallDelegate.createDeploymentPlanCreationOp");
+ Trace.tracePoint("Exit ", Activator.traceFacets, "GeronimoJEEFacetInstallDelegate.createDeploymentPlanCreationOp");
return new DeploymentPlanCreationOperation(model, config);
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/DependencyHelper.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/internal/DependencyHelper.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/internal/DependencyHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/DependencyHelper.java Wed May 25 08:16:27 2011
@@ -35,6 +35,7 @@ import org.apache.geronimo.jee.deploymen
import org.apache.geronimo.jee.deployment.ObjectFactory;
import org.apache.geronimo.jee.openejb.OpenejbJar;
import org.apache.geronimo.jee.web.WebApp;
+import org.apache.geronimo.st.v30.core.Activator;
import org.apache.geronimo.st.v30.core.DeploymentUtils;
import org.apache.geronimo.st.v30.core.GeronimoUtils;
import org.apache.geronimo.st.v30.core.jaxb.JAXBUtils;
@@ -82,7 +83,7 @@ public class DependencyHelper {
* @return List of reordered modules and deltaKind (or input if no change)
*/
public List reorderModules(IServer server, List modules, List deltaKind) {
- Trace.tracePoint("Entry", "DependencyHelper.reorderModules", modules, deltaKind);
+ Trace.tracePoint("Entry", Activator.traceInternal, "DependencyHelper.reorderModules", modules, deltaKind);
// provide a cache
ConcurrentHashMap<String, Boolean> verifiedModules = new ConcurrentHashMap<String, Boolean>();
@@ -91,7 +92,7 @@ public class DependencyHelper {
List reorderedLists = new ArrayList(2);
reorderedLists.add(modules);
reorderedLists.add(deltaKind);
- Trace.tracePoint("Exit ", "DependencyHelper.reorderModules", reorderedLists);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.reorderModules", reorderedLists);
return reorderedLists;
}
@@ -221,7 +222,7 @@ public class DependencyHelper {
reorderedLists.add(reorderedModules);
reorderedLists.add(reorderedKinds);
- Trace.tracePoint("Exit ", "DependencyHelper.reorderModules", reorderedLists);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.reorderModules", reorderedLists);
return reorderedLists;
}
@@ -233,10 +234,10 @@ public class DependencyHelper {
* @return List of JAXBElements (or input if no change)
*/
public List<JAXBElement> reorderJAXBElements(List<JAXBElement> jaxbElements) {
- Trace.tracePoint("Entry", "DependencyHelper.reorderModules", jaxbElements);
+ Trace.tracePoint("Entry", Activator.traceInternal, "DependencyHelper.reorderModules", jaxbElements);
if (jaxbElements.size() == 0) {
- Trace.tracePoint("Exit ", "DependencyHelper.reorderModules", jaxbElements);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.reorderModules", jaxbElements);
return jaxbElements;
}
@@ -313,7 +314,7 @@ public class DependencyHelper {
//
// Return List of JAXBElements
//
- Trace.tracePoint("Exit ", "DependencyHelper.reorderModules", reorderedJAXBElements);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.reorderModules", reorderedJAXBElements);
return reorderedJAXBElements;
}
@@ -339,10 +340,10 @@ public class DependencyHelper {
* @param terminatingArtifact
*/
private void processParents(Set parents, Artifact terminatingArtifact) {
- Trace.tracePoint("Enter", "DependencyHelper.processParents", parents, terminatingArtifact);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.processParents", parents, terminatingArtifact);
if (parents == null) {
- Trace.tracePoint("Exit ", "DependencyHelper.processParents", null);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.processParents", null);
return;
}
for (Iterator ii = parents.iterator(); ii.hasNext();) {
@@ -369,7 +370,7 @@ public class DependencyHelper {
}
}
- Trace.tracePoint("Exit ", "DependencyHelper.processParents");
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.processParents");
}
/**
@@ -381,7 +382,7 @@ public class DependencyHelper {
* @return Environment
*/
private Environment getEnvironment(IModule module) {
- Trace.tracePoint("Enter", "DependencyHelper.getEnvironment", module);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.getEnvironment", module);
// if module's environment is in the cache, get it from the cache
if (environmentCache.containsKey(module)) {
@@ -426,7 +427,7 @@ public class DependencyHelper {
environmentCache.put(module, environment);
}
- Trace.tracePoint("Exit ", "DependencyHelper.getEnvironment", environment);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getEnvironment", environment);
return environment;
}
@@ -438,7 +439,7 @@ public class DependencyHelper {
* @return IModule[]
*/
private IModule[] getModule(Artifact artifact) {
- Trace.tracePoint("Enter", "DependencyHelper.getModule", artifact);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.getModule", artifact);
for (int ii = 0; ii < inputModules.size(); ii++) {
IModule[] module = (IModule[]) inputModules.get(ii);
@@ -447,13 +448,13 @@ public class DependencyHelper {
if (environment != null) {
Artifact moduleArtifact = environment.getModuleId();
if (artifact.equals(moduleArtifact)) {
- Trace.tracePoint("Exit ", "DependencyHelper.getModule", module);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getModule", module);
return module;
}
}
}
- Trace.tracePoint("Exit ", "DependencyHelper.getModule", null);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getModule", null);
return null;
}
@@ -465,7 +466,7 @@ public class DependencyHelper {
* @return int
*/
private int getDeltaKind(Artifact artifact) {
- Trace.tracePoint("Enter", "DependencyHelper.getDeltaKind", artifact);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.getDeltaKind", artifact);
for (int ii = 0; ii < inputModules.size(); ii++) {
IModule[] module = (IModule[]) inputModules.get(ii);
@@ -474,12 +475,12 @@ public class DependencyHelper {
if (environment != null) {
Artifact moduleArtifact = environment.getModuleId();
if (artifact.equals(moduleArtifact)) {
- Trace.tracePoint("Exit ", "DependencyHelper.getDeltaKind", moduleDeltaKind);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getDeltaKind", moduleDeltaKind);
return moduleDeltaKind;
}
}
}
- Trace.tracePoint("Exit ", "DependencyHelper.getDeltaKind", 0);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getDeltaKind", 0);
return 0;
}
@@ -492,13 +493,13 @@ public class DependencyHelper {
* @return WebApp
*/
private JAXBElement<WebApp> getWebDeploymentPlan(IModule module) {
- Trace.tracePoint("Enter", "DependencyHelper.getWebDeploymentPlan", module);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.getWebDeploymentPlan", module);
IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
IFile file = GeronimoUtils.getWebDeploymentPlanFile(comp);
if (file.getName().equals(GeronimoUtils.WEB_PLAN_NAME) && file.exists()) {
try {
- Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan",
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getWebDeploymentPlan",
JAXBUtils.unmarshalFilterDeploymentPlan(file));
return JAXBUtils.unmarshalFilterDeploymentPlan(file);
} catch (Exception e) {
@@ -507,7 +508,7 @@ public class DependencyHelper {
}
- Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan", null);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getWebDeploymentPlan", null);
return null;
}
@@ -520,13 +521,13 @@ public class DependencyHelper {
* @return OpenEjbJar
*/
private JAXBElement<OpenejbJar> getOpenEjbDeploymentPlan(IModule module) {
- Trace.tracePoint("Enter", "DependencyHelper.getOpenEjbDeploymentPlan", module);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.getOpenEjbDeploymentPlan", module);
IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
IFile file = GeronimoUtils.getOpenEjbDeploymentPlanFile(comp);
if (file.getName().equals(GeronimoUtils.OPENEJB_PLAN_NAME) && file.exists()) {
try {
- Trace.tracePoint("Exit ", "DependencyHelper.getOpenEjbDeploymentPlan",
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getOpenEjbDeploymentPlan",
JAXBUtils.unmarshalFilterDeploymentPlan(file));
} catch (Exception e) {
// ignore it, just indicate error by returning null
@@ -538,7 +539,7 @@ public class DependencyHelper {
}
}
- Trace.tracePoint("Exit ", "DependencyHelper.getOpenEjbDeploymentPlan", null);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getOpenEjbDeploymentPlan", null);
return null;
}
@@ -551,13 +552,13 @@ public class DependencyHelper {
* @return ApplicationClient
*/
private JAXBElement<ApplicationClient> getAppClientDeploymentPlan(IModule module) {
- Trace.tracePoint("Enter", "DependencyHelper.getWebDeploymentPlan", module);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.getWebDeploymentPlan", module);
IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
IFile file = GeronimoUtils.getApplicationClientDeploymentPlanFile(comp);
if (file.getName().equals(GeronimoUtils.APP_CLIENT_PLAN_NAME) && file.exists()) {
try {
- Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan",
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getWebDeploymentPlan",
JAXBUtils.unmarshalFilterDeploymentPlan(file));
return JAXBUtils.unmarshalFilterDeploymentPlan(file);
} catch (Exception e) {
@@ -566,7 +567,7 @@ public class DependencyHelper {
}
- Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan", null);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getWebDeploymentPlan", null);
return null;
}
@@ -579,13 +580,13 @@ public class DependencyHelper {
* @return Application
*/
private JAXBElement<Application> getApplicationDeploymentPlan(IModule module) {
- Trace.tracePoint("Enter", "DependencyHelper.getApplicationDeploymentPlan", module);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.getApplicationDeploymentPlan", module);
IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
IFile file = GeronimoUtils.getApplicationDeploymentPlanFile(comp);
if (file.getName().equals(GeronimoUtils.APP_PLAN_NAME) && file.exists()) {
try {
- Trace.tracePoint("Exit ", "DependencyHelper.getApplicationDeploymentPlan",
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getApplicationDeploymentPlan",
JAXBUtils.unmarshalFilterDeploymentPlan(file));
return JAXBUtils.unmarshalFilterDeploymentPlan(file);
} catch (Exception e) {
@@ -594,7 +595,7 @@ public class DependencyHelper {
}
- Trace.tracePoint("Exit ", "DependencyHelper.getApplicationDeploymentPlan", null);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getApplicationDeploymentPlan", null);
return null;
}
@@ -607,13 +608,13 @@ public class DependencyHelper {
* @return Application
*/
private JAXBElement<Connector> getConnectorDeploymentPlan(IModule module) {
- Trace.tracePoint("Enter", "DependencyHelper.getConnectorDeploymentPlan", module);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.getConnectorDeploymentPlan", module);
IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
IFile file = GeronimoUtils.getConnectorDeploymentPlanFile(comp);
if (file.getName().equals(GeronimoUtils.CONNECTOR_PLAN_NAME) && file.exists()) {
try {
- Trace.tracePoint("Exit ", "DependencyHelper.getConnectorDeploymentPlan",
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getConnectorDeploymentPlan",
JAXBUtils.unmarshalFilterDeploymentPlan(file));
return JAXBUtils.unmarshalFilterDeploymentPlan(file);
} catch (Exception e) {
@@ -622,7 +623,7 @@ public class DependencyHelper {
}
- Trace.tracePoint("Exit ", "DependencyHelper.getConnectorDeploymentPlan", null);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getConnectorDeploymentPlan", null);
return null;
}
@@ -635,10 +636,10 @@ public class DependencyHelper {
* @param terminatingArtifact
*/
private void processJaxbParents(Set parents, Artifact terminatingArtifact) {
- Trace.tracePoint("Enter", "DependencyHelper.processJaxbParents", parents, terminatingArtifact);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.processJaxbParents", parents, terminatingArtifact);
if (parents == null) {
- Trace.tracePoint("Exit ", "DependencyHelper.processJaxbParents", null);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.processJaxbParents", null);
return;
}
for (Iterator ii = parents.iterator(); ii.hasNext();) {
@@ -665,7 +666,7 @@ public class DependencyHelper {
}
}
- Trace.tracePoint("Exit ", "DependencyHelper.processJaxbParents");
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.processJaxbParents");
}
/**
@@ -677,7 +678,7 @@ public class DependencyHelper {
* @return Environment
*/
private Environment getEnvironment(JAXBElement jaxbElement) {
- Trace.tracePoint("Enter", "DependencyHelper.getEnvironment", jaxbElement);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.getEnvironment", jaxbElement);
Environment environment = null;
Object plan = jaxbElement.getValue();
@@ -693,7 +694,7 @@ public class DependencyHelper {
}
}
- Trace.tracePoint("Exit ", "DependencyHelper.getEnvironment", environment);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getEnvironment", environment);
return environment;
}
@@ -705,21 +706,21 @@ public class DependencyHelper {
* @return JAXBElement
*/
private JAXBElement getJaxbElement(Artifact artifact) {
- Trace.tracePoint("Enter", "DependencyHelper.getJaxbElement", artifact);
+ Trace.tracePoint("Enter", Activator.traceInternal, "DependencyHelper.getJaxbElement", artifact);
for (JAXBElement jaxbElement : inputJAXBElements) {
Environment environment = getEnvironment(jaxbElement);
if (environment != null) {
Artifact jaxbArtifact = environment.getModuleId();
if (artifact.equals(jaxbArtifact)) {
- Trace.tracePoint("Exit ", "DependencyHelper.getJaxbElement", jaxbElement);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getJaxbElement", jaxbElement);
return jaxbElement;
}
}
}
// TODO: Query the server searching for missing dependencies
- Trace.tracePoint("Exit ", "DependencyHelper.getJaxbElement", null);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyHelper.getJaxbElement", null);
return null;
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/DependencyManager.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/internal/DependencyManager.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/internal/DependencyManager.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/DependencyManager.java Wed May 25 08:16:27 2011
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.geronimo.jee.deployment.Artifact;
+import org.apache.geronimo.st.v30.core.Activator;
/**
* <b>DependencyManager</b> is very closely-based on the similar class in the Geronimo server.
@@ -71,7 +72,7 @@ public class DependencyManager {
* @param parent the component the child is depending on
*/
public void addDependency(Artifact child, Artifact parent) {
- Trace.tracePoint("Entry", "DependencyManager.addDependency", child, parent);
+ Trace.tracePoint("Entry", Activator.traceInternal, "DependencyManager.addDependency", child, parent);
Set parents = (Set) childToParentMap.get(child);
if (parents == null) {
@@ -87,8 +88,8 @@ public class DependencyManager {
}
children.add(child);
- Trace.tracePoint("Exit ", "DependencyManager.addDependency", childToParentMap.size() );
- Trace.tracePoint("Exit ", "DependencyManager.addDependency", parentToChildMap.size() );
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyManager.addDependency", childToParentMap.size() );
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyManager.addDependency", parentToChildMap.size() );
}
@@ -99,7 +100,7 @@ public class DependencyManager {
* @param parent the component that the child wil no longer depend on
*/
public void removeDependency(Artifact child, Artifact parent) {
- Trace.tracePoint("Entry", "DependencyManager.removeDependency", child, parent);
+ Trace.tracePoint("Entry", Activator.traceInternal, "DependencyManager.removeDependency", child, parent);
Set parents = (Set) childToParentMap.get(child);
if (parents != null) {
@@ -111,7 +112,7 @@ public class DependencyManager {
children.remove(child);
}
- Trace.tracePoint("Exit ", "DependencyManager.addDependency");
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyManager.addDependency");
}
@@ -121,7 +122,7 @@ public class DependencyManager {
* @param child the component that will no longer depend on anything
*/
public void removeAllDependencies(Artifact child) {
- Trace.tracePoint("Entry", "DependencyManager.removeAllDependencies", child);
+ Trace.tracePoint("Entry", Activator.traceInternal, "DependencyManager.removeAllDependencies", child);
Set parents = (Set) childToParentMap.remove(child);
if (parents == null) {
@@ -136,7 +137,7 @@ public class DependencyManager {
}
}
- Trace.tracePoint("Exit ", "DependencyManager.removeAllDependencies");
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyManager.removeAllDependencies");
}
@@ -147,7 +148,7 @@ public class DependencyManager {
* @param parents the set of components the child is depending on
*/
public void addDependencies(Artifact child, Set parents) {
- Trace.tracePoint("Entry", "DependencyManager.addDependencies", child, parents);
+ Trace.tracePoint("Entry", Activator.traceInternal, "DependencyManager.addDependencies", child, parents);
Set existingParents = (Set) childToParentMap.get(child);
if (existingParents == null) {
@@ -168,7 +169,7 @@ public class DependencyManager {
children.add(child);
}
- Trace.tracePoint("Exit ", "DependencyManager.addDependencies");
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyManager.addDependencies");
}
@@ -179,15 +180,15 @@ public class DependencyManager {
* @return a collection containing all of the components the child depends on; will never be null
*/
public Set getParents(Artifact child) {
- Trace.tracePoint("Entry", "DependencyManager.getParents", child);
+ Trace.tracePoint("Entry", Activator.traceInternal, "DependencyManager.getParents", child);
Set parents = (Set) childToParentMap.get(child);
if (parents == null) {
- Trace.tracePoint("Exit", "DependencyManager.getParents", 0);
+ Trace.tracePoint("Exit", Activator.traceInternal, "DependencyManager.getParents", 0);
return Collections.EMPTY_SET;
}
- Trace.tracePoint("Exit", "DependencyManager.getParents", parents.size() );
+ Trace.tracePoint("Exit", Activator.traceInternal, "DependencyManager.getParents", parents.size() );
return new LinkedHashSet(parents);
}
@@ -199,15 +200,15 @@ public class DependencyManager {
* @return a collection containing all of the components that depend on the parent; will never be null
*/
public Set getChildren(Artifact parent) {
- Trace.tracePoint("Entry", "DependencyManager.getChildren", parent);
+ Trace.tracePoint("Entry", Activator.traceInternal, "DependencyManager.getChildren", parent);
Set children = (Set) parentToChildMap.get(parent);
if (children == null) {
- Trace.tracePoint("Exit ", "DependencyManager.getChildren", 0);
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyManager.getChildren", 0);
return Collections.EMPTY_SET;
}
- Trace.tracePoint("Exit ", "DependencyManager.getChildren", children.size() );
+ Trace.tracePoint("Exit ", Activator.traceInternal, "DependencyManager.getChildren", children.size() );
return new LinkedHashSet(children);
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.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/internal/Trace.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/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java Wed May 25 08:16:27 2011
@@ -16,6 +16,7 @@
*/
package org.apache.geronimo.st.v30.core.internal;
+import org.apache.geronimo.runtime.common.log.Logger;
import org.apache.geronimo.st.v30.core.Activator;
/**
@@ -28,21 +29,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();
}
@@ -55,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);
}
/**
@@ -69,14 +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,20 +105,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.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/BlueprintJAXBHelper.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/jaxb/BlueprintJAXBHelper.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/jaxb/BlueprintJAXBHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/BlueprintJAXBHelper.java Wed May 25 08:16:27 2011
@@ -184,7 +184,7 @@ public class BlueprintJAXBHelper {
typeList.add(wrapper);
} catch (ClassNotFoundException e) {
- Trace.trace(Trace.SEVERE, "can't find type " + typeName + " in blueprint classes", e);
+ Trace.trace(Trace.ERROR, "can't find type " + typeName + " in blueprint classes", e, Activator.logJaxb );
}
}
@@ -496,9 +496,9 @@ public class BlueprintJAXBHelper {
if (isSetter) return clazz.getMethod(sb.toString(),field.getType());
else return clazz.getMethod(sb.toString());
} catch (SecurityException e) {
- Trace.trace(Trace.SEVERE, "can't get method by field", e);
+ Trace.trace(Trace.ERROR, "can't get method by field", e, Activator.logJaxb);
} catch (NoSuchMethodException e) {
- Trace.trace(Trace.SEVERE, "can't get method by field", e);
+ Trace.trace(Trace.ERROR, "can't get method by field", e, Activator.logJaxb);
}
return null;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/ConversionHelper.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/jaxb/ConversionHelper.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/jaxb/ConversionHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/ConversionHelper.java Wed May 25 08:16:27 2011
@@ -20,6 +20,7 @@ package org.apache.geronimo.st.v30.core.
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
+import org.apache.geronimo.st.v30.core.Activator;
import org.apache.geronimo.st.v30.core.internal.Trace;
import org.eclipse.core.resources.IFile;
@@ -40,11 +41,11 @@ public class ConversionHelper {
* @throws Exception
*/
public static void convertGeronimoWebFile( IFile plan ) throws Exception {
- Trace.tracePoint("Entry", "ConversionHelper.convertGeronimoWebFile", plan);
+ Trace.tracePoint("Entry", Activator.traceJaxb, "ConversionHelper.convertGeronimoWebFile", plan);
convertNamespace( plan );
- Trace.tracePoint("Exit ", "ConversionHelper.convertGeronimoWebFile");
+ Trace.tracePoint("Exit ", Activator.traceJaxb, "ConversionHelper.convertGeronimoWebFile");
}
@@ -56,11 +57,11 @@ public class ConversionHelper {
* @throws Exception
*/
public static void convertOpenEjbJarFile( IFile plan ) throws Exception {
- Trace.tracePoint("Entry", "ConversionHelper.convertGeronimoOpenEjbFile", plan);
+ Trace.tracePoint("Entry", Activator.traceJaxb, "ConversionHelper.convertGeronimoOpenEjbFile", plan);
convertNamespace( plan );
- Trace.tracePoint("Exit ", "ConversionHelper.convertGeronimoOpenEjbFile");
+ Trace.tracePoint("Exit ", Activator.traceJaxb, "ConversionHelper.convertGeronimoOpenEjbFile");
}
@@ -73,11 +74,11 @@ public class ConversionHelper {
* @exception JAXBException if JAXB error
*/
public static void convertGeronimoApplicationFile( IFile plan ) throws Exception {
- Trace.tracePoint("Entry", "ConversionHelper.convertGeronimoApplicationFile", plan);
+ Trace.tracePoint("Entry", Activator.traceJaxb, "ConversionHelper.convertGeronimoApplicationFile", plan);
convertNamespace( plan );
- Trace.tracePoint("Exit ", "ConversionHelper.convertGeronimoApplicationFile");
+ Trace.tracePoint("Exit ", Activator.traceJaxb, "ConversionHelper.convertGeronimoApplicationFile");
}
@@ -90,11 +91,11 @@ public class ConversionHelper {
* @exception JAXBException if JAXB error
*/
public static void convertGeronimoRaFile( IFile plan ) throws Exception {
- Trace.tracePoint("Entry", "ConversionHelper.convertGeronimoRaFile", plan);
+ Trace.tracePoint("Entry", Activator.traceJaxb, "ConversionHelper.convertGeronimoRaFile", plan);
convertNamespace( plan );
- Trace.tracePoint("Exit ", "ConversionHelper.convertGeronimoRaFile");
+ Trace.tracePoint("Exit ", Activator.traceJaxb, "ConversionHelper.convertGeronimoRaFile");
}
@@ -107,11 +108,11 @@ public class ConversionHelper {
* @exception JAXBException if JAXB error
*/
public static void convertGeronimoApplicationClientFile( IFile plan ) throws Exception {
- Trace.tracePoint("Entry", "ConversionHelper.convertGeronimoApplicationClientFile", plan);
+ Trace.tracePoint("Entry", Activator.traceJaxb, "ConversionHelper.convertGeronimoApplicationClientFile", plan);
convertNamespace( plan );
- Trace.tracePoint("Exit ", "ConversionHelper.convertGeronimoApplicationClientFile");
+ Trace.tracePoint("Exit ", Activator.traceJaxb, "ConversionHelper.convertGeronimoApplicationClientFile");
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.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/jaxb/JAXBUtilsProvider.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/jaxb/JAXBUtilsProvider.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.java Wed May 25 08:16:27 2011
@@ -82,7 +82,7 @@ public class JAXBUtilsProvider implement
"org.apache.geronimo.osgi.blueprint:"
, Activator.class.getClassLoader() );
} catch (JAXBException e) {
- Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
+ Trace.tracePoint("JAXBException", Activator.logJaxb, "JAXBContext.newInstance");
e.printStackTrace();
}
return null;
@@ -104,7 +104,7 @@ public class JAXBUtilsProvider implement
return JAXBContext.newInstance(
"org.apache.geronimo.system.plugin.model", Activator.class.getClassLoader() );
} catch (JAXBException e) {
- Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
+ Trace.tracePoint("JAXBException", Activator.logJaxb, "JAXBContext.newInstance");
e.printStackTrace();
}
return null;
@@ -147,22 +147,22 @@ public class JAXBUtilsProvider implement
file.create(inBuffer, true, null);
}
} catch (JAXBException jaxbException) {
- Trace.tracePoint("JAXBException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("JAXBException", Activator.logJaxb, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw jaxbException;
} catch (CoreException coreException) {
- Trace.tracePoint("CoreException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("CoreException", Activator.logJaxb, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw coreException;
} catch (ParserConfigurationException e) {
- Trace.tracePoint("ParserConfigurationException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("ParserConfigurationException", Activator.logJaxb, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw e;
} catch (TransformerConfigurationException e) {
- Trace.tracePoint("TransformerConfigurationException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("TransformerConfigurationException", Activator.logJaxb, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw e;
} catch (UnsupportedEncodingException e) {
- Trace.tracePoint("UnsupportedEncodingException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("UnsupportedEncodingException", Activator.logJaxb, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw e;
} catch (TransformerException e) {
- Trace.tracePoint("TransformerException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("TransformerException", Activator.logJaxb, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw e;
}
}
@@ -179,16 +179,16 @@ public class JAXBUtilsProvider implement
JAXBElement plan = (JAXBElement) unmarshaller.unmarshal(source);
return plan;
} catch (JAXBException e) {
- Trace.tracePoint("JAXBException", "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("JAXBException", Activator.logJaxb, "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
} catch (CoreException e) {
- Trace.tracePoint("CoreException", "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("CoreException", Activator.logJaxb, "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
} catch (ParserConfigurationException e) {
- Trace.tracePoint("ParserConfigurationException", "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("ParserConfigurationException", Activator.logJaxb, "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
} catch (SAXException e) {
- Trace.tracePoint("SAXException", "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("SAXException", Activator.logJaxb, "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
}
}
@@ -223,19 +223,19 @@ public class JAXBUtilsProvider implement
ByteArrayInputStream inBuffer = new ByteArrayInputStream(outBuffer.toByteArray());
outputStream.write(outBuffer.toByteArray());
} catch (JAXBException jaxbException) {
- Trace.tracePoint("JAXBException", "JAXBUtils.marshalDeploymentPlan()");
+ Trace.tracePoint("JAXBException", Activator.logJaxb, "JAXBUtils.marshalDeploymentPlan()");
throw jaxbException;
} catch (IOException coreException) {
- Trace.tracePoint("IOException", "JAXBUtils.marshalDeploymentPlan()");
+ Trace.tracePoint("IOException", Activator.logJaxb, "JAXBUtils.marshalDeploymentPlan()");
throw coreException;
} catch (ParserConfigurationException e) {
- Trace.tracePoint("ParserConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
+ Trace.tracePoint("ParserConfigurationException", Activator.logJaxb, "JAXBUtils.marshalDeploymentPlan()");
throw e;
} catch (TransformerConfigurationException e) {
- Trace.tracePoint("TransformerConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
+ Trace.tracePoint("TransformerConfigurationException", Activator.logJaxb, "JAXBUtils.marshalDeploymentPlan()");
throw e;
} catch (TransformerException e) {
- Trace.tracePoint("TransformerException", "JAXBUtils.marshalDeploymentPlan()");
+ Trace.tracePoint("TransformerException", Activator.logJaxb, "JAXBUtils.marshalDeploymentPlan()");
throw e;
}
}
@@ -252,13 +252,13 @@ public class JAXBUtilsProvider implement
JAXBElement plan = (JAXBElement) unmarshaller.unmarshal(source);
return plan;
} catch (JAXBException e) {
- Trace.tracePoint("JAXBException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+ Trace.tracePoint("JAXBException", Activator.logJaxb, "JAXBUtils.unmarshalFilterDeploymentPlan()");
e.printStackTrace();
} catch (ParserConfigurationException e) {
- Trace.tracePoint("ParserConfigurationException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+ Trace.tracePoint("ParserConfigurationException", Activator.logJaxb, "JAXBUtils.unmarshalFilterDeploymentPlan()");
e.printStackTrace();
} catch (SAXException e) {
- Trace.tracePoint("SAXException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+ Trace.tracePoint("SAXException", Activator.logJaxb, "JAXBUtils.unmarshalFilterDeploymentPlan()");
e.printStackTrace();
}
return null;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/NamespaceFilter.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/jaxb/NamespaceFilter.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/jaxb/NamespaceFilter.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/NamespaceFilter.java Wed May 25 08:16:27 2011
@@ -20,6 +20,7 @@ package org.apache.geronimo.st.v30.core.
import java.util.HashMap;
import java.util.Map;
+import org.apache.geronimo.st.v30.core.Activator;
import org.apache.geronimo.st.v30.core.internal.Trace;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -134,17 +135,17 @@ public class NamespaceFilter extends XML
public NamespaceFilter(XMLReader xmlReader) {
super(xmlReader);
- Trace.tracePoint("Constructor", "NamespaceFilter", xmlReader);
+ Trace.tracePoint("Constructor", Activator.traceJaxb, "NamespaceFilter", xmlReader);
}
public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
- Trace.tracePoint("Entry", "NamespaceFilter.startElement", uri, localName, qname, atts);
+ Trace.tracePoint("Entry", Activator.traceJaxb, "NamespaceFilter.startElement", uri, localName, qname, atts);
if (namespace.containsKey( uri )) {
uri = namespace.get( uri );
}
- Trace.tracePoint("Exit ", "NamespaceFilter.startElement", uri, localName, qname, atts);
+ Trace.tracePoint("Exit ", Activator.traceJaxb, "NamespaceFilter.startElement", uri, localName, qname, atts);
super.startElement(uri, localName, qname, atts);
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/operations/GeronimoAccountManager.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/operations/GeronimoAccountManager.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/operations/GeronimoAccountManager.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/operations/GeronimoAccountManager.java Wed May 25 08:16:27 2011
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.util.Properties;
import java.util.Set;
+import org.apache.geronimo.st.v30.core.Activator;
import org.apache.geronimo.st.v30.core.internal.Trace;
import org.eclipse.wst.server.core.IRuntime;
@@ -57,10 +58,10 @@ public class GeronimoAccountManager {
groupProperties.load(fis);
fis.close();
} catch (FileNotFoundException e) {
- Trace.trace(Trace.SEVERE, e.getMessage());
+ Trace.trace(Trace.ERROR, e.getMessage(), Activator.logOperations);
throw e;
} catch (IOException e) {
- Trace.trace(Trace.SEVERE, e.getMessage());
+ Trace.trace(Trace.ERROR, e.getMessage(), Activator.logOperations);
throw e;
}
}
@@ -144,10 +145,10 @@ public class GeronimoAccountManager {
userProperties.store(fos, "");
fos.close();
} catch (FileNotFoundException e) {
- Trace.trace(Trace.SEVERE, e.getMessage());
+ Trace.trace(Trace.ERROR, e.getMessage(), Activator.logOperations);
throw e;
} catch (IOException e) {
- Trace.trace(Trace.SEVERE, e.getMessage());
+ Trace.trace(Trace.ERROR, e.getMessage(), Activator.logOperations);
throw e;
}
}