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 [1/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...
Author: hanhongfang
Date: Wed May 25 08:16:27 2011
New Revision: 1127422
URL: http://svn.apache.org/viewvc?rev=1127422&view=rev
Log:
GERONIMODEVTOOLS-748 Logging framework in GEP. Thanks Yi Xiao for the patch.
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.options
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/Activator.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/operations/JAXB11Utils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/Activator.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/ConversionHelper.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/JAXBUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.options
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/Activator.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/operations/JAXB21Utils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/.options
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/Activator.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ClasspathContainersHelper.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoConnectionFactory.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/PingThread.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/UpdateServerStateTask.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/commands/DeployCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/commands/DistributeCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/commands/SynchronizedDeploymentOp.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/GeronimoAccountManager.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/SharedLibEntryCreationOperation.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/.options
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/Activator.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/actions/LaunchGeronimoConsoleAction.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/actions/LaunchGeronimoSupportAction.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/commands/SetClasspathContainersCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoFormContentLoader.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoJAXBBasedEditor.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/ServerEditorSecuritySection.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/ServerEditorTestEnvSection.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoV11Utils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/.options
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/Activator.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoV20ServerInfo.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.options
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/Activator.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerBehaviour.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerInfoManager.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21ServerInfo.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/DependencyHelper.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/DependencyManager.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoServerV21PluginManager.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoV21FacetInstallDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/plugin/JAXB21PluginUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.options
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/Activator.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerPluginSection.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoServerBehaviour.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoV22ServerInfo.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerV22PluginManager.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/plugin/JAXB22PluginUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.options
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/ClasspathContainersHelper.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoConnectionFactory.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoLaunchConfigurationDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoLaunchableAdapterDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServer.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviour.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerInfo.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoSourcePathComputerDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoVersionHandler.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/PingThread.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/SynchronizeProjectOnServerTask.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/UpdateServerStateTask.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/DeployCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/DistributeCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/SynchronizedDeploymentOp.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/facets/DeploymentPlanCreationOperation.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/facets/DeploymentPlanInstallConfig.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/facets/GeronimoJEEFacetInstallDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/DependencyHelper.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/DependencyManager.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/BlueprintJAXBHelper.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/ConversionHelper.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/NamespaceFilter.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/operations/GeronimoAccountManager.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/operations/GeronimoServerPluginManager.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/operations/ImportDeploymentPlanOperation.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/operations/SharedLibEntryCreationOperation.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/AriesHelper.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/.options
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/Activator.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/actions/LaunchGeronimoConsoleAction.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/actions/LaunchGeronimoSupportAction.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetClasspathContainersCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/handlers/DownloadGeronimo.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/handlers/DownloadOSGi.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorSecuritySection.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorTestEnvSection.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerPluginSection.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/AbstractBlueprintTreeSectionPart.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/OtherElementsSection.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/blueprint/BlueprintElementWizardProxy.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/facets/GeronimoJEEFacetInstallWizardPage.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.options
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.options?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.options (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.options Wed May 25 08:16:27 2011
@@ -1 +1,5 @@
-org.apache.geronimo.jee.v21.jaxbmodel/debug=true
\ No newline at end of file
+org.apache.geronimo.j2ee.v11.jaxbmodel/debug=true
+org.apache.geronimo.j2ee.v11.jaxbmodel/console=true
+
+org.apache.geronimo.j2ee.v11.jaxbmodel/log/operations=true
+org.apache.geronimo.j2ee.v11.jaxbmodel/trace/operations=false
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/Activator.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/Activator.java Wed May 25 08:16:27 2011
@@ -17,6 +17,8 @@
package org.apache.geronimo.j2ee.jaxbmodel;
+import org.apache.geronimo.j2ee.jaxbmodel.internal.Trace;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
import org.osgi.framework.BundleContext;
@@ -25,7 +27,21 @@ public class Activator extends Plugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.apache.geronimo.j2ee.v11.jaxbmodel";
-
+ public static boolean console;
+ public static boolean logOperations;
+ public static boolean traceOperations;
+
+ static {
+ try {
+ console = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.j2ee.v11.jaxbmodel/console"));
+ logOperations = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.j2ee.v11.jaxbmodel/log/operations"));
+ traceOperations = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.j2ee.v11.jaxbmodel/trace/operations"));
+ } catch(NumberFormatException e) {
+ Trace.trace(Trace.ERROR, e.getMessage(), true);
+ } catch(NullPointerException e) {
+ Trace.trace(Trace.ERROR, e.getMessage(), true);
+ }
+ }
// The shared instance
private static Activator plugin;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/internal/Trace.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/internal/Trace.java Wed May 25 08:16:27 2011
@@ -17,7 +17,7 @@
package org.apache.geronimo.j2ee.jaxbmodel.internal;
import org.apache.geronimo.j2ee.jaxbmodel.Activator;
-import org.eclipse.core.runtime.IStatus;
+import org.apache.geronimo.runtime.common.log.Logger;
/**
* Helper class to route trace output.
@@ -29,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();
}
@@ -56,60 +64,61 @@ public class Trace {
* @param s
* a message
*/
- public static void trace(byte level, String s) {
- trace(level, s, null, false);
- }
-
- public static void trace(byte level, String s, boolean newLine) {
- trace(level, s, null, newLine);
- }
-
- public static void trace(byte level, String s, Throwable t) {
- trace(level, s, null, false);
+ public static void trace(int level, String s, boolean opt) {
+ trace(level, s, null, opt);
}
- public static void trace(byte level, String s, Throwable t, boolean newLine) {
+ /**
+ * Trace the given message and exception.
+ *
+ * @param level
+ * the trace level
+ * @param s
+ * a message
+ * @param t
+ * a throwable
+ */
+ public static void trace(int level, String s, Throwable t, boolean opt) {
if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
return;
-
- if (newLine) {
- System.out.println();
+ 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();
}
-
- System.out.println(Activator.PLUGIN_ID + ": " + s);
- if (t != null)
- t.printStackTrace();
}
/**
- * Trace the given message
+ * Trace the given message
*
* @param tracePoint
* The trace point (e.g., "Exit", "Entry", "Constructor", etc....
- *
+ *
* @param classDotMethod
* The class name + method name (e.g., "Class.method()")
- *
+ *
* @param parms
- * Method parameter(s) if the trace point is an "Entry" 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,
- Object... parms) {
- if (parms == null) {
- trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( null )");
- } else {
- trace(Trace.INFO, tracePoint + ": " + classDotMethod + "(");
- for (int ii = 0; ii < parms.length; ii++) {
+ * Method parameter(s) if the trace point is an "Entry"
+ * or
+ * Return value if the trace point is an "Exit"
+ */
+ public static void tracePoint(String tracePoint, String classDotMethod, boolean opt) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()", opt);
+ }
+ public static void tracePoint(String tracePoint, boolean opt, String classDotMethod, Object... parms) {
+ if ( parms == null ) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( null )" , opt);
+ }
+ else {
+ 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);
}
- }
+ }
}
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/operations/JAXB11Utils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/operations/JAXB11Utils.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/operations/JAXB11Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/jaxbmodel/operations/JAXB11Utils.java Wed May 25 08:16:27 2011
@@ -81,7 +81,7 @@ public class JAXB11Utils implements IJAX
"org.apache.geronimo.j2ee.corba_css_config:"+
"org.apache.geronimo.j2ee.corba_tss_config:", Activator.class.getClassLoader() );
} catch (JAXBException e) {
- Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
+ Trace.tracePoint("JAXBException", Activator.logOperations, "JAXBContext.newInstance");
e.printStackTrace();
}
return null;
@@ -132,22 +132,22 @@ public class JAXB11Utils implements IJAX
file.create(inBuffer, true, null);
}
} catch (JAXBException jaxbException) {
- Trace.tracePoint("JAXBException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("JAXBException", Activator.logOperations, "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
throw jaxbException;
} catch (CoreException coreException) {
- Trace.tracePoint("CoreException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("CoreException", Activator.logOperations, "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
throw coreException;
} catch (ParserConfigurationException e) {
- Trace.tracePoint("ParserConfigurationException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("ParserConfigurationException", Activator.logOperations, "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
throw e;
} catch (TransformerConfigurationException e) {
- Trace.tracePoint("TransformerConfigurationException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("TransformerConfigurationException", Activator.logOperations, "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
throw e;
} catch (UnsupportedEncodingException e) {
- Trace.tracePoint("UnsupportedEncodingException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("UnsupportedEncodingException", Activator.logOperations, "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
throw e;
} catch (TransformerException e) {
- Trace.tracePoint("TransformerException", "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("TransformerException", Activator.logOperations, "JAXB11Utils.marshalDeploymentPlan()", file.getFullPath());
throw e;
}
}
@@ -163,16 +163,16 @@ public class JAXB11Utils implements IJAX
JAXBElement plan = (JAXBElement) unmarshaller.unmarshal(source);
return plan;
} catch (JAXBException e) {
- Trace.tracePoint("JAXBException", "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("JAXBException", Activator.logOperations, "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
} catch (CoreException e) {
- Trace.tracePoint("CoreException", "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("CoreException", Activator.logOperations, "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
} catch (ParserConfigurationException e) {
- Trace.tracePoint("ParserConfigurationException", "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("ParserConfigurationException", Activator.logOperations, "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
} catch (SAXException e) {
- Trace.tracePoint("SAXException", "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("SAXException", Activator.logOperations, "JAXB11Utils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/Activator.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/Activator.java Wed May 25 08:16:27 2011
@@ -17,6 +17,8 @@
package org.apache.geronimo.jaxbmodel.common;
+import org.apache.geronimo.jaxbmodel.common.internal.Trace;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
@@ -27,7 +29,21 @@ public class Activator extends Plugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.apache.geronimo.jaxbmodel.common"; //$NON-NLS-1$
-
+ public static boolean console;
+ public static boolean logOperations;
+ public static boolean traceOperations;
+
+ static {
+ try {
+ console = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.jaxbmodel.common/console"));
+ logOperations = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.jaxbmodel.common/log/operations"));
+ traceOperations = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.jaxbmodel.common/trace/operations"));
+ } catch(NumberFormatException e) {
+ Trace.trace(Trace.ERROR, e.getMessage(), true);
+ } catch(NullPointerException e) {
+ Trace.trace(Trace.ERROR, e.getMessage(), true);
+ }
+ }
// The shared instance
private static Activator plugin;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/internal/Trace.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/internal/Trace.java Wed May 25 08:16:27 2011
@@ -17,7 +17,7 @@
package org.apache.geronimo.jaxbmodel.common.internal;
import org.apache.geronimo.jaxbmodel.common.Activator;
-import org.eclipse.core.runtime.IStatus;
+import org.apache.geronimo.runtime.common.log.Logger;
/**
* Helper class to route trace output.
@@ -29,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();
}
@@ -56,60 +64,61 @@ public class Trace {
* @param s
* a message
*/
- public static void trace(byte level, String s) {
- trace(level, s, null, false);
- }
-
- public static void trace(byte level, String s, boolean newLine) {
- trace(level, s, null, newLine);
- }
-
- public static void trace(byte level, String s, Throwable t) {
- trace(level, s, null, false);
+ public static void trace(int level, String s, boolean opt) {
+ trace(level, s, null, opt);
}
- public static void trace(byte level, String s, Throwable t, boolean newLine) {
+ /**
+ * Trace the given message and exception.
+ *
+ * @param level
+ * the trace level
+ * @param s
+ * a message
+ * @param t
+ * a throwable
+ */
+ public static void trace(int level, String s, Throwable t, boolean opt) {
if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
return;
-
- if (newLine) {
- System.out.println();
+ 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();
}
-
- System.out.println(Activator.PLUGIN_ID + ": " + s);
- if (t != null)
- t.printStackTrace();
}
/**
- * Trace the given message
+ * Trace the given message
*
* @param tracePoint
* The trace point (e.g., "Exit", "Entry", "Constructor", etc....
- *
+ *
* @param classDotMethod
* The class name + method name (e.g., "Class.method()")
- *
+ *
* @param parms
- * Method parameter(s) if the trace point is an "Entry" 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,
- Object... parms) {
- if (parms == null) {
- trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( null )");
- } else {
- trace(Trace.INFO, tracePoint + ": " + classDotMethod + "(");
- for (int ii = 0; ii < parms.length; ii++) {
+ * Method parameter(s) if the trace point is an "Entry"
+ * or
+ * Return value if the trace point is an "Exit"
+ */
+ public static void tracePoint(String tracePoint, String classDotMethod, boolean opt) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()", opt);
+ }
+ public static void tracePoint(String tracePoint, boolean opt, String classDotMethod, Object... parms) {
+ if ( parms == null ) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( null )" , opt);
+ }
+ else {
+ 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);
}
- }
+ }
}
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/ConversionHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/ConversionHelper.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/ConversionHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/ConversionHelper.java Wed May 25 08:16:27 2011
@@ -20,6 +20,7 @@ package org.apache.geronimo.jaxbmodel.co
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
+import org.apache.geronimo.jaxbmodel.common.Activator;
import org.apache.geronimo.jaxbmodel.common.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.traceOperations, "ConversionHelper.convertGeronimoWebFile", plan);
convertNamespace( plan );
- Trace.tracePoint("Exit ", "ConversionHelper.convertGeronimoWebFile");
+ Trace.tracePoint("Exit ", Activator.traceOperations, "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.traceOperations, "ConversionHelper.convertGeronimoOpenEjbFile", plan);
convertNamespace( plan );
- Trace.tracePoint("Exit ", "ConversionHelper.convertGeronimoOpenEjbFile");
+ Trace.tracePoint("Exit ", Activator.traceOperations, "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.traceOperations, "ConversionHelper.convertGeronimoApplicationFile", plan);
convertNamespace( plan );
- Trace.tracePoint("Exit ", "ConversionHelper.convertGeronimoApplicationFile");
+ Trace.tracePoint("Exit ", Activator.traceOperations, "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.traceOperations, "ConversionHelper.convertGeronimoRaFile", plan);
convertNamespace( plan );
- Trace.tracePoint("Exit ", "ConversionHelper.convertGeronimoRaFile");
+ Trace.tracePoint("Exit ", Activator.traceOperations, "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.traceOperations, "ConversionHelper.convertGeronimoApplicationClientFile", plan);
convertNamespace( plan );
- Trace.tracePoint("Exit ", "ConversionHelper.convertGeronimoApplicationClientFile");
+ Trace.tracePoint("Exit ", Activator.traceOperations, "ConversionHelper.convertGeronimoApplicationClientFile");
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/JAXBUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/JAXBUtils.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/JAXBUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/JAXBUtils.java Wed May 25 08:16:27 2011
@@ -52,7 +52,7 @@ public class JAXBUtils {
}
private static synchronized void loadExtensionPoints() {
- Trace.tracePoint("ENTRY", "JAXBUtils.loadExtensionPoints");
+ Trace.tracePoint("ENTRY", Activator.traceOperations, "JAXBUtils.loadExtensionPoints");
IExtensionRegistry registry = Platform.getExtensionRegistry();
IConfigurationElement[] cf = registry.getConfigurationElementsFor(Activator.PLUGIN_ID, "JAXBUtilsProvider");
@@ -67,13 +67,13 @@ public class JAXBUtils {
providers.put(versionArray[j], provider);
}
} catch (CoreException e) {
- Trace.tracePoint("CoreException", "JAXBUtils.loadExtensionPoints");
+ Trace.tracePoint("CoreException", Activator.traceOperations, "JAXBUtils.loadExtensionPoints");
e.printStackTrace();
}
}
}
- Trace.tracePoint("EXIT", "JAXBUtils.loadExtensionPoints");
+ Trace.tracePoint("EXIT", Activator.traceOperations, "JAXBUtils.loadExtensionPoints");
}
public static List<JAXBContext> getJAXBContext() {
@@ -89,7 +89,7 @@ public class JAXBUtils {
}
public static IJAXBUtilsProvider getProvider(IFile plan) {
- Trace.tracePoint("ENTRY", "JAXBUtils.getProvider");
+ Trace.tracePoint("ENTRY", Activator.traceOperations, "JAXBUtils.getProvider");
IJAXBUtilsProvider provider = null;
if (plan != null) {
@@ -102,15 +102,15 @@ public class JAXBUtils {
String version = runtime.getRuntimeType().getVersion();
provider = (IJAXBUtilsProvider) providers.get(version);
} catch (CoreException e) {
- Trace.tracePoint("CoreException", "JAXBUtils.getProvider");
+ Trace.tracePoint("CoreException", Activator.logOperations, "JAXBUtils.getProvider");
e.printStackTrace();
} catch (IllegalArgumentException ie) {
- Trace.tracePoint("IllegalArgumentException", "JAXBUtils.getProvider");
+ Trace.tracePoint("IllegalArgumentException", Activator.logOperations, "JAXBUtils.getProvider");
throw new IllegalArgumentException("The project [" + project.getName() + "] does not have a Targeted Runtime specified.");
}
}
- Trace.tracePoint("EXIT", "JAXBUtils.getProvider", provider);
+ Trace.tracePoint("EXIT", Activator.traceOperations, "JAXBUtils.getProvider", provider);
return provider;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/NamespaceFilter.java Wed May 25 08:16:27 2011
@@ -20,6 +20,7 @@ package org.apache.geronimo.jaxbmodel.co
import java.util.HashMap;
import java.util.Map;
+import org.apache.geronimo.jaxbmodel.common.Activator;
import org.apache.geronimo.jaxbmodel.common.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.traceOperations, "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.traceOperations, "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.traceOperations, "NamespaceFilter.startElement", uri, localName, qname, atts);
super.startElement(uri, localName, qname, atts);
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.options
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.options?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.options (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.options Wed May 25 08:16:27 2011
@@ -1 +1,5 @@
-org.apache.geronimo.jee.v21.jaxbmodel/debug=true
\ No newline at end of file
+org.apache.geronimo.jee.v21.jaxbmodel/debug=true
+org.apache.geronimo.jee.v21.jaxbmodel/console=true
+
+org.apache.geronimo.jee.v21.jaxbmodel/log/operations=true
+org.apache.geronimo.jee.v21.jaxbmodel/trace/operations=false
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/Activator.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/Activator.java Wed May 25 08:16:27 2011
@@ -17,6 +17,8 @@
package org.apache.geronimo.jee.jaxbmodel;
+import org.apache.geronimo.jee.jaxbmodel.internal.Trace;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
import org.osgi.framework.BundleContext;
@@ -25,7 +27,21 @@ public class Activator extends Plugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.apache.geronimo.jee.v21.jaxbmodel";
-
+ public static boolean console;
+ public static boolean logOperations;
+ public static boolean traceOperations;
+
+ static {
+ try {
+ console = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.j2ee.v11.jaxbmodel/console"));
+ logOperations = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.j2ee.v11.jaxbmodel/log/operations"));
+ traceOperations = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.j2ee.v11.jaxbmodel/trace/operations"));
+ } catch(NumberFormatException e) {
+ Trace.trace(Trace.ERROR, e.getMessage(), true);
+ } catch(NullPointerException e) {
+ Trace.trace(Trace.ERROR, e.getMessage(), true);
+ }
+ }
// The shared instance
private static Activator plugin;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/internal/Trace.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/internal/Trace.java Wed May 25 08:16:27 2011
@@ -17,7 +17,7 @@
package org.apache.geronimo.jee.jaxbmodel.internal;
import org.apache.geronimo.jee.jaxbmodel.Activator;
-import org.eclipse.core.runtime.IStatus;
+import org.apache.geronimo.runtime.common.log.Logger;
/**
* Helper class to route trace output.
@@ -29,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();
}
@@ -56,60 +64,61 @@ public class Trace {
* @param s
* a message
*/
- public static void trace(byte level, String s) {
- trace(level, s, null, false);
- }
-
- public static void trace(byte level, String s, boolean newLine) {
- trace(level, s, null, newLine);
- }
-
- public static void trace(byte level, String s, Throwable t) {
- trace(level, s, null, false);
+ public static void trace(int level, String s, boolean opt) {
+ trace(level, s, null, opt);
}
- public static void trace(byte level, String s, Throwable t, boolean newLine) {
+ /**
+ * Trace the given message and exception.
+ *
+ * @param level
+ * the trace level
+ * @param s
+ * a message
+ * @param t
+ * a throwable
+ */
+ public static void trace(int level, String s, Throwable t, boolean opt) {
if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
return;
-
- if (newLine) {
- System.out.println();
+ 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();
}
-
- System.out.println(Activator.PLUGIN_ID + ": " + s);
- if (t != null)
- t.printStackTrace();
}
/**
- * Trace the given message
+ * Trace the given message
*
* @param tracePoint
* The trace point (e.g., "Exit", "Entry", "Constructor", etc....
- *
+ *
* @param classDotMethod
* The class name + method name (e.g., "Class.method()")
- *
+ *
* @param parms
- * Method parameter(s) if the trace point is an "Entry" 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,
- Object... parms) {
- if (parms == null) {
- trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( null )");
- } else {
- trace(Trace.INFO, tracePoint + ": " + classDotMethod + "(");
- for (int ii = 0; ii < parms.length; ii++) {
+ * Method parameter(s) if the trace point is an "Entry"
+ * or
+ * Return value if the trace point is an "Exit"
+ */
+ public static void tracePoint(String tracePoint, String classDotMethod, boolean opt) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()", opt);
+ }
+ public static void tracePoint(String tracePoint, boolean opt, String classDotMethod, Object... parms) {
+ if ( parms == null ) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( null )" , opt);
+ }
+ else {
+ 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);
}
- }
+ }
}
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/operations/JAXB21Utils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/operations/JAXB21Utils.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/operations/JAXB21Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/operations/JAXB21Utils.java Wed May 25 08:16:27 2011
@@ -80,7 +80,7 @@ public class JAXB21Utils implements IJAX
"org.apache.geronimo.jee.naming:" +
"org.apache.geronimo.jee.security:", Activator.class.getClassLoader() );
} catch (JAXBException e) {
- Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
+ Trace.tracePoint("JAXBException", Activator.logOperations, "JAXBContext.newInstance");
e.printStackTrace();
}
return null;
@@ -136,22 +136,22 @@ public class JAXB21Utils implements IJAX
file.create(inBuffer, true, null);
}
} catch (JAXBException jaxbException) {
- Trace.tracePoint("JAXBException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("JAXBException", Activator.logOperations, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw jaxbException;
} catch (CoreException coreException) {
- Trace.tracePoint("CoreException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("CoreException", Activator.logOperations, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw coreException;
} catch (ParserConfigurationException e) {
- Trace.tracePoint("ParserConfigurationException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("ParserConfigurationException", Activator.logOperations, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw e;
} catch (TransformerConfigurationException e) {
- Trace.tracePoint("TransformerConfigurationException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("TransformerConfigurationException", Activator.logOperations, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw e;
} catch (UnsupportedEncodingException e) {
- Trace.tracePoint("UnsupportedEncodingException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("UnsupportedEncodingException", Activator.logOperations, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw e;
} catch (TransformerException e) {
- Trace.tracePoint("TransformerException", "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("TransformerException", Activator.logOperations, "JAXBUtils.marshalDeploymentPlan()", file.getFullPath());
throw e;
}
}
@@ -168,16 +168,16 @@ public class JAXB21Utils implements IJAX
JAXBElement plan = (JAXBElement) unmarshaller.unmarshal(source);
return plan;
} catch (JAXBException e) {
- Trace.tracePoint("JAXBException", "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("JAXBException", Activator.logOperations, "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
} catch (CoreException e) {
- Trace.tracePoint("CoreException", "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("CoreException", Activator.logOperations, "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
} catch (ParserConfigurationException e) {
- Trace.tracePoint("ParserConfigurationException", "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("ParserConfigurationException", Activator.logOperations, "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
} catch (SAXException e) {
- Trace.tracePoint("SAXException", "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
+ Trace.tracePoint("SAXException", Activator.logOperations, "JAXBUtils.unmarshalFilterDeploymentPlan()", file.getFullPath());
throw e;
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF Wed May 25 08:16:27 2011
@@ -3,7 +3,10 @@ Bundle-ManifestVersion: 2
Bundle-Name: Geronimo Common Runtime Plug-in
Bundle-SymbolicName: org.apache.geronimo.runtime.common;singleton:=true
Bundle-Version: 3.0.0
-Bundle-ClassPath: lib/geronimo-activation_1.1_spec-1.1.jar,
+Bundle-Activator: org.apache.geronimo.runtime.common.log.Logger
+Require-Bundle:
+ org.eclipse.core.runtime
+Bundle-ClassPath: .,lib/geronimo-activation_1.1_spec-1.1.jar,
lib/geronimo-stax-api_1.2_spec-1.0.jar,
lib/geronimo-jaxb_2.2_spec-1.0.1.jar,
lib/jaxb-impl-2.2_1.jar,
@@ -11,6 +14,7 @@ Bundle-ClassPath: lib/geronimo-activatio
lib/cglib-nodep-2.1_3.jar,
lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1.jar
Export-Package:
+ org.apache.geronimo.runtime.common.log,
com.sun.istack,
com.sun.istack.localization,
com.sun.istack.logging,
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml Wed May 25 08:16:27 2011
@@ -97,6 +97,10 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-eclipsepde-plugin</artifactId>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml Wed May 25 08:16:27 2011
@@ -157,6 +157,14 @@
<artifactId>geronimo-crypto</artifactId>
<version>2.2.1</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </artifactItem>
</artifactItems>
<outputDirectory>lib</outputDirectory>
</configuration>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/.options
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/.options?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/.options (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/.options Wed May 25 08:16:27 2011
@@ -1 +1,14 @@
-org.apache.geronimo.st.core/debug=true
\ No newline at end of file
+org.apache.geronimo.st.core/debug=true
+org.apache.geronimo.st.core/console=true
+
+org.apache.geronimo.st.core/log/core=true
+org.apache.geronimo.st.core/log/commands=true
+org.apache.geronimo.st.core/log/descriptor=true
+org.apache.geronimo.st.core/log/internal=true
+org.apache.geronimo.st.core/log/operations=true
+
+org.apache.geronimo.st.core/trace/core=false
+org.apache.geronimo.st.core/trace/commands=false
+org.apache.geronimo.st.core/trace/descriptor=false
+org.apache.geronimo.st.core/trace/internal=false
+org.apache.geronimo.st.core/trace/operations=false
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF Wed May 25 08:16:27 2011
@@ -37,4 +37,5 @@ Export-Package:
org.apache.geronimo.st.core.descriptor,
org.apache.geronimo.st.core.internal,
org.apache.geronimo.st.core.operations
-Import-Package: junit.framework;version="3.8.2"
+Import-Package: junit.framework;version="3.8.2",
+ org.apache.geronimo.runtime.common.log
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/Activator.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/Activator.java Wed May 25 08:16:27 2011
@@ -16,6 +16,8 @@
*/
package org.apache.geronimo.st.core;
+import org.apache.geronimo.st.core.internal.Trace;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IServer;
@@ -32,7 +34,41 @@ public class Activator extends Plugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.apache.geronimo.st.core";
+ /* trace and log switchers */
+ public static boolean console;
+ public static boolean logCore;
+ public static boolean logCommands;
+ public static boolean logDesc;
+ public static boolean logInternal;
+ public static boolean logOperations;
+
+ public static boolean traceCore;
+ public static boolean traceCommands;
+ public static boolean traceDesc;
+ public static boolean traceInternal;
+ public static boolean traceOperations;
+ /* end here */
+ static {
+ try {
+ console = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.core/console"));
+ logCore = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.core/log/core"));
+ logCommands = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.core/log/commands"));
+ logDesc = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.core/log/descriptor"));
+ logInternal = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.core/log/internal"));
+ logOperations = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.core/log/operations"));
+
+ traceCore = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.core/trace/core"));
+ traceCommands = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.core/trace/commands"));
+ traceDesc = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.core/trace/descriptor"));
+ traceInternal = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.core/trace/internal"));
+ traceOperations = Boolean.parseBoolean(Platform.getDebugOption("org.apache.geronimo.st.core/trace/operations"));
+ } catch(NumberFormatException e) {
+ Trace.trace(Trace.ERROR, e.getMessage(), true);
+ } catch(NullPointerException e) {
+ Trace.trace(Trace.ERROR, e.getMessage(), true);
+ }
+ }
// The shared instance
private static Activator plugin;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ClasspathContainersHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ClasspathContainersHelper.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ClasspathContainersHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ClasspathContainersHelper.java Wed May 25 08:16:27 2011
@@ -42,7 +42,7 @@ public class ClasspathContainersHelper {
// instance properties in servers.xml
//
public static List<String> queryWorkspace() {
- Trace.tracePoint("ENTRY", "ClasspathContainersHelper.queryWorkspace");
+ Trace.tracePoint("ENTRY", Activator.traceCore, "ClasspathContainersHelper.queryWorkspace");
ArrayList<String> containers = new ArrayList<String>();
@@ -71,7 +71,7 @@ public class ClasspathContainersHelper {
}
Collections.sort( containers );
- Trace.tracePoint("EXIT", "ClasspathContainersHelper.queryWorkspace", containers);
+ Trace.tracePoint("EXIT", Activator.traceCore, "ClasspathContainersHelper.queryWorkspace", containers);
return containers;
}
@@ -80,7 +80,7 @@ public class ClasspathContainersHelper {
// Query the workspace to find the classapth entries for a specific classpath container,
//
public static List<IClasspathEntry> queryWorkspace( String containerPath ) {
- Trace.tracePoint("ENTRY", "ClasspathContainersHelper.queryWorkspace", containerPath );
+ Trace.tracePoint("ENTRY", Activator.traceCore, "ClasspathContainersHelper.queryWorkspace", containerPath );
List<IClasspathEntry> classpathEntries = new ArrayList<IClasspathEntry>();
@@ -117,7 +117,7 @@ public class ClasspathContainersHelper {
}
}
- Trace.tracePoint("EXIT", "ClasspathContainersHelper.queryWorkspace", classpathEntries);
+ Trace.tracePoint("EXIT", Activator.traceCore, "ClasspathContainersHelper.queryWorkspace", classpathEntries);
return classpathEntries;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java Wed May 25 08:16:27 2011
@@ -41,7 +41,7 @@ public class DeploymentPlanInstallConfig
{
public Object create()
{
- Trace.tracePoint("Entry/Exit", "DeploymentPlanInstallConfig.create");
+ Trace.tracePoint("Entry/Exit", Activator.traceCore, "DeploymentPlanInstallConfig.create");
enableGenerationDDByDefault();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java Wed May 25 08:16:27 2011
@@ -210,7 +210,7 @@ public class DeploymentUtils {
String publishedId = ModuleArtifactMapper.getInstance().resolve(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);
@@ -218,7 +218,7 @@ public class DeploymentUtils {
getTargetModuleID(dm, query);
return query;
} catch (TargetModuleIdNotFoundException e) {
- Trace.trace(Trace.INFO, e.getMessage());
+ Trace.trace(Trace.INFO, e.getMessage(), Activator.traceCore);
}
if(query != currentId) {
@@ -226,7 +226,7 @@ public class DeploymentUtils {
getTargetModuleID(dm, currentId);
return currentId;
} catch (TargetModuleIdNotFoundException e) {
- Trace.trace(Trace.INFO, e.getMessage());
+ Trace.trace(Trace.INFO, e.getMessage(), Activator.traceCore);
}
}
@@ -286,7 +286,7 @@ public class DeploymentUtils {
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.trace(Trace.INFO, "Found configuration " + configId + " on server.", Activator.traceCore);
return ids[i];
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoConnectionFactory.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoConnectionFactory.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoConnectionFactory.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/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.core/src/main/java/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java?rev=1127422&r1=1127421&r2=1127422&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/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));
}
}