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 [5/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/DeploymentUtils.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/DeploymentUtils.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/DeploymentUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java Wed May 25 08:16:27 2011
@@ -63,12 +63,12 @@ public class DeploymentUtils {
public static final IPath STATE_LOC = Activator.getDefault().getStateLocation();
private DeploymentUtils() {
- Trace.tracePoint("Entry/Exit", "DeploymentUtils.DeploymentUtils");
+ Trace.tracePoint("Entry/Exit", "DeploymentUtils.DeploymentUtils", Activator.traceCore);
}
public static IPath generateExplodedConfiguration(IModule module, IPath outputPath) {
- Trace.tracePoint("Entry", "DeploymentUtils.generateExplodedConfiguration", module, outputPath);
+ Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.generateExplodedConfiguration", module, outputPath);
IPath output = outputPath.append(module.getName() + getModuleExtension(module));
try {
@@ -100,21 +100,21 @@ public class DeploymentUtils {
e.printStackTrace();
}
- Trace.tracePoint("Exit ", "DeploymentUtils.generateExplodedConfiguration", output);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.generateExplodedConfiguration", output);
return output;
}
public static IModuleResource[] getModuleResources(IModule module) throws CoreException {
- Trace.tracePoint("Entry", "DeploymentUtils.getModuleResources", module);
+ Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.getModuleResources", module);
ProjectModule pm = (ProjectModule)module.loadAdapter(ProjectModule.class, null);
if (pm != null) {
- Trace.tracePoint("Exit ", "DeploymentUtils.getModuleResources", pm.members());
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getModuleResources", pm.members());
return pm.members();
}
- Trace.tracePoint("Exit ", "DeploymentUtils.getModuleResources", null);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getModuleResources", null);
return null;
}
@@ -133,7 +133,7 @@ public class DeploymentUtils {
}
private static String getModuleExtension(IModule module) {
- Trace.tracePoint("Entry", "DeploymentUtils.getModuleExtension", module);
+ Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.getModuleExtension", module);
String extension = null;
@@ -165,13 +165,13 @@ public class DeploymentUtils {
extension = ".jar";
}
- Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", extension);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getModuleExtension", extension);
return extension;
}
public static File createJarFile(IModule module, IPath outputPath) {
- Trace.tracePoint("Entry", "DeploymentUtils.createJarFile", module, outputPath);
+ Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.createJarFile", module, outputPath);
IDataModel model = getExportDataModel(module);
File exportedFile = null;
@@ -196,17 +196,17 @@ public class DeploymentUtils {
model.getDefaultOperation().execute(null, null);
exportedFile = new File(model.getStringProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION));
} catch (ExecutionException e) {
- Trace.trace(Trace.SEVERE, "Error exporting module", e);
+ Trace.trace(Trace.ERROR, "Error exporting module", e, Activator.logCore);
}
}
- Trace.tracePoint("Exit ", "DeploymentUtils.createJarFile", exportedFile);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.createJarFile", exportedFile);
return exportedFile;
}
public static IDataModel getExportDataModel(IModule module) {
- Trace.tracePoint("Entry", "DeploymentUtils.getExportDataModel", module);
+ Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.getExportDataModel", module);
String type = module.getModuleType().getId();
if (IModuleConstants.JST_WEB_MODULE.equals(type)) {
@@ -236,13 +236,13 @@ public class DeploymentUtils {
}
}
- Trace.tracePoint("Exit ", "DeploymentUtils.getExportDataModel", (Object) null);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getExportDataModel", (Object) null);
return null;
}
public static TargetModuleID getTargetModuleID(IServer server, IModule module) throws TargetModuleIdNotFoundException {
- Trace.tracePoint("Entry", "DeploymentUtils.getTargetModuleID", module);
+ Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.getTargetModuleID", module);
String configId = ModuleArtifactMapper.getInstance().resolveArtifact(server, module);
if(configId == null) {
@@ -251,18 +251,18 @@ public class DeploymentUtils {
IGeronimoServer gs = (IGeronimoServer) server.getAdapter(IGeronimoServer.class);
- Trace.tracePoint("Exit ", "DeploymentUtils.generateExplodedConfiguration",gs.getVersionHandler().createTargetModuleId(configId));
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.generateExplodedConfiguration",gs.getVersionHandler().createTargetModuleId(configId));
return gs.getVersionHandler().createTargetModuleId(configId);
}
public static TargetModuleID getTargetModuleID(DeploymentManager dm, String configId) throws TargetModuleIdNotFoundException {
- Trace.tracePoint("Entry", "DeploymentUtils.getTargetModuleID", dm, configId);
+ Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.getTargetModuleID", dm, configId);
try {
TargetModuleID id = isInstalledModule(dm,configId);
if (id!=null) {
- Trace.tracePoint("Exit ", "DeploymentUtils.getTargetModuleID", id);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getTargetModuleID", id);
return id;
}
} catch (IllegalStateException e) {
@@ -288,45 +288,45 @@ public class DeploymentUtils {
* @throws Exception
*/
public static String getLastKnownConfigurationId(IModule module, IServer server) throws Exception {
- Trace.tracePoint("Entry", "DeploymentUtils.getLastKnownConfigurationId", module, server);
+ Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.getLastKnownConfigurationId", module, server);
IGeronimoServer gs = (IGeronimoServer) server.getAdapter(IGeronimoServer.class);
String currentId = gs.getVersionHandler().getConfigID(module);
String publishedId = ModuleArtifactMapper.getInstance().resolveArtifact(server, module);
String query = publishedId != null ? publishedId : currentId;
- Trace.trace(Trace.INFO, "currentConfigId = " + currentId + " previousConfigId = " + publishedId);
+ Trace.trace(Trace.INFO, "currentConfigId = " + currentId + " previousConfigId = " + publishedId, Activator.traceCore);
DeploymentManager dm = DeploymentCommandFactory.getDeploymentManager(server);
try {
getTargetModuleID(dm, query);
- Trace.tracePoint("Exit ", "DeploymentUtils.getLastKnownConfigurationId", query);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getLastKnownConfigurationId", query);
return query;
} catch (TargetModuleIdNotFoundException e) {
- Trace.trace(Trace.INFO, e.getMessage());
+ Trace.trace(Trace.INFO, e.getMessage(), Activator.logCore);
}
if(query != currentId) {
try {
getTargetModuleID(dm, currentId);
- Trace.tracePoint("Exit ", "DeploymentUtils.getLastKnownConfigurationId", currentId);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getLastKnownConfigurationId", currentId);
return currentId;
} catch (TargetModuleIdNotFoundException e) {
- Trace.trace(Trace.INFO, e.getMessage());
+ Trace.trace(Trace.INFO, e.getMessage(), Activator.logCore);
}
}
- Trace.tracePoint("Exit ", "DeploymentUtils.getLastKnownConfigurationId", (Object) null);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getLastKnownConfigurationId", (Object) null);
return null;
}
public static List<IModuleResourceDelta> getAffectedJSPFiles(IModuleResourceDelta delta) {
- Trace.tracePoint("Entry", "DeploymentUtils.getAffectedJSPFiles", delta);
+ Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.getAffectedJSPFiles", delta);
if (delta == null) {
- Trace.tracePoint("Exit ", "DeploymentUtils.getAffectedJSPFiles", (Object) null);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getAffectedJSPFiles", (Object) null);
return null;
}
@@ -339,7 +339,7 @@ public class DeploymentUtils {
fileList.add(delta);
}
else {
- Trace.tracePoint("Exit ", "DeploymentUtils.getAffectedJSPFiles", (Object) null);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getAffectedJSPFiles", (Object) null);
return null; //not only jsp changed
}
}
@@ -349,30 +349,30 @@ public class DeploymentUtils {
List<IModuleResourceDelta> deltaChildren = getAffectedJSPFiles(childDelta);
if (deltaChildren != null) fileList.addAll(deltaChildren);
else {
- Trace.tracePoint("Exit ", "DeploymentUtils.getAffectedJSPFiles", (Object) null);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getAffectedJSPFiles", (Object) null);
return null;
}
}
}
- Trace.tracePoint("Exit ", "DeploymentUtils.getAffectedJSPFiles", fileList);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getAffectedJSPFiles", fileList);
return fileList;
}
public static boolean isInstalledModule(IServer server, String configId) {
- Trace.tracePoint("Entry", "DeploymentUtils.isInstalledModule", server, configId);
+ Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.isInstalledModule", server, configId);
DeploymentManager dm;
try {
dm = DeploymentCommandFactory.getDeploymentManager(server);
TargetModuleID id=isInstalledModule(dm,configId);
if (id==null) {
- Trace.tracePoint("Exit ", "DeploymentUtils.isInstalledModule", false);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.isInstalledModule", false);
return false;
}
else {
- Trace.tracePoint("Exit ", "DeploymentUtils.isInstalledModule", true);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.isInstalledModule", true);
return true;
}
} catch (CoreException e) {
@@ -390,24 +390,24 @@ public class DeploymentUtils {
private static TargetModuleID isInstalledModule(DeploymentManager dm, String configId) throws CoreException, IllegalStateException, TargetException{
- Trace.tracePoint("Entry", "DeploymentUtils.isInstalledModule", dm, configId);
+ Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.isInstalledModule", dm, configId);
TargetModuleID[] ids = dm.getAvailableModules(null, dm.getTargets());
if(ids == null) {
- Trace.tracePoint("Exit ", "DeploymentUtils.isInstalledModule", (Object) null);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.isInstalledModule", (Object) null);
return null;
}
if (ids != null) {
for (int i = 0; i < ids.length; i++) {
if (ids[i].getModuleID().equals(configId)) {
- Trace.trace(Trace.INFO, "Found configuration " + configId + " on server.");
- Trace.tracePoint("Exit ", "DeploymentUtils.isInstalledModule", ids[i]);
+ Trace.trace(Trace.INFO, "Found configuration " + configId + " on server.", Activator.logCore);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.isInstalledModule", ids[i]);
return ids[i];
}
}
}
- Trace.tracePoint("Exit ", "DeploymentUtils.isInstalledModule", (Object) null);
+ Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.isInstalledModule", (Object) 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/GeronimoConnectionFactory.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/GeronimoConnectionFactory.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/GeronimoConnectionFactory.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoConnectionFactory.java Wed May 25 08:16:27 2011
@@ -58,7 +58,7 @@ public class GeronimoConnectionFactory {
if (dm == null) {
DeploymentFactory factory = getGeronimoServer(server).getDeploymentFactory();
String deployerURL = getGeronimoServer(server).getDeployerURL();
- Trace.trace(Trace.INFO, "DeployerURL: " + deployerURL);
+ Trace.trace(Trace.INFO, "DeployerURL: " + deployerURL, Activator.traceCore);
String user = getGeronimoServer(server).getAdminID();
String pw = getGeronimoServer(server).getAdminPassword();
dm = factory.getDeploymentManager(deployerURL, user, pw);
@@ -95,7 +95,7 @@ public class GeronimoConnectionFactory {
}
public void destroy(IServer server) {
- Trace.trace(Trace.INFO, "deploymentManager destroy");
+ Trace.trace(Trace.INFO, "deploymentManager destroy", Activator.traceCore);
connections.remove(server.getId());
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoLaunchConfigurationDelegate.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/GeronimoLaunchConfigurationDelegate.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/GeronimoLaunchConfigurationDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoLaunchConfigurationDelegate.java Wed May 25 08:16:27 2011
@@ -95,8 +95,8 @@ public class GeronimoLaunchConfiguration
vmArgs = vmArgs.replace("$(JRE_HOME)", jreHome.getAbsolutePath());
vmArgs = vmArgs.replace("$(GERONIMO_HOME)", server.getRuntime().getLocation().toOSString());
- Trace.trace(Trace.INFO, "vmArgs=" + vmArgs);
- Trace.trace(Trace.INFO, "pgmArgs=" + pgmArgs);
+ Trace.trace(Trace.INFO, "vmArgs=" + vmArgs, Activator.traceCore);
+ Trace.trace(Trace.INFO, "pgmArgs=" + pgmArgs, Activator.traceCore);
ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoLaunchableAdapterDelegate.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/GeronimoLaunchableAdapterDelegate.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/GeronimoLaunchableAdapterDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoLaunchableAdapterDelegate.java Wed May 25 08:16:27 2011
@@ -81,7 +81,7 @@ public class GeronimoLaunchableAdapterDe
}
return new HttpLaunchable(url);
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error getting URL for " + moduleObject, e);
+ Trace.trace(Trace.ERROR, "Error getting URL for " + moduleObject, e, Activator.logCore);
throw new CoreException (new Status(IStatus.ERROR,Activator.PLUGIN_ID,"Error getting URL for " + moduleObject,e));
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServer.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/GeronimoServer.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/GeronimoServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServer.java Wed May 25 08:16:27 2011
@@ -91,7 +91,7 @@ public class GeronimoServer extends Gero
addParm(args, "-Dkaraf.startRemoteShell=true");
String vmArgs = args.toString();
- Trace.tracePoint("Exit", "GeronimoServer.getVMArgs", vmArgs);
+ Trace.tracePoint("Exit", Activator.traceCore, "GeronimoServer.getVMArgs", vmArgs);
return vmArgs;
}
@@ -122,7 +122,7 @@ public class GeronimoServer extends Gero
String programArgs = args.toString();
- Trace.tracePoint("Exit", "GeronimoServer.getProgramArgs", programArgs);
+ Trace.tracePoint("Exit", Activator.traceCore, "GeronimoServer.getProgramArgs", programArgs);
return programArgs;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviour.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/GeronimoServerBehaviour.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/GeronimoServerBehaviour.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviour.java Wed May 25 08:16:27 2011
@@ -83,8 +83,8 @@ public class GeronimoServerBehaviour ext
} catch (SecurityException e) {
throw e;
} catch (Exception e) {
- Trace.trace(Trace.WARNING, "Kernel connection failed. "
- + e.getMessage());
+ Trace.trace(Trace.INFO, "Kernel connection failed. "
+ + e.getMessage(), Activator.traceCore);
}
}
return kernel;
@@ -99,7 +99,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) {
@@ -107,7 +107,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;
@@ -169,7 +169,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.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.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/GeronimoServerBehaviourDelegate.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/GeronimoServerBehaviourDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java Wed May 25 08:16:27 2011
@@ -150,7 +150,7 @@ abstract public class GeronimoServerBeha
}
GeronimoServerDelegate gsd = getServerDelegate();
String programArgs = gsd.getProgramArgs();
- Trace.tracePoint("GeronimoServerBehaviourDelegate.v30", "setupLaunchConfiguration serverProgramArgs", programArgs);
+ Trace.tracePoint("GeronimoServerBehaviourDelegate.v30", Activator.traceCore, "setupLaunchConfiguration serverProgramArgs", programArgs);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, programArgs);
/*
@@ -161,7 +161,7 @@ abstract public class GeronimoServerBeha
*/
String vmArgs = gsd.getVMArgs();
- Trace.tracePoint("GeronimoServerBehaviourDelegate.v30", "setupLaunchConfiguration serverVMArgs", vmArgs);
+ Trace.tracePoint("GeronimoServerBehaviourDelegate.v30", Activator.traceCore, "setupLaunchConfiguration serverVMArgs", vmArgs);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, vmArgs);
}
@@ -173,7 +173,7 @@ abstract public class GeronimoServerBeha
* @throws CoreException
*/
synchronized protected void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor monitor) throws CoreException {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.setupLaunch", launch, launchMode, monitor);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.setupLaunch", launch, launchMode, monitor);
if (!SocketUtil.isLocalhost(getServer().getHost()))
return;
@@ -205,7 +205,7 @@ abstract public class GeronimoServerBeha
getServer().addServerListener(listener);
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.setupLaunch");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.setupLaunch");
}
/*
@@ -214,7 +214,7 @@ abstract public class GeronimoServerBeha
* @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#stop(boolean)
*/
synchronized public void stop(final boolean force) {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.stop", force);
+ Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.stop", Activator.traceCore);
stopPingThread();
if (getServer().getServerState() != IServer.STATE_STOPPED) {
@@ -232,7 +232,7 @@ abstract public class GeronimoServerBeha
if (state == IServer.STATE_STARTING || state == IServer.STATE_STOPPING)
terminate();
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.stop");
+ Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.stop", Activator.traceCore);
}
/*
@@ -245,7 +245,7 @@ abstract public class GeronimoServerBeha
* @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#publishModules(int, java.util.List, java.util.List, org.eclipse.core.runtime.MultiStatus, org.eclipse.core.runtime.IProgressMonitor)
*/
protected void publishModules(int kind, List modules, List deltaKind, MultiStatus multi, IProgressMonitor monitor) {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.publishModules", publishKindToString(kind), Arrays.asList(modules), Arrays.asList(deltaKind), multi, monitor);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.publishModules", publishKindToString(kind), Arrays.asList(modules), Arrays.asList(deltaKind), multi, monitor);
//
// WTP publishes modules in reverse alphabetical order which does not account for possible
@@ -260,7 +260,7 @@ abstract public class GeronimoServerBeha
for (int i = 0; i < modules.size(); i++) {
IModule[] module = (IModule[]) modules.get(i);
Trace.trace(Trace.INFO, i + " " + Arrays.asList(module).toString() + " "
- + deltaKindToString(((Integer) deltaKind.get(i)).intValue()));
+ + deltaKindToString(((Integer) deltaKind.get(i)).intValue()), Activator.traceCore);
}
}
@@ -405,7 +405,7 @@ abstract public class GeronimoServerBeha
multi.add(status);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.publishModules");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.publishModules");
}
protected IStatus refreshBundle(IModule ebaModule, IModule bundleModule, IProgressMonitor subMonitorFor) {
@@ -490,7 +490,7 @@ abstract public class GeronimoServerBeha
* org.eclipse.core.runtime.IProgressMonitor)
*/
public void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.publishModule", publishKindToString(kind), deltaKindToString(deltaKind), Arrays.asList(module), monitor);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.publishModule", publishKindToString(kind), deltaKindToString(deltaKind), Arrays.asList(module), monitor);
try {
//NO_CHANGE need if app is associated but not started and no delta
@@ -515,7 +515,7 @@ abstract public class GeronimoServerBeha
throw e;
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.publishModule");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.publishModule");
}
/*
@@ -524,7 +524,7 @@ abstract public class GeronimoServerBeha
* @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#publishFinish(org.eclipse.core.runtime.IProgressMonitor)
*/
public void publishFinish(IProgressMonitor monitor) throws CoreException {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.publishFinish", monitor);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.publishFinish", monitor);
IModule[] modules = this.getServer().getModules();
boolean allpublished = true;
@@ -545,7 +545,7 @@ abstract public class GeronimoServerBeha
GeronimoConnectionFactory.getInstance().destroy(getServer());
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.publishFinish");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.publishFinish");
}
@@ -559,12 +559,12 @@ abstract public class GeronimoServerBeha
*/
@Override
protected void initialize(IProgressMonitor monitor) {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.initialize", monitor);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.initialize", monitor);
publishStateListener = new PublishStateListener();
getServer().addServerListener(publishStateListener, ServerEvent.MODULE_CHANGE | ServerEvent.PUBLISH_STATE_CHANGE);
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.initialize");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.initialize");
}
/*
@@ -633,28 +633,28 @@ abstract public class GeronimoServerBeha
protected void terminate() {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.terminate");
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.terminate");
if (getServer().getServerState() == IServer.STATE_STOPPED)
return;
try {
setServerState(IServer.STATE_STOPPING);
- Trace.trace(Trace.INFO, "Killing the geronimo server process"); //$NON-NLS-1$
+ Trace.trace(Trace.INFO, "Killing the geronimo server process", Activator.traceCore); //$NON-NLS-1$
if (process != null && !process.isTerminated()) {
process.terminate();
}
stopImpl();
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error killing the geronimo server process", e); //$NON-NLS-1$
+ Trace.trace(Trace.ERROR, "Error killing the geronimo server process", e, Activator.logCore); //$NON-NLS-1$
//
// WTP does not allow a CoreException to be thrown in this case
//
throw new RuntimeException(Messages.STOP_FAIL);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.terminate");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.terminate");
}
protected void stopImpl() {
@@ -668,7 +668,7 @@ abstract public class GeronimoServerBeha
}
private void resetModuleState() {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.resetModuleState");
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.resetModuleState");
IModule[] modules = getServer().getModules();
for (int i = 0; i < modules.length; i++) {
@@ -676,11 +676,11 @@ abstract public class GeronimoServerBeha
setModuleState(module, IServer.STATE_STOPPED);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.resetModuleState");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.resetModuleState");
}
protected void invokeCommand(int deltaKind, IModule module, IProgressMonitor monitor) throws CoreException {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.invokeCommand", deltaKindToString(deltaKind), module.getName());
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.invokeCommand", deltaKindToString(deltaKind), module.getName());
ClassLoader old = Thread.currentThread().getContextClassLoader();
try {
@@ -715,7 +715,7 @@ abstract public class GeronimoServerBeha
Thread.currentThread().setContextClassLoader(old);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.invokeCommand");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.invokeCommand");
}
/**
@@ -724,7 +724,7 @@ abstract public class GeronimoServerBeha
* @throws Exception
*/
protected void doAdded(IModule module, String configId, IProgressMonitor monitor) throws Exception {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.doAdded", module.getName(), configId);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.doAdded", module.getName(), configId);
configId = getLastKnowConfigurationId(module, configId);
@@ -768,7 +768,7 @@ abstract public class GeronimoServerBeha
doChanged(module, configId, monitor);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.doAdded");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.doAdded");
}
/**
* @param module
@@ -776,7 +776,7 @@ abstract public class GeronimoServerBeha
* @throws Exception
*/
protected void doChanged(IModule module, String configId, IProgressMonitor monitor) throws Exception {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.doChanged", module.getName(), configId);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.doChanged", module.getName(), configId);
configId = getLastKnowConfigurationId(module, configId);
if(configId != null) {
@@ -810,7 +810,7 @@ abstract public class GeronimoServerBeha
doAdded(module, configId, monitor);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.doChanged");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.doChanged");
}
@@ -873,7 +873,7 @@ abstract public class GeronimoServerBeha
try {
file.createNewFile();
} catch (IOException e) {
- Trace.trace(Trace.SEVERE, "can't create file " + file, e);
+ Trace.trace(Trace.ERROR, "can't create file " + file, e, Activator.logCore);
throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "can't create file "
+ file, e));
}
@@ -895,11 +895,11 @@ abstract public class GeronimoServerBeha
inChannel.close();
outChannel.close();
} catch (FileNotFoundException e) {
- Trace.trace(Trace.SEVERE, "can't find file " + sourceFile, e);
+ Trace.trace(Trace.ERROR, "can't find file " + sourceFile, e, Activator.logCore);
throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "can't find file "
+ sourceFile, e));
} catch (IOException e) {
- Trace.trace(Trace.SEVERE, "can't copy file " + sourceFile, e);
+ Trace.trace(Trace.ERROR, "can't copy file " + sourceFile, e, Activator.logCore);
throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "can't copy file "
+ sourceFile, e));
}
@@ -913,17 +913,17 @@ abstract public class GeronimoServerBeha
private String getLastKnowConfigurationId(IModule module, String configId) throws Exception {
- Trace.tracePoint("Entry ", "GeronimoServerBehaviourDelegate.getLastKnowConfigurationId", module.getName(), configId);
+ Trace.tracePoint("Entry ", Activator.traceCore, "GeronimoServerBehaviourDelegate.getLastKnowConfigurationId", module.getName(), configId);
//use the correct configId, second from the .metadata, then from the plan
configId = configId != null ? configId : DeploymentUtils.getLastKnownConfigurationId(module, getServer());
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.getLastKnowConfigurationId", configId);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.getLastKnowConfigurationId", configId);
return configId;
}
protected void doRemoved(IModule module, IProgressMonitor monitor) throws Exception {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.doRemoved", module.getName());
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.doRemoved", module.getName());
HashMap artifactsMap = ModuleArtifactMapper.getInstance().getServerArtifactsMap(getServer());
if (artifactsMap != null) {
@@ -934,7 +934,7 @@ abstract public class GeronimoServerBeha
_doRemove(module, monitor);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.doRemoved");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.doRemoved");
}
private void _doRemove(IModule module, IProgressMonitor monitor) throws Exception {
@@ -947,7 +947,7 @@ abstract public class GeronimoServerBeha
}
protected void doNoChange(IModule module, IProgressMonitor monitor) throws Exception {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.doNoChange", module.getName());
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.doNoChange", module.getName());
if(DeploymentUtils.getLastKnownConfigurationId(module, getServer()) != null) {
IStatus status = start(module, monitor);
@@ -961,11 +961,11 @@ abstract public class GeronimoServerBeha
doAdded(module, null, monitor);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.doNoChange");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.doNoChange");
}
protected void doRestart(IModule module, IProgressMonitor monitor) throws Exception {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.doRestart", module.getName());
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.doRestart", module.getName());
IStatus status = stop(module, monitor);
if (!status.isOK()) {
@@ -982,7 +982,7 @@ abstract public class GeronimoServerBeha
addServerModuleBundleIDMap(module);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.doRestart");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.doRestart");
}
private TargetModuleID[] updateServerModuleConfigIDMap(IModule module, IStatus status) {
@@ -1092,7 +1092,7 @@ abstract public class GeronimoServerBeha
IRuntimeClasspathEntry[] existingCps = JavaRuntime.computeUnresolvedRuntimeClasspath(wc);
for (int i = 0; i < existingCps.length; i++) {
- Trace.trace(Trace.INFO, "cpentry: " + cp );
+ Trace.trace(Trace.INFO, "cpentry: " + cp , Activator.traceCore);
if (cp.contains(existingCps[i]) == false) {
cp.add(existingCps[i]);
}
@@ -1107,7 +1107,7 @@ abstract public class GeronimoServerBeha
List<IClasspathEntry> cpes = ClasspathContainersHelper.queryWorkspace( containerPath );
for ( IClasspathEntry cpe : cpes ) {
RuntimeClasspathEntry rcpe = new RuntimeClasspathEntry( cpe );
- Trace.trace(Trace.INFO, "Classpath Container Entry: " + rcpe );
+ Trace.trace(Trace.INFO, "Classpath Container Entry: " + rcpe , Activator.traceCore);
if (cp.contains(rcpe) == false) {
cp.add( rcpe );
}
@@ -1127,8 +1127,8 @@ abstract public class GeronimoServerBeha
try {
list.add(entry.getMemento());
} catch (CoreException e) {
- Trace.trace(Trace.SEVERE, "Could not resolve classpath entry: "
- + entry, e);
+ Trace.trace(Trace.ERROR, "Could not resolve classpath entry: "
+ + entry, e, Activator.logCore);
}
}
return list;
@@ -1163,38 +1163,38 @@ abstract public class GeronimoServerBeha
}
protected void startPingThread() {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.startPingThread");
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.startPingThread");
pingThread = new PingThread(this, getServer());
pingThread.start();
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.startPingThread");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.startPingThread");
}
protected void stopPingThread() {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.stopPingThread");
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.stopPingThread");
if (pingThread != null) {
pingThread.interrupt();
pingThread = null;
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.stopPingThread");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.stopPingThread");
}
protected abstract void stopKernel();
public void startUpdateServerStateTask() {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.startUpdateServerStateTask", getServer().getName());
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.startUpdateServerStateTask", getServer().getName());
stateTimer = new Timer(true);
stateTimer.schedule(new UpdateServerStateTask(this, getServer()), 0, TIMER_TASK_INTERVAL * 1000);
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.startUpdateServerStateTask");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.startUpdateServerStateTask");
}
public void startSynchronizeProjectOnServerTask() {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.startSynchronizeProjectOnServerTask", getServer().getName());
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.startSynchronizeProjectOnServerTask", getServer().getName());
if (synchronizerTimer != null) {
synchronizerTimer.cancel();
@@ -1203,29 +1203,29 @@ abstract public class GeronimoServerBeha
synchronizerTimer = new Timer(true);
synchronizerTimer.schedule(new SynchronizeProjectOnServerTask(this, getServer()), 0, TIMER_TASK_INTERVAL * 1000);
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.startSynchronizeProjectOnServerTask");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.startSynchronizeProjectOnServerTask");
}
public void stopUpdateServerStateTask() {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.stopUpdateServerStateTask");
+ Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.stopUpdateServerStateTask", Activator.traceCore);
if (stateTimer != null)
stateTimer.cancel();
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.stopUpdateServerStateTask");
+ Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.stopUpdateServerStateTask", Activator.traceCore);
}
public void stopSynchronizeProjectOnServerTask() {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.stopSynchronizeProjectOnServerTask");
+ Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.stopSynchronizeProjectOnServerTask", Activator.traceCore);
if (synchronizerTimer != null)
synchronizerTimer.cancel();
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.stopSynchronizeProjectOnServerTask");
+ Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.stopSynchronizeProjectOnServerTask", Activator.traceCore);
}
protected IPath getModulePath(IModule[] module, URL baseURL) {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.getModulePath", Arrays.asList(module), baseURL);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.getModulePath", Arrays.asList(module), baseURL);
IPath modulePath = new Path(baseURL.getFile());
@@ -1245,7 +1245,7 @@ abstract public class GeronimoServerBeha
}
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.getModulePath", modulePath);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.getModulePath", modulePath);
return modulePath;
}
@@ -1273,7 +1273,7 @@ abstract public class GeronimoServerBeha
jmxConnector = JMXConnectorFactory.connect(address, map);
}
MBeanServerConnection connection = jmxConnector.getMBeanServerConnection();
- Trace.trace(Trace.INFO, "Connected to kernel. " + url);
+ Trace.trace(Trace.INFO, "Connected to kernel. " + url, Activator.traceCore);
return connection;
} catch (MalformedURLException e) {
e.printStackTrace();
@@ -1334,7 +1334,7 @@ abstract public class GeronimoServerBeha
@Override
public void startModule(IModule[] module, IProgressMonitor monitor) {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.startModule", Arrays.asList(module));
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.startModule", Arrays.asList(module));
try {
IStatus status = start(module[0], monitor);
if (status!=null && status.isOK()) {
@@ -1346,15 +1346,15 @@ abstract public class GeronimoServerBeha
}
}
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error starting module " + module[0].getName(), e);
+ Trace.trace(Trace.ERROR, "Error starting module " + module[0].getName(), e, Activator.logCore);
throw new RuntimeException("Error starting module " + module[0].getName(), e);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.startModule");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.startModule");
}
@Override
public void stopModule(IModule[] module, IProgressMonitor monitor) {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.stopModule", Arrays.asList(module));
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.stopModule", Arrays.asList(module));
try {
IStatus status = stop(module[0], monitor);
// remove bundle project and bundle ID map from ModuleArtifactMapper if it is EBA module,
@@ -1366,15 +1366,15 @@ abstract public class GeronimoServerBeha
}
}
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error stopping module " + module[0].getName(), e);
+ Trace.trace(Trace.ERROR, "Error stopping module " + module[0].getName(), e, Activator.logCore);
throw new RuntimeException("Error stopping module " + module[0].getName(), e);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.stopModule");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.stopModule");
}
@Override
public void restartModule(IModule[] module, IProgressMonitor monitor) {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.restartModule", Arrays.asList(module));
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.restartModule", Arrays.asList(module));
try {
IStatus status = stop(module[0], monitor);
// remove bundle project and bundle ID map from ModuleArtifactMapper if it is EBA module,
@@ -1396,15 +1396,15 @@ abstract public class GeronimoServerBeha
}
}
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error restarting module " + module[0].getName(), e);
+ Trace.trace(Trace.ERROR, "Error restarting module " + module[0].getName(), e, Activator.logCore);
throw new RuntimeException("Error restarting module " + module[0].getName(), e);
}
- Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.restartModule");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerBehaviourDelegate.restartModule");
}
@Override
public boolean canControlModule(IModule[] module) {
- Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.canControlModule", Arrays.asList(module));
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerBehaviourDelegate.canControlModule", Arrays.asList(module));
// Enable start/stop for top-level modules only
if (module.length == 1) {
if (GeronimoUtils.isFragmentBundleModule(module[0])) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.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/GeronimoServerDelegate.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/GeronimoServerDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java Wed May 25 08:16:27 2011
@@ -127,7 +127,7 @@ abstract public class GeronimoServerDele
* org.eclipse.wst.server.core.IModule[])
*/
public IStatus canModifyModules(IModule[] add, IModule[] remove) {
- Trace.tracePoint("Entry", "GeronimoServerDelegate.canModifyModules", add, remove);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.canModifyModules", add, remove);
if (add != null) {
for (int i = 0; i < add.length; i++) {
@@ -135,14 +135,14 @@ abstract public class GeronimoServerDele
if (module.getProject() != null) {
IStatus status = FacetUtil.verifyFacets(module.getProject(), getServer());
if (status != null && !status.isOK()) {
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.canModifyModules", status);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.canModifyModules", status);
return status;
}
}
}
}
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.canModifyModules", Status.OK_STATUS);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.canModifyModules", Status.OK_STATUS);
return Status.OK_STATUS;
}
@@ -155,12 +155,12 @@ abstract public class GeronimoServerDele
* org.eclipse.core.runtime.IProgressMonitor)
*/
public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor monitor) throws CoreException {
- Trace.tracePoint("Entry", "GeronimoServerDelegate.modifyModules", add, remove, monitor);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.modifyModules", add, remove, monitor);
// TODO servermodule.info should be pushed to here and set as instance
// property
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.modifyModules");
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.modifyModules");
}
@@ -170,18 +170,18 @@ abstract public class GeronimoServerDele
* @see org.eclipse.wst.server.core.model.ServerDelegate#getRootModules(org.eclipse.wst.server.core.IModule)
*/
public IModule[] getRootModules(IModule module) throws CoreException {
- Trace.tracePoint("Entry", "GeronimoServerDelegate.getRootModules", module);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.getRootModules", module);
IStatus status = canModifyModules(new IModule[] { module }, null);
if (status != null && !status.isOK())
throw new CoreException(status);
IModule[] modules = doGetParentModules(module);
if (modules.length > 0) {
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.getRootModules", modules);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.getRootModules", modules);
return modules;
}
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.getRootModules", new IModule[] { module });
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.getRootModules", new IModule[] { module });
return new IModule[] { module };
}
@@ -192,10 +192,10 @@ abstract public class GeronimoServerDele
* @see org.eclipse.wst.server.core.model.ServerDelegate#getChildModules(org.eclipse.wst.server.core.IModule[])
*/
public IModule[] getChildModules(IModule[] module) {
- Trace.tracePoint("Entry", "GeronimoServerDelegate.getChildModules", module);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.getChildModules", module);
if (module == null) {
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules", null);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.getChildModules", null);
return null;
}
@@ -207,7 +207,7 @@ abstract public class GeronimoServerDele
if (enterpriseApplication != null) {
IModule[] modules = enterpriseApplication.getModules();
if (modules != null) {
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules", modules);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.getChildModules", modules);
return modules;
}
}
@@ -217,7 +217,7 @@ abstract public class GeronimoServerDele
if (webModule != null) {
IModule[] modules = webModule.getModules();
if (modules != null) {
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules", modules);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.getChildModules", modules);
return modules;
}
}
@@ -229,7 +229,7 @@ abstract public class GeronimoServerDele
if (application != null) {
IModule[] modules = application.getModules();
if (modules != null) {
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules", modules);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.getChildModules", modules);
return modules;
}
}
@@ -239,7 +239,7 @@ abstract public class GeronimoServerDele
if (composite != null) {
IModule[] modules = composite.getModules();
if (modules != null) {
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules", modules);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.getChildModules", modules);
return modules;
}
}
@@ -248,7 +248,7 @@ abstract public class GeronimoServerDele
}
}
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules", new IModule[] {});
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.getChildModules", new IModule[] {});
return new IModule[] {};
}
@@ -259,13 +259,13 @@ abstract public class GeronimoServerDele
* @see org.eclipse.wst.server.core.model.ServerDelegate#getServerPorts()
*/
public ServerPort[] getServerPorts() {
- Trace.tracePoint("Entry", "GeronimoServerDelegate.getServerPorts");
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.getServerPorts");
List<ServerPort> ports = new ArrayList<ServerPort>();
ports.add(new ServerPort(PROPERTY_HTTP_PORT, "Web Connector", Integer.parseInt(getHTTPPort()), "http"));
ports.add(new ServerPort(PROPERTY_RMI_PORT, "RMI Naming", Integer.parseInt(getRMINamingPort()), "rmi"));
- Trace.tracePoint("Entry", "GeronimoServerDelegate.getServerPorts;", (ServerPort[]) ports.toArray(new ServerPort[ports.size()]));
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.getServerPorts;", (ServerPort[]) ports.toArray(new ServerPort[ports.size()]));
return (ServerPort[]) ports.toArray(new ServerPort[ports.size()]);
}
@@ -276,7 +276,7 @@ abstract public class GeronimoServerDele
* @see org.eclipse.wst.server.core.model.IURLProvider#getModuleRootURL(org.eclipse.wst.server.core.IModule)
*/
public URL getModuleRootURL(IModule module) {
- Trace.tracePoint("Entry", "GeronimoServerDelegate.getModuleRootURL", module);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.getModuleRootURL", module);
if (module == null) {
return null;
@@ -323,10 +323,10 @@ abstract public class GeronimoServerDele
urlSB.append("/");
}
String url = urlSB.toString();
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.getModuleRootURL", new URL(url));
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.getModuleRootURL", new URL(url));
return new URL(url);
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Could not get root URL", e);
+ Trace.trace(Trace.ERROR, "Could not get root URL", e, Activator.logCore);
return null;
}
}
@@ -341,7 +341,7 @@ abstract public class GeronimoServerDele
* @see org.eclipse.wst.server.core.model.ServerDelegate#setDefaults(org.eclipse.core.runtime.IProgressMonitor)
*/
public void setDefaults(IProgressMonitor monitor) {
- Trace.tracePoint("Entry", "GeronimoServerDelegate.setDefaults", monitor);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.setDefaults", monitor);
suspendArgUpdates();
setAdminID("system");
setAdminPassword("manager");
@@ -359,25 +359,25 @@ abstract public class GeronimoServerDele
setRunFromWorkspace(false);
setSelectClasspathContainers(false);
resumeArgUpdates();
- Trace.tracePoint("Exit", "GeronimoServerDelegate.setDefaults", monitor);
+ Trace.tracePoint("Exit", Activator.traceCore, "GeronimoServerDelegate.setDefaults", monitor);
}
@Override
public void saveConfiguration(IProgressMonitor monitor) throws CoreException {
- Trace.tracePoint("Enter", "GeronimoServerDelegate.v30.saveConfiguration", monitor);
+ Trace.tracePoint("Enter", Activator.traceCore, "GeronimoServerDelegate.v30.saveConfiguration", monitor);
super.saveConfiguration(monitor);
- Trace.tracePoint("Leave", "GeronimoServerDelegate.v30.saveConfiguration", monitor);
+ Trace.tracePoint("Exit", Activator.traceCore, "GeronimoServerDelegate.v30.saveConfiguration", monitor);
}
@Override
public void configurationChanged() {
- Trace.tracePoint("Enter", "GeronimoServerDelegate.v30.configurationChanged");
+ Trace.tracePoint("Enter", Activator.traceCore, "GeronimoServerDelegate.v30.configurationChanged");
super.configurationChanged();
- Trace.tracePoint("Leave", "GeronimoServerDelegate.v30.configurationChanged");
+ Trace.tracePoint("Exit", Activator.traceCore, "GeronimoServerDelegate.v30.configurationChanged");
}
//
@@ -477,7 +477,7 @@ abstract public class GeronimoServerDele
String programArgs = updateProgramArgsFromProperties(existingProgArgs, parmsSet, parmsNotSet);
- Trace.tracePoint("Exit", "GeronimoServerDelegate.updateProgramArgsFromProperties", programArgs);
+ Trace.tracePoint("Exit", Activator.traceCore, "GeronimoServerDelegate.updateProgramArgsFromProperties", programArgs);
setProgramArgs(programArgs);
}
@@ -496,7 +496,7 @@ abstract public class GeronimoServerDele
String vmArgs = updateVMArgsFromProperties(existingVMArgs, parmsSet, parmsNotSet);
- Trace.tracePoint("Exit", "GeronimoServerDelegate.updateVMArgsFromProperties", vmArgs);
+ Trace.tracePoint("Exit", Activator.traceCore, "GeronimoServerDelegate.updateVMArgsFromProperties", vmArgs);
setVMArgs(vmArgs);
}
@@ -726,7 +726,7 @@ abstract public class GeronimoServerDele
return getInstanceProperty(PROPERTY_VM_ARGS);
}
public void setVMArgs(String value) {
- Trace.tracePoint("Entry", "GeronimoServerDelegate.getVMArgs", value);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.getVMArgs", value);
setInstanceProperty(PROPERTY_VM_ARGS, value);
}
@@ -745,7 +745,7 @@ abstract public class GeronimoServerDele
return getInstanceProperty(PROPERTY_PROGRAM_ARGS);
}
public void setProgramArgs(String value) {
- Trace.tracePoint("Entry", "GeronimoServerDelegate.getProgramArgs", value);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.getProgramArgs", value);
setInstanceProperty(PROPERTY_PROGRAM_ARGS, value);
}
@@ -877,7 +877,7 @@ abstract public class GeronimoServerDele
} catch (Exception e) {
// TODO WTF? Need to figure out why this fails... seems to fail before setDefaults is called.
Trace.trace(Trace.INFO, "GeronimoServerDelegate.setInstanceProperty(name = " + name + ", value = " + value
- + " )", e);
+ + " )", e, Activator.traceCore);
int a = 1;
a++;
}
@@ -900,7 +900,7 @@ abstract public class GeronimoServerDele
* @return
*/
private IModule[] doGetParentModules(IModule module) {
- Trace.tracePoint("Entry", "GeronimoServerDelegate.v30.doGetParentModules", module);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.v30.doGetParentModules", module);
ArrayList<IModule> parents = new ArrayList<IModule>();
parents.addAll(getApplicationModules(module));
@@ -913,7 +913,7 @@ abstract public class GeronimoServerDele
}
}
IModule[] modules = (IModule[]) parents.toArray(new IModule[parents.size()]);
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.v30.doGetParentModules", modules);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.v30.doGetParentModules", modules);
return modules;
}
@@ -926,7 +926,7 @@ abstract public class GeronimoServerDele
* @return
*/
private List<IModule> getApplicationModules(IModule module) {
- Trace.tracePoint("Entry", "GeronimoServerDelegate.getApplicationModules", module);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoServerDelegate.getApplicationModules", module);
ArrayList<IModule> list = new ArrayList<IModule>();
@@ -962,7 +962,7 @@ abstract public class GeronimoServerDele
}
}
- Trace.tracePoint("Exit ", "GeronimoServerDelegate.getApplicationModules", list);
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoServerDelegate.getApplicationModules", list);
return list;
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerInfo.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/GeronimoServerInfo.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/GeronimoServerInfo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerInfo.java Wed May 25 08:16:27 2011
@@ -150,7 +150,7 @@ public class GeronimoServerInfo {
} catch (SecurityException e) {
} catch (Exception e) {
Trace.trace(Trace.WARNING, "Kernel connection failed. "
- + e.getMessage());
+ + e.getMessage(), Activator.logCore);
}
}
}
@@ -285,15 +285,15 @@ public class GeronimoServerInfo {
}
} 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);
}
}
@@ -377,7 +377,7 @@ public class GeronimoServerInfo {
} catch (NoSuchAttributeException e) {
} catch (Exception e) {
Trace.trace(Trace.WARNING, "Kernel connection failed. "
- + e.getMessage());
+ + e.getMessage(), Activator.logCore);
}
}
}
@@ -392,7 +392,8 @@ public class GeronimoServerInfo {
for (int i = 0; i < kernels.size(); i++) {
Set beans = kernels.get(i).listGBeans(query);
for (Iterator it = beans.iterator(); it.hasNext();) {
- AbstractName abstractName = (AbstractName) it.next();
+ Object aName = it.next();
+ AbstractName abstractName = (AbstractName) aName;
Pattern pattern = new Pattern();
Artifact artifact = abstractName.getArtifact();
pattern.setArtifactId(artifact.getArtifactId());
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoSourcePathComputerDelegate.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/GeronimoSourcePathComputerDelegate.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/GeronimoSourcePathComputerDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoSourcePathComputerDelegate.java Wed May 25 08:16:27 2011
@@ -61,7 +61,7 @@ public class GeronimoSourcePathComputerD
* org.eclipse.core.runtime.IProgressMonitor)
*/
public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
- Trace.trace(Trace.INFO, ">> GeronimoSourcePathComputerDelegate.computeSourceContainers()");
+ Trace.trace(Trace.INFO, ">> GeronimoSourcePathComputerDelegate.computeSourceContainers()", Activator.traceCore);
IServer server = ServerUtil.getServer(configuration);
IModule[] modules = server.getModules();
@@ -88,20 +88,15 @@ public class GeronimoSourcePathComputerD
HashSet allContainers = new HashSet(Arrays.asList(defaultContainers));
Iterator i = getAdditionalSrcPathComputers().iterator();
ILaunchManager mgr = DebugPlugin.getDefault().getLaunchManager();
- Trace.trace(Trace.INFO, "Total # of unique source containers: " + allContainers.size());
while(i.hasNext()) {
ISourcePathComputer computer = mgr.getSourcePathComputer((String) i.next());
- Trace.trace(Trace.INFO, "Invoking Source Path Computer " + computer.getId());
ISourceContainer[] jsc = computer.computeSourceContainers(configuration, monitor);
if(jsc != null) {
- Trace.trace(Trace.INFO, "Additional Source Containers returned ...");
for(int j = 0; j < jsc.length; j++) {
String name = jsc[j].getName();
- Trace.trace(Trace.INFO, "name = " + name);
}
}
allContainers.addAll(Arrays.asList(jsc));
- Trace.trace(Trace.INFO, "Number # of unique source containers: " + allContainers.size());
}
//add source container for Geroniom Runtime
@@ -174,7 +169,6 @@ public class GeronimoSourcePathComputerD
IConfigurationElement[] extensions = extensionPoint.getConfigurationElements();
for (int i = 0; i < extensions.length; i++) {
String id = extensions[i].getAttribute("id");
- Trace.trace(Trace.INFO, "Found extension point " + id);
additionalSrcPathComputerIds.add(id);
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.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/GeronimoUtils.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/GeronimoUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java Wed May 25 08:16:27 2011
@@ -114,13 +114,13 @@ public class GeronimoUtils {
} else if (isRARModule(module)) {
return ModuleType.RAR;
} else {
- Trace.trace(Trace.SEVERE, "getJSR88ModuleType = null");
+ Trace.trace(Trace.ERROR, "getJSR88ModuleType = null", Activator.logCore);
return null;
}
}
public static JAXBElement getDeploymentPlan(IFile file) throws Exception {
- Trace.tracePoint("ENTRY", "GeronimoUtils.getDeploymentPlan", file);
+ Trace.tracePoint("ENTRY", Activator.traceCore, "GeronimoUtils.getDeploymentPlan", file);
if (!file.exists()) {
return null;
@@ -137,7 +137,7 @@ public class GeronimoUtils {
else if (file.getName().equals(GeronimoUtils.APP_CLIENT_PLAN_NAME))
return getApplicationClientDeploymentPlan(file);
- Trace.tracePoint("EXIT", "GeronimoUtils.getDeploymentPlan", null);
+ Trace.tracePoint("EXIT", Activator.traceCore, "GeronimoUtils.getDeploymentPlan", null);
return null;
}
@@ -160,7 +160,7 @@ public class GeronimoUtils {
}
public static String getConfigId(IModule module) throws Exception {
- Trace.tracePoint("ENTRY", "GeronimoUtils.getConfigId", module);
+ Trace.tracePoint("ENTRY", Activator.traceCore, "GeronimoUtils.getConfigId", module);
Environment environment = null;
if (isWebModule(module)) {
@@ -194,7 +194,7 @@ public class GeronimoUtils {
if (environment != null
&& environment.getModuleId() != null) {
- Trace.tracePoint("EXIT", "GeronimoUtils.getConfigId", getQualifiedConfigID(environment.getModuleId()));
+ Trace.tracePoint("EXIT", Activator.traceCore, "GeronimoUtils.getConfigId", getQualifiedConfigID(environment.getModuleId()));
return getQualifiedConfigID(environment.getModuleId());
}
@@ -222,7 +222,7 @@ public class GeronimoUtils {
}
}
- Trace.tracePoint("EXIT", "GeronimoUtils.getConfigId", getId(module));
+ Trace.tracePoint("EXIT", Activator.traceCore, "GeronimoUtils.getConfigId", getId(module));
return getId(module);
}
@@ -261,13 +261,13 @@ public class GeronimoUtils {
}
public static JAXBElement getApplicationClientDeploymentPlan(IFile file) throws Exception {
- Trace.tracePoint("ENTRY", "GeronimoUtils.getApplicationClientDeploymentPlan", file);
+ Trace.tracePoint("ENTRY", Activator.traceCore, "GeronimoUtils.getApplicationClientDeploymentPlan", file);
if (file.getName().equals(APP_CLIENT_PLAN_NAME) && file.exists()) {
return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
- Trace.tracePoint("EXIT", "GeronimoUtils.getApplicationClientDeploymentPlan", null);
+ Trace.tracePoint("EXIT", Activator.traceCore, "GeronimoUtils.getApplicationClientDeploymentPlan", null);
return null;
}
public static IFile getConnectorDeploymentPlanFile(IVirtualComponent comp) {
@@ -289,7 +289,7 @@ public class GeronimoUtils {
in = manifestFile.getContents();
manifest = new Manifest(in);
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Could load manifest file", e);
+ Trace.trace(Trace.ERROR, "Could load manifest file", e, Activator.logCore);
} finally {
if (in != null) {
try { in.close(); } catch (Exception ee) {}
@@ -307,7 +307,7 @@ public class GeronimoUtils {
contextRoot = plan.getValue().getContextRoot();
}
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Could load geronimo-web.xml", e);
+ Trace.trace(Trace.ERROR, "Could load geronimo-web.xml", e, Activator.logCore);
}
} else {
// TODO: this does not seem to pick up changes if application.xml is updated with a new context-root
@@ -375,13 +375,13 @@ public class GeronimoUtils {
return getWebDeploymentPlan(getWebDeploymentPlanFile(comp));
}
public static JAXBElement getWebDeploymentPlan(IFile file) throws Exception {
- Trace.tracePoint("ENTRY", "GeronimoUtils.getWebDeploymentPlan", file);
+ Trace.tracePoint("ENTRY", Activator.traceCore, "GeronimoUtils.getWebDeploymentPlan", file);
if (file.getName().equals(WEB_PLAN_NAME) && file.exists()) {
return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
- Trace.tracePoint("EXIT", "GeronimoUtils.getWebDeploymentPlan", null);
+ Trace.tracePoint("EXIT", Activator.traceCore, "GeronimoUtils.getWebDeploymentPlan", null);
return null;
}
@@ -393,13 +393,13 @@ public class GeronimoUtils {
return getOpenEjbDeploymentPlan(getOpenEjbDeploymentPlanFile(comp));
}
public static JAXBElement getOpenEjbDeploymentPlan(IFile file) throws Exception {
- Trace.tracePoint("ENTRY", "GeronimoUtils.getOpenEjbDeploymentPlan", file);
+ Trace.tracePoint("ENTRY", Activator.traceCore, "GeronimoUtils.getOpenEjbDeploymentPlan", file);
if (file.getName().equals(OPENEJB_PLAN_NAME) && file.exists()) {
return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
- Trace.tracePoint("EXIT", "GeronimoUtils.getOpenEjbDeploymentPlan", null);
+ Trace.tracePoint("EXIT", Activator.traceCore, "GeronimoUtils.getOpenEjbDeploymentPlan", null);
return null;
}
@@ -412,13 +412,13 @@ public class GeronimoUtils {
return getApplicationDeploymentPlan(getApplicationDeploymentPlanFile(comp));
}
public static JAXBElement getApplicationDeploymentPlan(IFile file) throws Exception {
- Trace.tracePoint("ENTRY", "GeronimoUtils.getApplicationDeploymentPlan", file);
+ Trace.tracePoint("ENTRY", Activator.traceCore, "GeronimoUtils.getApplicationDeploymentPlan", file);
if (file.getName().equals(APP_PLAN_NAME) && file.exists()) {
return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
- Trace.tracePoint("EXIT", "GeronimoUtils.getApplicationDeploymentPlan", null);
+ Trace.tracePoint("EXIT", Activator.traceCore, "GeronimoUtils.getApplicationDeploymentPlan", null);
return null;
}
@@ -434,13 +434,13 @@ public class GeronimoUtils {
return getConnectorDeploymentPlan(getConnectorDeploymentPlanFile(comp));
}
public static JAXBElement getConnectorDeploymentPlan(IFile file) throws Exception {
- Trace.tracePoint("ENTRY", "GeronimoUtils.getConnectorDeploymentPlan", file);
+ Trace.tracePoint("ENTRY", Activator.traceCore, "GeronimoUtils.getConnectorDeploymentPlan", file);
if (file.getName().equals(CONNECTOR_PLAN_NAME) && file.exists()) {
return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
- Trace.tracePoint("EXIT", "GeronimoUtils.getConnectorDeploymentPlan", null);
+ Trace.tracePoint("EXIT", Activator.traceCore, "GeronimoUtils.getConnectorDeploymentPlan", 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/GeronimoVersionHandler.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/GeronimoVersionHandler.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/GeronimoVersionHandler.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoVersionHandler.java Wed May 25 08:16:27 2011
@@ -34,9 +34,9 @@ public class GeronimoVersionHandler impl
* @see org.apache.geronimo.st.core.IGeronimoVersionHandler#getConfigID(org.eclipse.wst.server.core.IModule)
*/
public String getConfigID(IModule module) throws Exception {
- Trace.tracePoint("Entry", "GeronimoVersionHandler.getConfigID", module);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoVersionHandler.getConfigID", module);
- Trace.tracePoint("Exit ", "GeronimoVersionHandler.getConfigID", GeronimoUtils.getConfigId(module));
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoVersionHandler.getConfigID", GeronimoUtils.getConfigId(module));
return GeronimoUtils.getConfigId(module);
}
@@ -44,9 +44,9 @@ public class GeronimoVersionHandler impl
* @see org.apache.geronimo.st.core.IGeronimoVersionHandler#createTargetModuleId(java.lang.String)
*/
public TargetModuleID createTargetModuleId(String configId) {
- Trace.tracePoint("Entry", "GeronimoVersionHandler.createTargetModuleId", configId);
+ Trace.tracePoint("Entry", Activator.traceCore, "GeronimoVersionHandler.createTargetModuleId", configId);
- Trace.tracePoint("Exit ", "GeronimoVersionHandler.createTargetModuleId", new TargetModuleIDImpl(null, configId));
+ Trace.tracePoint("Exit ", Activator.traceCore, "GeronimoVersionHandler.createTargetModuleId", new TargetModuleIDImpl(null, configId));
return new TargetModuleIDImpl(null, configId);
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/PingThread.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/PingThread.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/PingThread.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/PingThread.java Wed May 25 08:16:27 2011
@@ -73,7 +73,7 @@ public class PingThread extends Thread {
ClassLoader cl = ((GeronimoServerBehaviourDelegate) geronimoServer).getContextClassLoader();
Thread.currentThread().setContextClassLoader(cl);
if (geronimoServer.isFullyStarted()) {
- Trace.trace(Trace.INFO, "Ping: success");
+ Trace.trace(Trace.INFO, "Ping: success", Activator.traceCore);
geronimoServer.setServerStarted();
return;
}
@@ -81,7 +81,7 @@ public class PingThread extends Thread {
Thread.currentThread().setContextClassLoader(old);
}
- Trace.trace(Trace.INFO, "Ping: fail");
+ Trace.trace(Trace.INFO, "Ping: fail", Activator.traceCore);
try {
sleep(pingInterval);
@@ -91,7 +91,7 @@ public class PingThread extends Thread {
}
//don't need to show this message to user, since wst Server will show the timeout message to user
- Trace.trace(Trace.SEVERE, "Ping: Can't ping for server startup.");
+ Trace.trace(Trace.ERROR, "Ping: Can't ping for server startup.", Activator.logCore);
server.stop(false);
}