Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.apache.poi/META-INF/MANIFEST.MF2
-rw-r--r--org.apache.poi/src/java/org/apache/poi/util/CommonsLogger.java56
-rw-r--r--org.eclipse.jubula.app.autagent/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.jubula.app.cmd/.classpath6
-rw-r--r--org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF12
-rw-r--r--org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Client.java11
-rw-r--r--org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/batch/ExecutionController.java7
-rw-r--r--org.eclipse.jubula.app.dbtool/.classpath6
-rw-r--r--org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.jubula.app/.classpath6
-rw-r--r--org.eclipse.jubula.app/META-INF/MANIFEST.MF13
-rw-r--r--org.eclipse.jubula.app/src/org/eclipse/jubula/app/Launcher.java6
-rw-r--r--org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java7
-rw-r--r--org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/WorkSpaceData.java6
-rw-r--r--org.eclipse.jubula.autagent/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java7
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisconnectFromAutAgentCommand.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java7
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendDirectoryCommand.java7
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendServerLogCommand.java15
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowDialogCommand.java7
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowObservConsoleCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java7
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowRecordedActionCommand.java7
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java12
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StopAUTServerCommand.java7
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java10
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsoleBP.java9
-rw-r--r--org.eclipse.jubula.client.archive/.classpath6
-rw-r--r--org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF11
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlExporter.java13
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java13
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java15
-rw-r--r--org.eclipse.jubula.client.cmd/.classpath6
-rw-r--r--org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF9
-rw-r--r--org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/AbstractCmdlineClient.java14
-rw-r--r--org.eclipse.jubula.client.core/.classpath6
-rw-r--r--org.eclipse.jubula.client.core/META-INF/MANIFEST.MF20
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTest.java47
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/MessageFactory.java30
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompNameMapperFactory.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ExternalTestDataBP.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/FileXMLReportWriter.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBP.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBPDecorator.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ProjectNameBP.java9
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestCaseParamCheckBP.java11
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java20
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/UsedToolkitBP.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/NodeBP.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTHighlightComponentCommand.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTModeChangedCommand.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTServerStateCommand.java9
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStartedCommand.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java12
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPTestResponseCommand.java9
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisconnectFromAutAgentResponseCommand.java12
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/EndTestExecutionResponseCommand.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringDataResponseCommand.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringReportCommand.java9
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ObjectMappedCommand.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ServerLogResponseCommand.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java10
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StopAUTServerStateCommand.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/TakeScreenshotResponseCommand.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java10
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/BaseConnection.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/ServerConnection.java11
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/DataEventDispatcher.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CategoryPO.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ProjectPO.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReentryProperty.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeTracker.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/SpecTestCasePO.java9
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/CompNamePM.java12
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/GeneralStorage.java9
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/NodePM.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ParamNamePM.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceManager.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java21
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestDataCubePM.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/LockManager.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/BundleUtils.java14
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ListenerManager.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java6
-rw-r--r--org.eclipse.jubula.client.inspector.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/ActivateInspectorResponseCommand.java8
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java8
-rw-r--r--org.eclipse.jubula.client.ui/.classpath6
-rw-r--r--org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF36
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/Plugin.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ImportFileBP.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ProblemsBP.java9
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ShowClientLogBP.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionContributor.java11
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionGUIController.java7
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/CapGUIPropertySource.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/AUTConfigPropertiesDialog.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/ProjectDialog.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractJBEditor.java11
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingMultiPageEditor.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/CreateNewProjectVersionHandler.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/OMEDeleteUnusedComponentNamesHandler.java13
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/ExportAllHandler.java9
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/ExportProjectHandler.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SaveProjectAsHandler.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SelectDatabaseHandler.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/perspective/ExecutionPerspective.java7
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/perspective/ReportPerspective.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/properties/ProjectGeneralPropertyPage.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/propertytester/AbstractBooleanPropertyTester.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/propertytester/ComponentNameCollectionPropertyTester.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/CommandHelper.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/Utils.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestSuiteBrowser.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestresultSummaryView.java7
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/imageview/SWT2DUtil.java9
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/JBMarkerResolutionGenerator.java9
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ModifiableListObservable.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ModifiableTriggerList.java9
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ProjectWizard.java9
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/AutConfigSettingWizardPage.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportProjectsWizardPage.java10
-rw-r--r--org.eclipse.jubula.communication/.classpath6
-rw-r--r--org.eclipse.jubula.communication/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/AbortingExceptionHandler.java7
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/Communicator.java31
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/commands/SetCompSystemI18nCommand.java7
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/AutStarterSocket.java6
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/Connection.java9
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/GDSocket.java11
-rw-r--r--org.eclipse.jubula.documentation.gen/.classpath1
-rw-r--r--org.eclipse.jubula.examples.extension.rcp.toolkit/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.jubula.examples.extension.swing.toolkit/META-INF/MANIFEST.MF7
-rw-r--r--org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java35
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServerConfiguration.java4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/businessprocess/ReflectionBP.java12
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTHighlightComponentCommand.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTStartCommand.java6
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractCapTestCommand.java21
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractSendAUTListOfSupportedComponentsCommand.java6
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ChangeAUTModeCommand.java7
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/EndTestExecutionCommand.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/InitTestExecutionCommand.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/NullCommand.java6
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ShowDialogResultCommand.java7
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/TakeScreenshotCommand.java11
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/logger/AutServerLogger.java57
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/registration/AgentRegisterAut.java7
-rw-r--r--org.eclipse.jubula.rc.rcp/src/org/eclipse/jubula/rc/rcp/accessor/plugin/RcpAccessorPlugin.java10
-rw-r--r--org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java16
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java4
-rw-r--r--org.eclipse.jubula.rc.swt/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/SwtAUTServer.java12
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/SendAUTListOfSupportedComponentsCommand.java9
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtAUTHierarchy.java4
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractAutSwtEventListener.java11
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java7
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/ComponentHandler.java15
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/FocusTracker.java9
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/MappingListener.java10
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java8
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/utils/SwtUtils.java6
-rw-r--r--org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/businessprocess/ToolkitSupportBP.java6
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/utils/ToolkitUtils.java24
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/xml/businessprocess/ComponentBuilder.java21
-rw-r--r--org.eclipse.jubula.toolkit.generate.interfaces/.classpath1
-rw-r--r--org.eclipse.jubula.toolkit.provider.base/META-INF/MANIFEST.MF7
-rw-r--r--org.eclipse.jubula.toolkit.provider.concrete/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.jubula.toolkit.provider.html/.classpath6
-rw-r--r--org.eclipse.jubula.toolkit.provider.html/META-INF/MANIFEST.MF11
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp.gef/.classpath6
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp.gef/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/ToolkitProvider.java1
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp/.classpath6
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp/META-INF/MANIFEST.MF7
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp/src/org/eclipse/jubula/toolkit/provider/rcp/gui/RcpAutConfigComponent.java1
-rw-r--r--org.eclipse.jubula.toolkit.provider.swing/.classpath6
-rw-r--r--org.eclipse.jubula.toolkit.provider.swing/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.jubula.toolkit.provider.swt/.classpath6
-rw-r--r--org.eclipse.jubula.toolkit.provider.swt/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.jubula.toolkit.provider.swt/src/org/eclipse/jubula/toolkit/provider/swt/ToolkitProvider.java3
-rw-r--r--org.eclipse.jubula.tools/.classpath8
-rw-r--r--org.eclipse.jubula.tools/META-INF/MANIFEST.MF23
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/DebugConstants.java4
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/Assert.java7
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/CompSystemI18n.java9
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/I18n.java6
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/JarResources.java6
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/objects/ComponentIdentifier.java9
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/serialisation/SerializedImage.java12
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/DevNull.java7
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/EnvironmentUtils.java6
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/generator/AbstractComponentBuilder.java12
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/Action.java9
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/CompSystem.java10
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/Component.java10
212 files changed, 1000 insertions, 965 deletions
diff --git a/org.apache.poi/META-INF/MANIFEST.MF b/org.apache.poi/META-INF/MANIFEST.MF
index 649f87c58..f8ccbec78 100644
--- a/org.apache.poi/META-INF/MANIFEST.MF
+++ b/org.apache.poi/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.apache.poi;singleton:=true
Bundle-Version: 3.2.0.qualifier
Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.slf4j.jcl;bundle-version="[1.5.11,2.0.0)"
+Require-Bundle: org.slf4j.api;bundle-version="[1.5.11,2.0.0)"
Export-Package: org.apache.poi,
org.apache.poi.ddf,
org.apache.poi.dev,
diff --git a/org.apache.poi/src/java/org/apache/poi/util/CommonsLogger.java b/org.apache.poi/src/java/org/apache/poi/util/CommonsLogger.java
index 16a48f28f..16511f70a 100644
--- a/org.apache.poi/src/java/org/apache/poi/util/CommonsLogger.java
+++ b/org.apache.poi/src/java/org/apache/poi/util/CommonsLogger.java
@@ -19,8 +19,9 @@
package org.apache.poi.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A logger class that strives to make it as easy as possible for
@@ -36,13 +37,14 @@ import org.apache.commons.logging.LogFactory;
public class CommonsLogger extends POILogger
{
- private static LogFactory _creator = LogFactory.getFactory();
- private Log log = null;
+ private static ILoggerFactory
+ _creator = LoggerFactory.getILoggerFactory();
+ private Logger log = null;
public void initialize(final String cat)
{
- this.log = _creator.getInstance(cat);
+ this.log = _creator.getLogger(cat);
}
/**
@@ -51,13 +53,14 @@ public class CommonsLogger extends POILogger
* @param level One of DEBUG, INFO, WARN, ERROR, FATAL
* @param obj1 The object to log.
*/
- public void log(final int level, final Object obj1)
+ public void log(final int level, final Object obj)
{
+ String obj1 = String.valueOf(obj);
if(level==FATAL)
{
- if(log.isFatalEnabled())
+ if(log.isErrorEnabled())
{
- log.fatal(obj1);
+ log.error(obj1);
}
}
else if(level==ERROR)
@@ -104,67 +107,50 @@ public class CommonsLogger extends POILogger
* @param obj1 The object to log. This is converted to a string.
* @param exception An exception to be logged
*/
- public void log(final int level, final Object obj1,
+ public void log(final int level, final Object obj,
final Throwable exception)
{
+ String obj1 = String.valueOf(obj);
if(level==FATAL)
{
- if(log.isFatalEnabled())
+ if(log.isErrorEnabled())
{
- if(obj1 != null)
- log.fatal(obj1, exception);
- else
- log.fatal(exception);
+ log.error(obj1, exception);
}
}
else if(level==ERROR)
{
if(log.isErrorEnabled())
{
- if(obj1 != null)
- log.error(obj1, exception);
- else
- log.error(exception);
+ log.error(obj1, exception);
}
}
else if(level==WARN)
{
if(log.isWarnEnabled())
{
- if(obj1 != null)
- log.warn(obj1, exception);
- else
- log.warn(exception);
+ log.warn(obj1, exception);
}
}
else if(level==INFO)
{
if(log.isInfoEnabled())
{
- if(obj1 != null)
- log.info(obj1, exception);
- else
- log.info(exception);
+ log.info(obj1, exception);
}
}
else if(level==DEBUG)
{
if(log.isDebugEnabled())
{
- if(obj1 != null)
- log.debug(obj1, exception);
- else
- log.debug(exception);
+ log.debug(obj1, exception);
}
}
else
{
if(log.isTraceEnabled())
{
- if(obj1 != null)
- log.trace(obj1, exception);
- else
- log.trace(exception);
+ log.trace(obj1, exception);
}
}
@@ -180,7 +166,7 @@ public class CommonsLogger extends POILogger
{
if(level==FATAL)
{
- if(log.isFatalEnabled())
+ if(log.isErrorEnabled())
{
return true;
}
diff --git a/org.eclipse.jubula.app.autagent/META-INF/MANIFEST.MF b/org.eclipse.jubula.app.autagent/META-INF/MANIFEST.MF
index dc2152e10..37ba37d8f 100644
--- a/org.eclipse.jubula.app.autagent/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app.autagent/META-INF/MANIFEST.MF
@@ -6,11 +6,13 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.app.autagent.Activator
Bundle-Vendor: Eclipse Jubula
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.communication;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.autagent;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.jubula.autagent;bundle-version="[1.0.0,2.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ ch.qos.logback.classic;bundle-version="0.9.19",
+ ch.qos.logback.core;bundle-version="0.9.19"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: resources/,
diff --git a/org.eclipse.jubula.app.cmd/.classpath b/org.eclipse.jubula.app.cmd/.classpath
index da5d5f6e3..64c5e31b7 100644
--- a/org.eclipse.jubula.app.cmd/.classpath
+++ b/org.eclipse.jubula.app.cmd/.classpath
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF b/org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF
index 1145ee123..c8b770f55 100644
--- a/org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF
@@ -4,10 +4,14 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Jubula
Bundle-Activator: org.eclipse.jubula.app.cmd.PluginStarter
Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.jubula.client.cmd;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.client.cmd.controller;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
- org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)"
+ org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.cmd;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.cmd.controller;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)"
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Client.java b/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Client.java
index ec5554503..88dec4626 100644
--- a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Client.java
+++ b/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Client.java
@@ -13,14 +13,15 @@ package org.eclipse.jubula.app.cmd;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.app.cmd.batch.ExecutionController;
import org.eclipse.jubula.client.cmd.AbstractCmdlineClient;
import org.eclipse.jubula.client.cmd.JobConfiguration;
import org.eclipse.jubula.client.cmd.constants.ClientStrings;
import org.eclipse.jubula.client.cmd.i18n.Messages;
import org.eclipse.jubula.client.core.businessprocess.ClientTestStrings;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
import org.eclipse.jubula.tools.exception.JBFatalException;
@@ -31,7 +32,7 @@ import org.eclipse.jubula.tools.exception.JBFatalException;
public class Client extends AbstractCmdlineClient {
/** log facility */
- private static Log log = LogFactory.getLog(Client.class);
+ private static Logger log = LoggerFactory.getLogger(Client.class);
/** the instance */
private static AbstractCmdlineClient instance = null;
@@ -85,10 +86,10 @@ public class Client extends AbstractCmdlineClient {
log.error(e.getLocalizedMessage(), e);
printlnConsoleError(e.getMessage());
} catch (IllegalArgumentException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
printlnConsoleError(e.getMessage());
} catch (JBFatalException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
printlnConsoleError(e.getMessage());
} catch (Throwable t) {
log.error(ClientStrings.ERR_UNEXPECTED, t);
diff --git a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/batch/ExecutionController.java b/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/batch/ExecutionController.java
index 64623031d..c06026914 100644
--- a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/batch/ExecutionController.java
+++ b/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/batch/ExecutionController.java
@@ -24,8 +24,8 @@ import java.util.TimerTask;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.app.cmd.i18n.Messages;
import org.eclipse.jubula.client.cmd.AbstractCmdlineClient;
import org.eclipse.jubula.client.cmd.JobConfiguration;
@@ -249,7 +249,8 @@ public class ExecutionController implements IAUTServerEventListener,
private static final int AUT_STARTUP_DELAY_DEFAULT = 5000;
/** the logger */
- private static final Log LOG = LogFactory.getLog(ExecutionController.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(ExecutionController.class);
/** instance of controller */
private static ExecutionController instance;
diff --git a/org.eclipse.jubula.app.dbtool/.classpath b/org.eclipse.jubula.app.dbtool/.classpath
index da5d5f6e3..64c5e31b7 100644
--- a/org.eclipse.jubula.app.dbtool/.classpath
+++ b/org.eclipse.jubula.app.dbtool/.classpath
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF b/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF
index 78b5b0122..fafd7efdc 100644
--- a/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF
@@ -6,10 +6,12 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.app.dbtool.bundle.Activator
Bundle-Vendor: Eclipse Jubula
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
+ javax.persistence;bundle-version="[2.0.3,3.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.client.cmd;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.client.archive;bundle-version="[1.0.0,2.0.0)",
- org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.jubula.client.archive;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/org.eclipse.jubula.app/.classpath b/org.eclipse.jubula.app/.classpath
index da5d5f6e3..64c5e31b7 100644
--- a/org.eclipse.jubula.app/.classpath
+++ b/org.eclipse.jubula.app/.classpath
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.app/META-INF/MANIFEST.MF b/org.eclipse.jubula.app/META-INF/MANIFEST.MF
index d4d8cdbe2..d67b91508 100644
--- a/org.eclipse.jubula.app/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app/META-INF/MANIFEST.MF
@@ -6,9 +6,16 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.app.Activator
Bundle-Vendor: Eclipse Jubula
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
- org.eclipse.jubula.client.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.ui;bundle-version="[3.6.1,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.6.1,4.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
+ javax.persistence;bundle-version="[2.0.3,3.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/Launcher.java b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/Launcher.java
index 2f29c2a48..e025ef1fe 100644
--- a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/Launcher.java
+++ b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/Launcher.java
@@ -19,8 +19,8 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExecutableExtension;
import org.eclipse.core.runtime.Platform;
@@ -59,7 +59,7 @@ public class Launcher implements IApplication,
private static final String WORKSPACE_VERSION_VALUE = "1"; //$NON-NLS-1$
/** for log messages */
- private static Log log = LogFactory.getLog(Launcher.class);
+ private static Logger log = LoggerFactory.getLogger(Launcher.class);
/**
* Creates a new Application.
diff --git a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java
index 526e3f5e7..4908a2b07 100644
--- a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java
+++ b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java
@@ -16,8 +16,8 @@ import java.net.URL;
import javax.persistence.PersistenceException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -62,7 +62,8 @@ import org.osgi.framework.Bundle;
*/
public class JubulaWorkbenchAdvisor extends WorkbenchAdvisor {
/** the logger */
- private static Log log = LogFactory.getLog(JubulaWorkbenchAdvisor.class);
+ private static Logger log =
+ LoggerFactory.getLogger(JubulaWorkbenchAdvisor.class);
/**
* Constructs a new <code>JubulaWorkbenchAdvisor</code>.
diff --git a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/WorkSpaceData.java b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/WorkSpaceData.java
index aca9987ba..c04e24023 100644
--- a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/WorkSpaceData.java
+++ b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/WorkSpaceData.java
@@ -18,8 +18,8 @@ import java.io.Reader;
import java.io.Writer;
import java.net.URL;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jubula.app.i18n.Messages;
@@ -60,7 +60,7 @@ public class WorkSpaceData {
private static final int PERS_ENCODING_VERSION = 1;
/** for log messages */
- private static Log log = LogFactory.getLog(WorkSpaceData.class);
+ private static Logger log = LoggerFactory.getLogger(WorkSpaceData.class);
/** the initial default */
private String m_initialDefault;
/** the selected workspace*/
diff --git a/org.eclipse.jubula.autagent/META-INF/MANIFEST.MF b/org.eclipse.jubula.autagent/META-INF/MANIFEST.MF
index 7d8e3ddfd..9c0c4d814 100644
--- a/org.eclipse.jubula.autagent/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.autagent/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Export-Package: org.eclipse.jubula.autagent,
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
- org.slf4j.jcl;bundle-version="[1.5.11,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.communication;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.launcher;bundle-version="[1.1.0,2.0.0)"
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java
index 4a22211c3..92ac27cf3 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java
@@ -25,8 +25,8 @@ import javax.swing.JOptionPane;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.agent.AutAgent;
import org.eclipse.jubula.autagent.remote.dialogs.ChooseCheckModeDialogBP;
import org.eclipse.jubula.autagent.remote.dialogs.ObservationConsoleBP;
@@ -79,7 +79,7 @@ public class AutStarter {
};
/** the logger */
- private static Log log = LogFactory.getLog(AutStarter.class);
+ private static Logger log = LoggerFactory.getLogger(AutStarter.class);
/** the instance */
private static AutStarter instance = null;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java
index 5384a4df5..402016606 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java
@@ -26,8 +26,8 @@ import java.util.jar.JarFile;
import java.util.jar.Manifest;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.monitoring.IMonitoring;
import org.eclipse.jubula.autagent.monitoring.MonitoringDataStore;
import org.eclipse.jubula.autagent.monitoring.MonitoringUtil;
@@ -60,8 +60,8 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut {
private static final String JAVA_COUNTRY_PROPERTY = "-Duser.country="; //$NON-NLS-1$
/** the logger */
- private static final Log LOG =
- LogFactory.getLog(AbstractStartJavaAut.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(AbstractStartJavaAut.class);
/**
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java
index 4a523acbf..8a69b882a 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java
@@ -19,8 +19,8 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jubula.autagent.AutStarter;
@@ -43,7 +43,8 @@ import org.osgi.framework.Bundle;
public abstract class AbstractStartToolkitAut implements IStartAut {
/** the logger */
- private static Log log = LogFactory.getLog(AbstractStartToolkitAut.class);
+ private static Logger log =
+ LoggerFactory.getLogger(AbstractStartToolkitAut.class);
/**
* the message to send back if the command for starting the AUTServer could
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisconnectFromAutAgentCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisconnectFromAutAgentCommand.java
index 90a021d20..5bad4042b 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisconnectFromAutAgentCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisconnectFromAutAgentCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.DisconnectFromAutAgentMessage;
import org.eclipse.jubula.communication.message.DisconnectFromAutAgentResponseMessage;
@@ -26,7 +26,7 @@ import org.eclipse.jubula.communication.message.Message;
public class DisconnectFromAutAgentCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(
+ private static Logger log = LoggerFactory.getLogger(
DisconnectFromAutAgentCommand.class);
/** the data */
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java
index 1e8035bd2..8328427f2 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.CAPRecordedMessage;
@@ -30,7 +30,8 @@ import org.eclipse.jubula.tools.exception.CommunicationException;
*/
public class RecordActionCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(RecordActionCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(RecordActionCommand.class);
/** the message */
private RecordActionMessage m_message;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendDirectoryCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendDirectoryCommand.java
index d80671974..b7afdfc87 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendDirectoryCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendDirectoryCommand.java
@@ -12,8 +12,8 @@ package org.eclipse.jubula.autagent.commands;
import java.io.File;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.SendDirectoryMessage;
@@ -27,7 +27,8 @@ import org.eclipse.jubula.communication.message.SendDirectoryResponseMessage;
public class SendDirectoryCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(SendDirectoryCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(SendDirectoryCommand.class);
/** the message */
private SendDirectoryMessage m_message;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendServerLogCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendServerLogCommand.java
index 114c904ca..4e4665793 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendServerLogCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendServerLogCommand.java
@@ -20,25 +20,23 @@ import java.util.Enumeration;
import java.util.logging.FileHandler;
import java.util.logging.Handler;
import java.util.logging.LogManager;
-import java.util.logging.Logger;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.SendServerLogMessage;
import org.eclipse.jubula.communication.message.ServerLogResponseMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author BREDEX GmbH
* @created Feb 8, 2007
- *
*/
public class SendServerLogCommand implements ICommand {
-
/** the logger */
- private static Log log = LogFactory.getLog(SendServerLogCommand.class);
+ private static Logger log = LoggerFactory.getLogger(
+ SendServerLogCommand.class);
/** the message */
private SendServerLogMessage m_message;
@@ -56,8 +54,8 @@ public class SendServerLogCommand implements ICommand {
FileHandler fileHandler = null;
Enumeration loggersNames = LogManager.getLogManager().getLoggerNames();
while (loggersNames.hasMoreElements() && fileHandler == null) {
- Logger logger = LogManager.getLogManager().getLogger(
- (String)loggersNames.nextElement());
+ java.util.logging.Logger logger = LogManager.getLogManager()
+ .getLogger((String)loggersNames.nextElement());
Handler[] handlers = logger.getHandlers();
for (int i = 0; i < handlers.length; ++i) {
if (handlers[i] instanceof FileHandler) {
@@ -131,5 +129,4 @@ public class SendServerLogCommand implements ICommand {
public void timeout() {
log.error(this.getClass().getName() + ".timeout() called"); //$NON-NLS-1$
}
-
}
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowDialogCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowDialogCommand.java
index 3196817cd..5dcb8f6ae 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowDialogCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowDialogCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.remote.dialogs.ChooseCheckModeDialogBP;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
@@ -30,7 +30,8 @@ import org.eclipse.jubula.communication.message.ServerShowDialogResponseMessage;
*/
public class ServerShowDialogCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(ServerShowDialogCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ServerShowDialogCommand.class);
/** the message */
private ServerShowDialogMessage m_message;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowObservConsoleCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowObservConsoleCommand.java
index c9d2b67dc..97df7aa72 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowObservConsoleCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowObservConsoleCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.remote.dialogs.ObservationConsoleBP;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
@@ -27,8 +27,8 @@ import org.eclipse.jubula.communication.message.ServerShowObservConsoleMessage;
*/
public class ServerShowObservConsoleCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory
- .getLog(ServerShowObservConsoleCommand.class);
+ private static Logger log = LoggerFactory
+ .getLogger(ServerShowObservConsoleCommand.class);
/** the message */
private ServerShowObservConsoleMessage m_message;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java
index f7f329d0f..ee2c148e2 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.remote.dialogs.ObservationConsoleBP;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
@@ -29,7 +29,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*/
public class ShowObservInfoCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(ShowObservInfoCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ShowObservInfoCommand.class);
/** the message */
private ShowObservInfoMessage m_message;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowRecordedActionCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowRecordedActionCommand.java
index 3ec42675f..fe28113e8 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowRecordedActionCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowRecordedActionCommand.java
@@ -11,8 +11,8 @@
package org.eclipse.jubula.autagent.commands;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.remote.dialogs.ObservationConsoleBP;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
@@ -29,7 +29,8 @@ import org.eclipse.jubula.communication.message.ShowRecordedActionMessage;
*/
public class ShowRecordedActionCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(ShowRecordedActionCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ShowRecordedActionCommand.class);
/** the message */
private ShowRecordedActionMessage m_message;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java
index 9873924d0..50c1f3cc4 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java
@@ -12,14 +12,15 @@ package org.eclipse.jubula.autagent.commands;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.StartAUTServerMessage;
import org.eclipse.jubula.communication.message.StartAUTServerStateMessage;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
+import org.eclipse.jubula.tools.constants.DebugConstants;
/**
* The class <code>StartAutServerCommand</code> and the associated
@@ -39,7 +40,8 @@ import org.eclipse.jubula.tools.constants.AutConfigConstants;
public class StartAUTServerCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(StartAUTServerCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(StartAUTServerCommand.class);
/** the data */
private StartAUTServerMessage m_message;
@@ -114,12 +116,12 @@ public class StartAUTServerCommand implements ICommand {
return autStarter.startAut(m_message.getAutConfiguration());
} catch (IllegalArgumentException iae) {
- log.error(iae);
+ log.error(DebugConstants.ERROR, iae);
return new StartAUTServerStateMessage(
StartAUTServerStateMessage.EXECUTION,
iae.getMessage());
} catch (NullPointerException npe) {
- log.error(npe);
+ log.error(DebugConstants.ERROR, npe);
return new StartAUTServerStateMessage(
StartAUTServerStateMessage.DATA,
npe.getMessage());
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
index f9f07c5c7..c6856d87e 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
@@ -17,8 +17,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
import org.eclipse.jubula.tools.constants.CommandConstants;
@@ -48,8 +48,8 @@ public class StartHtmlAutServerCommand extends AbstractStartToolkitAut {
}
/** the logger */
- private static final Log LOG = LogFactory
- .getLog(StartHtmlAutServerCommand.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(StartHtmlAutServerCommand.class);
/**
* {@inheritDoc}
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
index 9db3e168d..de51559a1 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
@@ -20,8 +20,8 @@ import java.util.Map;
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
import org.eclipse.jubula.tools.constants.CommandConstants;
@@ -36,8 +36,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
public class StartSwingAutServerCommand extends AbstractStartJavaAut {
/** the logger */
- private static final Log LOG =
- LogFactory.getLog(StartSwingAutServerCommand.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(StartSwingAutServerCommand.class);
/** separates the environment variables */
private static final String ENV_SEPARATOR = "\n"; //$NON-NLS-1$
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StopAUTServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StopAUTServerCommand.java
index 3db0fc16b..3d8fe3957 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StopAUTServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StopAUTServerCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.autagent.agent.AutAgent;
import org.eclipse.jubula.communication.ICommand;
@@ -32,7 +32,8 @@ import org.eclipse.jubula.communication.message.StopAUTServerStateMessage;
public class StopAUTServerCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(StopAUTServerCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(StopAUTServerCommand.class);
/** the data */
private StopAUTServerMessage m_message;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
index 8234a41c9..3994b1f41 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
@@ -27,8 +27,8 @@ import java.util.Map;
import javax.swing.JTextField;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.communication.Communicator;
import org.eclipse.jubula.communication.message.CAPRecordedMessage;
@@ -48,13 +48,11 @@ import org.eclipse.jubula.tools.xml.businessmodell.Param;
/**
* @author BREDEX GmbH
* @created 20.06.2005
- *
*/
public class ChooseCheckModeDialogBP {
-
/** the logger */
- private static final Log LOG = LogFactory
- .getLog(ChooseCheckModeDialogBP.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(ChooseCheckModeDialogBP.class);
/**
* singleton
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsoleBP.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsoleBP.java
index a97bd7c39..d84613eae 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsoleBP.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsoleBP.java
@@ -17,8 +17,8 @@ import java.lang.reflect.InvocationTargetException;
import javax.swing.WindowConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author BREDEX GmbH
@@ -26,10 +26,9 @@ import org.apache.commons.logging.LogFactory;
*
*/
public class ObservationConsoleBP {
-
/** the logger */
- private static final Log LOG = LogFactory
- .getLog(ObservationConsoleBP.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(ObservationConsoleBP.class);
/**
* singleton
diff --git a/org.eclipse.jubula.client.archive/.classpath b/org.eclipse.jubula.client.archive/.classpath
index cede9e83d..55ce054e8 100644
--- a/org.eclipse.jubula.client.archive/.classpath
+++ b/org.eclipse.jubula.client.archive/.classpath
@@ -3,11 +3,7 @@
<classpathentry exported="true" kind="lib" path="lib/javax.xml.stream_1.0.1.v201004272200.jar"/>
<classpathentry exported="true" kind="lib" path="lib/org.apache.xmlbeans.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF
index 98b11760c..eb58b5a0c 100644
--- a/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF
@@ -13,8 +13,13 @@ Export-Package: org.eclipse.jubula.client.archive;uses:="org.eclipse.jubula.clie
org.eclipse.jubula.client.archive.errorhandling,
org.eclipse.jubula.client.archive.i18n,
org.eclipse.jubula.client.archive.output
-Require-Bundle: org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
- org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)"
+ org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ javax.persistence;bundle-version="[2.0.3,3.0.0)",
+ org.eclipse.jface;bundle-version="[3.6.1,4.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlExporter.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlExporter.java
index 8d085c6aa..b06829235 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlExporter.java
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlExporter.java
@@ -25,8 +25,8 @@ import java.util.Map.Entry;
import java.util.Set;
import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.jubula.client.archive.i18n.Messages;
@@ -114,6 +114,7 @@ import org.eclipse.jubula.client.core.persistence.PMException;
import org.eclipse.jubula.client.core.persistence.PMSaveException;
import org.eclipse.jubula.client.core.persistence.ProjectPM;
import org.eclipse.jubula.client.core.persistence.TestResultSummaryPM;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.exception.ProjectDeletedException;
@@ -143,7 +144,7 @@ class XmlExporter {
private static final char TABLE_AUT_CONFIG = 'C';
/** standard logging */
- private static Log log = LogFactory.getLog(XmlExporter.class);
+ private static Logger log = LoggerFactory.getLogger(XmlExporter.class);
/** The progress monitor for the operation. */
private IProgressMonitor m_monitor;
@@ -546,11 +547,11 @@ class XmlExporter {
}
xmlSummaryAttribute.setType(pType.getName());
} catch (NoSuchMethodException e) {
- log.warn(e);
+ log.warn(DebugConstants.ERROR, e);
} catch (IllegalAccessException e) {
- log.warn(e);
+ log.warn(DebugConstants.ERROR, e);
} catch (InvocationTargetException e) {
- log.warn(e);
+ log.warn(DebugConstants.ERROR, e);
}
}
Map<String, IMonitoringValue>
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java
index 7616ffaa5..3fe77a27a 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java
@@ -29,8 +29,8 @@ import javax.persistence.EntityManager;
import org.apache.commons.beanutils.BeanUtilsBean;
import org.apache.commons.beanutils.Converter;
import org.apache.commons.beanutils.locale.converters.DateLocaleConverter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jubula.client.archive.converter.AbstractXmlConverter;
import org.eclipse.jubula.client.archive.converter.AutIdGenerationConverter;
@@ -133,6 +133,7 @@ import org.eclipse.jubula.client.core.utils.ModelParamValueConverter;
import org.eclipse.jubula.client.core.utils.TreeTraverser;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.Assert;
import org.eclipse.jubula.tools.exception.InvalidDataException;
@@ -154,8 +155,6 @@ import com.thoughtworks.xstream.converters.ConversionException;
* @created 13.01.2006
*/
class XmlImporter {
-
-
/**
* Pattern for date serialization format.
* Due to the fact that this constant is used for serialization and
@@ -224,7 +223,7 @@ class XmlImporter {
private static final int GUID_LENGTH = 32;
/** standard logging */
- private static Log log = LogFactory.getLog(XmlImporter.class);
+ private static Logger log = LoggerFactory.getLogger(XmlImporter.class);
/** Remember which instance belongs to the id used in the XML element */
private Map<String, IAUTConfigPO> m_autConfRef =
@@ -869,9 +868,9 @@ class XmlImporter {
BEAN_UTILS.setProperty(summary,
propertyNameToSet, sa.getValue());
} catch (IllegalAccessException e) {
- log.warn(e);
+ log.warn(DebugConstants.ERROR, e);
} catch (InvocationTargetException e) {
- log.warn(e);
+ log.warn(DebugConstants.ERROR, e);
}
}
} else {
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java
index 85c9b9c3e..df0d320d8 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java
@@ -29,8 +29,8 @@ import java.util.TimerTask;
import javax.persistence.PersistenceException;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlOptions;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -48,6 +48,7 @@ import org.eclipse.jubula.client.core.persistence.PMException;
import org.eclipse.jubula.client.core.persistence.PMReadException;
import org.eclipse.jubula.client.core.persistence.PMSaveException;
import org.eclipse.jubula.client.core.progress.IProgressConsole;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.ConverterException;
import org.eclipse.jubula.tools.exception.InvalidDataException;
@@ -161,7 +162,7 @@ public class XmlStorage {
".//s:" + EXEC_TC_XML_ELEMENT_NAME; //$NON-NLS-1$
/** standard logging */
- private static Log log = LogFactory.getLog(XmlStorage.class);
+ private static Logger log = LoggerFactory.getLogger(XmlStorage.class);
/**
* the old xml schema namespace (< 5.0)
@@ -226,8 +227,8 @@ public class XmlStorage {
}
if (log.isDebugEnabled()) {
log.debug(Messages.ValidateFailed + StringConstants.COLON);
- log.debug(msgs);
- log.debug(contentDoc);
+ log.debug(DebugConstants.ERROR, msgs);
+ log.debug(DebugConstants.ERROR, contentDoc);
}
throw new PMSaveException(
"XML" + Messages.ValidateFailed + msgs.toString(), //$NON-NLS-1$
@@ -448,8 +449,8 @@ public class XmlStorage {
}
if (log.isDebugEnabled()) {
log.debug(Messages.ValidateFailed + StringConstants.COLON);
- log.debug(msgs);
- log.debug(contentDoc);
+ log.debug(DebugConstants.ERROR, msgs);
+ log.debug(DebugConstants.ERROR, contentDoc);
}
throw new PMReadException(Messages.InvalidImportFile
+ msgs.toString(), MessageIDs.E_LOAD_PROJECT);
diff --git a/org.eclipse.jubula.client.cmd/.classpath b/org.eclipse.jubula.client.cmd/.classpath
index da5d5f6e3..64c5e31b7 100644
--- a/org.eclipse.jubula.client.cmd/.classpath
+++ b/org.eclipse.jubula.client.cmd/.classpath
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF
index 7339d5c8a..5ce6efa2e 100644
--- a/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF
@@ -5,12 +5,13 @@ Bundle-SymbolicName: org.eclipse.jubula.client.cmd;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
- org.apache.commons.collections;bundle-version="[3.2.0,4.0.0)"
+ org.apache.commons.collections;bundle-version="[3.2.0,4.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)"
Export-Package: org.eclipse.jubula.client.cmd,
org.eclipse.jubula.client.cmd.constants,
org.eclipse.jubula.client.cmd.exceptions,
diff --git a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/AbstractCmdlineClient.java b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/AbstractCmdlineClient.java
index f1ed67d9c..3003e550f 100644
--- a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/AbstractCmdlineClient.java
+++ b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/AbstractCmdlineClient.java
@@ -25,8 +25,8 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jubula.client.cmd.constants.ClientStrings;
import org.eclipse.jubula.client.cmd.exceptions.PreValidateException;
@@ -44,6 +44,7 @@ import org.eclipse.jubula.client.core.preferences.database.DatabaseConnection;
import org.eclipse.jubula.client.core.preferences.database.DatabaseConnectionConverter;
import org.eclipse.jubula.client.core.progress.IProgressConsole;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.messagehandling.Message;
@@ -70,7 +71,8 @@ public abstract class AbstractCmdlineClient implements IProgressConsole {
Messages.UnrecognizedOption + StringConstants.COLON
+ StringConstants.SPACE;
/** log facility */
- private static Log log = LogFactory.getLog(AbstractCmdlineClient.class);
+ private static Logger log =
+ LoggerFactory.getLogger(AbstractCmdlineClient.class);
/** be quiet during processing */
private static boolean quiet = false;
/** did an error occur during processing */
@@ -381,10 +383,10 @@ public abstract class AbstractCmdlineClient implements IProgressConsole {
return EXIT_CODE_ERROR;
}
} catch (ParseException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
return EXIT_CODE_ERROR;
} catch (IOException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
return EXIT_CODE_ERROR;
}
preRun();
@@ -402,7 +404,7 @@ public abstract class AbstractCmdlineClient implements IProgressConsole {
// Assume that, if an exception has bubbled up this far, then it is
// a big enough problem to warrant telling the user and returning a
// generic error exit code.
- log.error(t);
+ log.error(DebugConstants.ERROR, t);
printlnConsoleError(t.getLocalizedMessage());
return EXIT_CODE_ERROR;
}
diff --git a/org.eclipse.jubula.client.core/.classpath b/org.eclipse.jubula.client.core/.classpath
index f8f804122..a2f1ea190 100644
--- a/org.eclipse.jubula.client.core/.classpath
+++ b/org.eclipse.jubula.client.core/.classpath
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
diff --git a/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
index 2a18284af..77cfc3ede 100644
--- a/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
@@ -46,21 +46,27 @@ Export-Package: org.dom4j,
org.eclipse.jubula.client.core.progress,
org.eclipse.jubula.client.core.test,
org.eclipse.jubula.client.core.utils
-Require-Bundle: org.eclipse.jubula.communication;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.junit4;bundle-version="[4.8.1,5.0.0)",
- javax.persistence;bundle-version="[2.0.3,3.0.0)";visibility:=reexport,
- org.eclipse.persistence.core;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.persistence.jpa;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
org.h2;bundle-version="[1.1.117,2.0.0)",
+ org.apache.poi;bundle-version="[3.2.0,4.0.0)",
org.apache.commons.collections;bundle-version="[3.2.0,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.jface;bundle-version="[3.6.1,4.0.0)",
+ javax.persistence;bundle-version="[2.0.3,3.0.0)",
+ org.eclipse.persistence.core;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.persistence.jpa;bundle-version="[2.2.0,3.0.0)",
org.eclipse.persistence.asm;bundle-version="[2.2.0,3.0.0)",
org.eclipse.persistence.jpa.osgi;bundle-version="[2.2.0,3.0.0)",
- org.apache.poi;bundle-version="[3.2.0,4.0.0)"
+ org.eclipse.ui.workbench;bundle-version="[3.5.0,4.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ ch.qos.logback.classic;bundle-version="0.9.19",
+ ch.qos.logback.core;bundle-version="0.9.19",
+ org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.communication;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Activator: org.eclipse.jubula.client.core.Activator
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTest.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTest.java
index ac5b1f2e6..84e77cb2f 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTest.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTest.java
@@ -29,8 +29,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.swing.event.EventListenerList;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.dom4j.Document;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -93,6 +93,7 @@ import org.eclipse.jubula.toolkit.common.businessprocess.ToolkitSupportBP;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.InputConstants;
import org.eclipse.jubula.tools.constants.MonitoringConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
@@ -123,7 +124,7 @@ public class ClientTest implements IClientTest {
public static final int TEST_SUITE_EXECUTION_RELATIVE_WORK_AMOUNT = 1000;
/** the logger */
- private static Log log = LogFactory.getLog(ClientTest.class);
+ private static Logger log = LoggerFactory.getLogger(ClientTest.class);
/** file extension for XML */
private static final String XML_FILE_EXT = ".xml"; //$NON-NLS-1$
@@ -269,20 +270,20 @@ public class ClientTest implements IClientTest {
// initialising the server, so there must be a shutdown(). The
// listeners are already notified from the ConnectionListener of
// the ServerConnection, -> just log.
- log.info(nce);
+ log.info(DebugConstants.ERROR, nce);
} catch (ConnectionException ce) {
// This exception is thrown from ServerConnection.getInstance(). See comment above.
- log.info(ce);
+ log.info(DebugConstants.ERROR, ce);
} catch (CommunicationException cce) {
- log.fatal(cce);
+ log.error(DebugConstants.ERROR, cce);
// message could not send for any reason, close the connections
try {
closeConnections();
} catch (ConnectionException ce) {
- log.fatal(Messages.ClosingTheConnectionsFailed, ce);
+ log.error(Messages.ClosingTheConnectionsFailed, ce);
}
} catch (UnknownHostException uhe) {
- log.fatal(uhe);
+ log.error(DebugConstants.ERROR, uhe);
try {
// from InetAdress.getLocalHost().getName(), should not occur
// -> no communication possible -> close the connections as a
@@ -290,7 +291,7 @@ public class ClientTest implements IClientTest {
AUTConnection.getInstance().close();
ServerConnection.getInstance().close();
} catch (ConnectionException ce) {
- log.fatal(Messages.ClosingTheConnectionsFailed, ce);
+ log.error(Messages.ClosingTheConnectionsFailed, ce);
}
}
}
@@ -439,10 +440,10 @@ public class ClientTest implements IClientTest {
} catch (UnknownMessageException ume) {
fireAUTServerStateChanged(new AUTServerEvent(ume.getErrorId()));
} catch (NotConnectedException nce) {
- log.error(nce);
+ log.error(DebugConstants.ERROR, nce);
// HERE: notify the listeners about unsuccessfull mode change
} catch (CommunicationException ce) {
- log.error(ce);
+ log.error(DebugConstants.ERROR, ce);
// HERE: notify the listeners about unsuccessfull mode change
}
}
@@ -466,11 +467,11 @@ public class ClientTest implements IClientTest {
fireAUTServerStateChanged(new AUTServerEvent(
ume.getErrorId()));
} catch (NotConnectedException nce) {
- log.error(nce);
+ log.error(DebugConstants.ERROR, nce);
// HERE: notify the listeners about unsuccessfull mode
// change
} catch (CommunicationException ce) {
- log.error(ce);
+ log.error(DebugConstants.ERROR, ce);
// HERE: notify the listeners about unsuccessfull mode
// change
}
@@ -882,9 +883,9 @@ public class ClientTest implements IClientTest {
try {
ServerConnection.getInstance().send(message);
} catch (NotConnectedException nce) {
- log.error(nce);
+ log.error(DebugConstants.ERROR, nce);
} catch (CommunicationException ce) {
- log.error(ce);
+ log.error(DebugConstants.ERROR, ce);
}
}
@@ -901,9 +902,9 @@ public class ClientTest implements IClientTest {
try {
ServerConnection.getInstance().send(message);
} catch (NotConnectedException nce) {
- log.error(nce);
+ log.error(DebugConstants.ERROR, nce);
} catch (CommunicationException ce) {
- log.error(ce);
+ log.error(DebugConstants.ERROR, ce);
}
}
@@ -933,9 +934,9 @@ public class ClientTest implements IClientTest {
}
autConfigMap = response.getAutConfigMap();
} catch (NotConnectedException nce) {
- log.error(nce);
+ log.error(DebugConstants.ERROR, nce);
} catch (CommunicationException ce) {
- log.error(ce);
+ log.error(DebugConstants.ERROR, ce);
}
return autConfigMap;
}
@@ -1226,7 +1227,7 @@ public class ClientTest implements IClientTest {
} catch (BaseConnection.AlreadyConnectedException ae) {
// The connection is already established.
if (log.isDebugEnabled()) {
- log.debug(ae);
+ log.debug(DebugConstants.ERROR, ae);
}
return false;
}
@@ -1246,16 +1247,16 @@ public class ClientTest implements IClientTest {
}
AUTConnection.getInstance().run();
} catch (ConnectionException ce) {
- log.fatal(ce);
+ log.error(DebugConstants.ERROR, ce);
fireAUTServerStateChanged(new AUTServerEvent(
AUTServerEvent.COULD_NOT_ACCEPTING));
return false;
} catch (BaseConnection.AlreadyConnectedException ae) {
// The connection is already established.
- log.error(ae);
+ log.error(DebugConstants.ERROR, ae);
return false;
} catch (JBVersionException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
fireAUTServerStateChanged(new AUTServerEvent(
AUTServerEvent.COULD_NOT_ACCEPTING));
return false;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/MessageFactory.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/MessageFactory.java
index b4d18c9fc..35e9bb629 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/MessageFactory.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/MessageFactory.java
@@ -13,8 +13,8 @@ package org.eclipse.jubula.client.core;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.communication.AUTConnection;
import org.eclipse.jubula.client.core.communication.ConnectionException;
@@ -25,6 +25,7 @@ import org.eclipse.jubula.communication.message.CAPTestMessage;
import org.eclipse.jubula.communication.message.MessageCap;
import org.eclipse.jubula.communication.message.SendAUTListOfSupportedComponentsMessage;
import org.eclipse.jubula.tools.constants.CommandConstants;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
@@ -36,7 +37,8 @@ import org.eclipse.jubula.tools.messagehandling.MessageIDs;
public class MessageFactory {
/** The logger */
- private static final Log LOG = LogFactory.getLog(MessageFactory.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(MessageFactory.class);
/**
* mapping from toolkit name (short form) to corresponding Activate AUT
@@ -118,7 +120,7 @@ public class MessageFactory {
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (ExceptionInInitializerError eiie) {
- LOG.error(eiie);
+ LOG.error(DebugConstants.ERROR, eiie);
throw new UnknownMessageException(
Messages.CreatingAnMessageSharedInstanceFor
+ StringConstants.SPACE + messageClassName
@@ -126,7 +128,7 @@ public class MessageFactory {
+ StringConstants.SPACE + eiie.getMessage(),
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (LinkageError le) {
- LOG.error(le);
+ LOG.error(DebugConstants.ERROR, le);
throw new UnknownMessageException(
Messages.CreatingAnMessageSharedInstanceFor
+ StringConstants.SPACE + messageClassName
@@ -134,7 +136,7 @@ public class MessageFactory {
+ StringConstants.SPACE + le.getMessage(),
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (ClassNotFoundException cnfe) {
- LOG.error(cnfe);
+ LOG.error(DebugConstants.ERROR, cnfe);
throw new UnknownMessageException(
Messages.CreatingAnMessageSharedInstanceFor
+ StringConstants.SPACE + messageClassName
@@ -142,7 +144,7 @@ public class MessageFactory {
+ StringConstants.SPACE + cnfe.getMessage(),
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (InstantiationException ie) {
- LOG.error(ie);
+ LOG.error(DebugConstants.ERROR, ie);
throw new UnknownMessageException(
Messages.CreatingAnMessageSharedInstanceFor
+ StringConstants.SPACE + messageClassName
@@ -150,7 +152,7 @@ public class MessageFactory {
+ StringConstants.SPACE + ie.getMessage(),
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (IllegalAccessException iae) {
- LOG.error(iae);
+ LOG.error(DebugConstants.ERROR, iae);
throw new UnknownMessageException(
Messages.CreatingAnMessageSharedInstanceFor
+ StringConstants.SPACE + messageClassName
@@ -246,7 +248,7 @@ public class MessageFactory {
private static void throwUnknownMessageException(String messageClassName,
Throwable nestedException)
throws UnknownMessageException {
- LOG.error(nestedException);
+ LOG.error(DebugConstants.ERROR, nestedException);
throw new UnknownMessageException(
Messages.CreatingAnMessageSharedInstanceFor
+ StringConstants.SPACE + messageClassName
@@ -295,7 +297,7 @@ public class MessageFactory {
.newInstance();
return result;
} catch (ExceptionInInitializerError eiie) {
- LOG.error(eiie);
+ LOG.error(DebugConstants.ERROR, eiie);
throw new UnknownMessageException(
Messages.CreatingAnMessageSharedInstanceFor
+ StringConstants.SPACE + messageClassName
@@ -303,7 +305,7 @@ public class MessageFactory {
+ StringConstants.SPACE + eiie.getMessage(),
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (LinkageError le) {
- LOG.error(le);
+ LOG.error(DebugConstants.ERROR, le);
throw new UnknownMessageException(
Messages.CreatingAnMessageSharedInstanceFor
+ StringConstants.SPACE + messageClassName
@@ -311,7 +313,7 @@ public class MessageFactory {
+ StringConstants.SPACE + le.getMessage(),
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (ClassNotFoundException cnfe) {
- LOG.error(cnfe);
+ LOG.error(DebugConstants.ERROR, cnfe);
throw new UnknownMessageException(
Messages.CreatingAnMessageSharedInstanceFor
+ StringConstants.SPACE + messageClassName
@@ -319,7 +321,7 @@ public class MessageFactory {
+ StringConstants.SPACE + cnfe.getMessage(),
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (InstantiationException ie) {
- LOG.error(ie);
+ LOG.error(DebugConstants.ERROR, ie);
throw new UnknownMessageException(
Messages.CreatingAnMessageSharedInstanceFor
+ StringConstants.SPACE + messageClassName
@@ -327,7 +329,7 @@ public class MessageFactory {
+ StringConstants.SPACE + ie.getMessage(),
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (IllegalAccessException iae) {
- LOG.error(iae);
+ LOG.error(DebugConstants.ERROR, iae);
throw new UnknownMessageException(
Messages.CreatingAnMessageSharedInstanceFor
+ StringConstants.SPACE + messageClassName
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java
index c7d391c84..3845f113e 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java
@@ -14,8 +14,8 @@ import java.util.Date;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
@@ -42,7 +42,7 @@ import org.eclipse.jubula.tools.objects.event.TestErrorEvent;
public abstract class AbstractXMLReportGenerator {
/** The logger */
- private static final Log LOG = LogFactory.getLog(
+ private static final Logger LOG = LoggerFactory.getLogger(
AbstractXMLReportGenerator.class);
/** the generated report */
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompNameMapperFactory.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompNameMapperFactory.java
index f44381038..3259faf6b 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompNameMapperFactory.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompNameMapperFactory.java
@@ -11,8 +11,8 @@
package org.eclipse.jubula.client.core.businessprocess;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.client.core.model.IPersistentObject;
import org.eclipse.jubula.client.core.model.IProjectPO;
@@ -32,7 +32,8 @@ import org.eclipse.jubula.client.core.model.ITestSuitePO;
public final class CompNameMapperFactory {
/** the logger */
- private static Log log = LogFactory.getLog(CompNameMapperFactory.class);
+ private static Logger log =
+ LoggerFactory.getLogger(CompNameMapperFactory.class);
/**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java
index cb68256a2..ed49167c1 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java
@@ -24,8 +24,8 @@ import javax.persistence.PersistenceException;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jubula.client.core.businessprocess.treeoperations.CheckIfComponentNameIsReusedOp;
import org.eclipse.jubula.client.core.businessprocess.treeoperations.FindNodesForComponentNameOp;
@@ -81,7 +81,7 @@ public class ComponentNamesBP
/**
* <code>log</code> logger for class
*/
- private static Log log = LogFactory.getLog(ComponentNamesBP.class);
+ private static Logger log = LoggerFactory.getLogger(ComponentNamesBP.class);
/**
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ExternalTestDataBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ExternalTestDataBP.java
index ed41d13aa..064457f69 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ExternalTestDataBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ExternalTestDataBP.java
@@ -20,8 +20,8 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.businessprocess.importfilter.DataTable;
import org.eclipse.jubula.client.core.businessprocess.importfilter.ExcelImportFilter;
import org.eclipse.jubula.client.core.businessprocess.importfilter.IDataImportFilter;
@@ -51,7 +51,8 @@ import org.eclipse.osgi.util.NLS;
public class ExternalTestDataBP {
/** the logger */
- private static final Log LOG = LogFactory.getLog(ExternalTestDataBP.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(ExternalTestDataBP.class);
/** this is where the datafile are stored */
private static File globalDataDir = new File(StringConstants.DOT);
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/FileXMLReportWriter.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/FileXMLReportWriter.java
index 89b9f03b4..11c7e5452 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/FileXMLReportWriter.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/FileXMLReportWriter.java
@@ -23,8 +23,8 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.dom4j.Document;
import org.dom4j.io.DocumentResult;
import org.dom4j.io.DocumentSource;
@@ -54,7 +54,8 @@ public class FileXMLReportWriter implements IXMLReportWriter {
private static final String ENCODING = "UTF-8"; //$NON-NLS-1$
/** The logger */
- private static final Log LOG = LogFactory.getLog(FileXMLReportWriter.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(FileXMLReportWriter.class);
/** The target file to write to */
private String m_file;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBP.java
index 38aca97a6..f498f024f 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBP.java
@@ -14,8 +14,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IParamDescriptionPO;
import org.eclipse.jubula.client.core.model.IParamNamePO;
@@ -41,7 +41,7 @@ public class ParamNameBP extends AbstractNameBP<IParamNamePO>
/**
* <code>log</code> logger for class
*/
- private static Log log = LogFactory.getLog(ParamNameBP.class);
+ private static Logger log = LoggerFactory.getLogger(ParamNameBP.class);
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBPDecorator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBPDecorator.java
index 0fd82413b..ea249d4ec 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBPDecorator.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBPDecorator.java
@@ -17,8 +17,8 @@ import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.Query;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IParamDescriptionPO;
import org.eclipse.jubula.client.core.model.IParamNamePO;
@@ -43,7 +43,8 @@ public class ParamNameBPDecorator extends GuidNameCache<IParamNamePO>
/**
* <code>log</code> logger for class
*/
- private static Log log = LogFactory.getLog(ParamNameBPDecorator.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ParamNameBPDecorator.class);
/**
* <code>m_paramNameBP</code>wrapped paramNameBP instance
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ProjectNameBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ProjectNameBP.java
index 72c6a1d80..5163a132d 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ProjectNameBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ProjectNameBP.java
@@ -20,8 +20,8 @@ import javax.persistence.EntityTransaction;
import javax.persistence.NoResultException;
import javax.persistence.Query;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IProjectNamePO;
import org.eclipse.jubula.client.core.model.PoMaker;
@@ -29,6 +29,7 @@ import org.eclipse.jubula.client.core.persistence.Persistor;
import org.eclipse.jubula.client.core.persistence.PMException;
import org.eclipse.jubula.client.core.persistence.PersistenceManager;
import org.eclipse.jubula.client.core.utils.NameValidationUtil;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.JBFatalException;
import org.eclipse.jubula.tools.exception.ProjectDeletedException;
@@ -45,7 +46,7 @@ import javax.persistence.PersistenceException;
public class ProjectNameBP {
/** standard logging */
- private static Log log = LogFactory.getLog(ProjectNameBP.class);
+ private static Logger log = LoggerFactory.getLogger(ProjectNameBP.class);
/**
* The singleton instance.
@@ -95,7 +96,7 @@ public class ProjectNameBP {
try {
res = readProjectNameFromDB(guid);
} catch (PMException e) {
- log.warn(e);
+ log.warn(DebugConstants.ERROR, e);
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestCaseParamCheckBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestCaseParamCheckBP.java
index fffaa07f0..9c823d76a 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestCaseParamCheckBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestCaseParamCheckBP.java
@@ -18,8 +18,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IExecTestCasePO;
import org.eclipse.jubula.client.core.model.INodePO;
@@ -33,6 +33,7 @@ import org.eclipse.jubula.client.core.persistence.Persistor;
import org.eclipse.jubula.client.core.persistence.NodePM;
import org.eclipse.jubula.client.core.utils.ModelParamValueConverter;
import org.eclipse.jubula.client.core.utils.ParamValueConverter;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.exception.TestCaseParamCheckException;
@@ -53,8 +54,8 @@ import org.eclipse.osgi.util.NLS;
public class TestCaseParamCheckBP {
/** The logger */
- private static final Log LOG =
- LogFactory.getLog(TestCaseParamCheckBP.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(TestCaseParamCheckBP.class);
/**
@@ -252,7 +253,7 @@ public class TestCaseParamCheckBP {
execTestCases = NodePM.getAllExecTestCases(
parent.getGuid(), parent.getParentProjectId());
} catch (JBException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
}
List <String> paramNames = parent.getParamNames();
for (String refName : ref) {
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java
index f665b3840..a43132d40 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java
@@ -22,8 +22,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
@@ -86,6 +86,7 @@ import org.eclipse.jubula.communication.message.RestartAutMessage;
import org.eclipse.jubula.communication.message.TakeScreenshotMessage;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.MonitoringConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.TimeoutConstants;
@@ -145,7 +146,8 @@ public class TestExecution {
CONTINUE_WITHOUT_EH
}
/** The logger */
- private static final Log LOG = LogFactory.getLog(TestExecution.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(TestExecution.class);
/**
* Constant for the m_varStore of the last return value of the last
@@ -998,11 +1000,11 @@ public class TestExecution {
TimeoutConstants.CLIENT_SERVER_TIMEOUT_TAKE_SCREENSHOT);
} catch (NotConnectedException nce) {
if (LOG.isErrorEnabled()) {
- LOG.error(nce);
+ LOG.error(DebugConstants.ERROR, nce);
}
} catch (CommunicationException ce) {
if (LOG.isErrorEnabled()) {
- LOG.error(ce);
+ LOG.error(DebugConstants.ERROR, ce);
}
}
}
@@ -1201,9 +1203,9 @@ public class TestExecution {
.getExecutableName());
ServerConnection.getInstance().send(message);
} catch (NotConnectedException nce) {
- LOG.error(nce);
+ LOG.error(DebugConstants.ERROR, nce);
} catch (CommunicationException ce) {
- LOG.error(ce);
+ LOG.error(DebugConstants.ERROR, ce);
}
}
}
@@ -1222,12 +1224,12 @@ public class TestExecution {
EndTestExecutionMessage.TIMEOUT);
} catch (NotConnectedException nce) {
if (LOG.isWarnEnabled()) {
- LOG.warn(nce);
+ LOG.warn(DebugConstants.ERROR, nce);
}
stopExecution();
} catch (CommunicationException ce) {
if (LOG.isWarnEnabled()) {
- LOG.warn(ce);
+ LOG.warn(DebugConstants.ERROR, ce);
}
stopExecution();
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/UsedToolkitBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/UsedToolkitBP.java
index b4d4c702d..4545057b2 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/UsedToolkitBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/UsedToolkitBP.java
@@ -21,8 +21,8 @@ import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.persistence.Query;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
@@ -67,7 +67,7 @@ import javax.persistence.PersistenceException;
public class UsedToolkitBP {
/** standard logging */
- private static Log log = LogFactory.getLog(UsedToolkitBP.class);
+ private static Logger log = LoggerFactory.getLogger(UsedToolkitBP.class);
/**
* The singleton instance.
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/NodeBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/NodeBP.java
index f63017f5b..243af8ed8 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/NodeBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/NodeBP.java
@@ -17,8 +17,8 @@ import javax.persistence.PersistenceException;
import org.apache.commons.collections.ListUtils;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.INodePO;
import org.eclipse.jubula.client.core.model.IProjectPO;
@@ -45,7 +45,7 @@ import org.eclipse.jubula.tools.messagehandling.MessageIDs;
*/
public class NodeBP {
/** the logger */
- private static final Log LOG = LogFactory.getLog(NodeBP.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NodeBP.class);
/**
*
@@ -138,7 +138,7 @@ public class NodeBP {
throw e;
} catch (PMException e) {
// Continue since we are just refreshing the cache
- LOG.fatal(Messages.StrayPersistenceException + StringConstants.DOT
+ LOG.error(Messages.StrayPersistenceException + StringConstants.DOT
+ StringConstants.DOT, e);
}
if (!LockManager.instance().lockPO(lockSession, node, false)) {
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTHighlightComponentCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTHighlightComponentCommand.java
index 465a31d61..66a704ef7 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTHighlightComponentCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTHighlightComponentCommand.java
@@ -10,12 +10,12 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.IAUTEventListener;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.AUTHighlightComponentResponseMessage;
import org.eclipse.jubula.communication.message.Message;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -29,8 +29,8 @@ import org.eclipse.jubula.communication.message.Message;
*/
public class AUTHighlightComponentCommand implements ICommand {
/** the logger */
- private static Log log =
- LogFactory.getLog(AUTHighlightComponentCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(AUTHighlightComponentCommand.class);
/** the message */
private AUTHighlightComponentResponseMessage m_message;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTModeChangedCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTModeChangedCommand.java
index 3ec7bea61..297817901 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTModeChangedCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTModeChangedCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.AUTServerEvent;
import org.eclipse.jubula.client.core.ClientTestFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
@@ -33,7 +33,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*/
public class AUTModeChangedCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(AUTModeChangedCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(AUTModeChangedCommand.class);
/**
* aut mode
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTServerStateCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTServerStateCommand.java
index 3d2d1ada3..b8be2f230 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTServerStateCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTServerStateCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.AUTEvent;
import org.eclipse.jubula.client.core.ClientTestFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
@@ -34,7 +34,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*/
public class AUTServerStateCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(AUTServerStateCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(AUTServerStateCommand.class);
/** the message */
private AUTServerStateMessage m_message;
@@ -102,7 +103,7 @@ public class AUTServerStateCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- log.fatal(this.getClass().getName() + "timeout() called"); //$NON-NLS-1$
+ log.error(this.getClass().getName() + "timeout() called"); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStartedCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStartedCommand.java
index b9edddf03..057018b1e 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStartedCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStartedCommand.java
@@ -13,8 +13,8 @@ package org.eclipse.jubula.client.core.commands;
import java.util.Iterator;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.AUTEvent;
import org.eclipse.jubula.client.core.ClientTestFactory;
import org.eclipse.jubula.client.core.IAUTInfoListener;
@@ -47,7 +47,8 @@ import org.eclipse.jubula.tools.xml.businessmodell.ConcreteComponent;
public class AUTStartedCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(AUTStartedCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(AUTStartedCommand.class);
/** the listener to notfy */
private IAUTInfoListener m_listener;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java
index edb08cd6d..bb60e8c25 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java
@@ -12,8 +12,8 @@ package org.eclipse.jubula.client.core.commands;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.IAUTInfoListener;
import org.eclipse.jubula.client.core.MessageFactory;
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
@@ -44,7 +44,7 @@ import org.eclipse.jubula.tools.xml.businessprocess.ProfileBuilder;
*/
public class AUTStateCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(AUTStateCommand.class);
+ private static Logger log = LoggerFactory.getLogger(AUTStateCommand.class);
// HERE after exhibition: remove TIMEOUT, it's not used any more
// 500000 is useful for RCP AUTs
@@ -71,7 +71,7 @@ public class AUTStateCommand implements ICommand {
log.error(Messages.CouldNotRequestComsFromAUT);
break;
default:
- log.fatal(Messages.UnknownErrorGettingAllCompsAUT
+ log.error(Messages.UnknownErrorGettingAllCompsAUT
+ StringConstants.COLON + String.valueOf(reason));
}
@@ -128,10 +128,10 @@ public class AUTStateCommand implements ICommand {
try {
AUTConnection.getInstance().send(i18nMessage);
} catch (CommunicationException ce) {
- log.fatal(Messages.CommunicationErrorSetResourceBundle, ce);
+ log.error(Messages.CommunicationErrorSetResourceBundle, ce);
}
} catch (CommunicationException bce) {
- log.fatal(Messages.CommunicationErrorGetResourceBundle, bce);
+ log.error(Messages.CommunicationErrorGetResourceBundle, bce);
}
return null;
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java
index a4ceebc66..e3f701da2 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.agent.AutAgentRegistration;
import org.eclipse.jubula.client.core.agent.AutRegistrationEvent;
import org.eclipse.jubula.client.core.agent.AutRegistrationEvent.RegistrationStatus;
@@ -30,7 +30,8 @@ import org.eclipse.jubula.communication.message.Message;
public class AutRegisteredCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(AutRegisteredCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(AutRegisteredCommand.class);
/** the message */
private AutRegisteredMessage m_message;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java
index 594ba6340..0b7e2209e 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java
@@ -19,8 +19,8 @@ import java.util.Set;
import org.apache.commons.collections.list.UnmodifiableList;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.IRecordListener;
import org.eclipse.jubula.client.core.MessageFactory;
import org.eclipse.jubula.client.core.businessprocess.CompletenessGuard;
@@ -78,7 +78,8 @@ public class CAPRecordedCommand implements ICommand {
/**
* The logger
*/
- private static final Log LOG = LogFactory.getLog(CAPRecordedCommand.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(CAPRecordedCommand.class);
/** The TestCase to record in */
private static ISpecTestCasePO recSpecTestCase;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPTestResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPTestResponseCommand.java
index c283f76c8..81f875fd1 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPTestResponseCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPTestResponseCommand.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
@@ -19,6 +17,8 @@ import org.eclipse.jubula.communication.message.CAPTestResponseMessage;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.MessageCap;
import org.eclipse.jubula.tools.constants.StringConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@@ -33,12 +33,11 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*
*/
public class CAPTestResponseCommand implements ICommand {
-
/**
* The logger
*/
- private static final Log LOG =
- LogFactory.getLog(CAPTestResponseCommand.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(CAPTestResponseCommand.class);
/**
* The message
*/
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisconnectFromAutAgentResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisconnectFromAutAgentResponseCommand.java
index 496c0fd8f..16fa2f17b 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisconnectFromAutAgentResponseCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisconnectFromAutAgentResponseCommand.java
@@ -10,15 +10,16 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.communication.ConnectionException;
import org.eclipse.jubula.client.core.communication.ServerConnection;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.DisconnectFromAutAgentResponseMessage;
import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -28,8 +29,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*/
public class DisconnectFromAutAgentResponseCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory
- .getLog(DisconnectFromAutAgentResponseCommand.class);
+ private static Logger log = LoggerFactory
+ .getLogger(DisconnectFromAutAgentResponseCommand.class);
/**
* <code>m_message</code>
@@ -52,7 +53,7 @@ public class DisconnectFromAutAgentResponseCommand implements ICommand {
ServerConnection.getInstance().close();
} catch (ConnectionException e) {
if (log.isInfoEnabled()) {
- log.info(e);
+ log.info(DebugConstants.ERROR, e);
}
}
return null;
@@ -79,5 +80,4 @@ public class DisconnectFromAutAgentResponseCommand implements ICommand {
log.error(this.getClass().getName() + StringConstants.DOT
+ Messages.TimeoutCalled);
}
-
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/EndTestExecutionResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/EndTestExecutionResponseCommand.java
index 7b80a6324..93bcb9848 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/EndTestExecutionResponseCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/EndTestExecutionResponseCommand.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.ClientTestFactory;
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.businessprocess.TestExecutionEvent;
@@ -20,6 +18,8 @@ import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.EndTestExecutionResponseMessage;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.tools.constants.StringConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -29,8 +29,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*/
public class EndTestExecutionResponseCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory
- .getLog(EndTestExecutionResponseCommand.class);
+ private static Logger log = LoggerFactory
+ .getLogger(EndTestExecutionResponseCommand.class);
/**
* <code>m_message</code>
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringDataResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringDataResponseCommand.java
index 56ad62427..8a0715cb1 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringDataResponseCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringDataResponseCommand.java
@@ -12,8 +12,6 @@ package org.eclipse.jubula.client.core.commands;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.businessprocess.TestResultBP;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.TestResult;
@@ -23,6 +21,8 @@ import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.tools.constants.MonitoringConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.objects.MonitoringValue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -31,8 +31,8 @@ import org.eclipse.jubula.tools.objects.MonitoringValue;
*/
public class GetMonitoringDataResponseCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory
- .getLog(GetMonitoringDataResponseCommand.class);
+ private static Logger log = LoggerFactory
+ .getLogger(GetMonitoringDataResponseCommand.class);
/** the message */
private GetMonitoringDataResponseMessage m_message;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringReportCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringReportCommand.java
index 49aa98abe..ffa4b968e 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringReportCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringReportCommand.java
@@ -12,8 +12,6 @@ package org.eclipse.jubula.client.core.commands;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.businessprocess.TestResultBP;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.TestResult;
@@ -23,6 +21,8 @@ import org.eclipse.jubula.communication.message.SendMonitoringReportMessage;
import org.eclipse.jubula.tools.constants.MonitoringConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.objects.MonitoringValue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -30,10 +30,9 @@ import org.eclipse.jubula.tools.objects.MonitoringValue;
* @created 13.08.2010
*/
public class GetMonitoringReportCommand implements ICommand {
-
/** The Logger */
- private static final Log LOG = LogFactory
- .getLog(GetMonitoringReportCommand.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(GetMonitoringReportCommand.class);
/** The message from the agent, containing the report */
private SendMonitoringReportMessage m_message;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ObjectMappedCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ObjectMappedCommand.java
index e46d6944e..cc95b558f 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ObjectMappedCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ObjectMappedCommand.java
@@ -13,8 +13,8 @@ package org.eclipse.jubula.client.core.commands;
import java.util.Iterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.businessprocess.ObjectMappingEventDispatcher;
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.i18n.Messages;
@@ -37,7 +37,8 @@ import org.eclipse.jubula.tools.objects.IComponentIdentifier;
public class ObjectMappedCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(ObjectMappedCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ObjectMappedCommand.class);
/** the message */
private ObjectMappedMessage m_message;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java
index b5a972ffd..811af2cae 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
@@ -26,7 +26,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
public class ProcessDirCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(ProcessDirCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ProcessDirCommand.class);
/** the message */
private SendDirectoryResponseMessage m_message;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ServerLogResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ServerLogResponseCommand.java
index 668f4806e..a06963e61 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ServerLogResponseCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ServerLogResponseCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.IServerLogListener;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
@@ -28,7 +28,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
public class ServerLogResponseCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(ServerLogResponseCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ServerLogResponseCommand.class);
/** the message */
private ServerLogResponseMessage m_message;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java
index d695aadf7..240afb2b5 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.AUTServerEvent;
import org.eclipse.jubula.client.core.ClientTestFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
@@ -28,8 +28,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*/
public class StartAUTServerStateCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory
- .getLog(StartAUTServerStateCommand.class);
+ private static Logger log = LoggerFactory
+ .getLogger(StartAUTServerStateCommand.class);
/** the message */
private StartAUTServerStateMessage m_message;
@@ -59,7 +59,7 @@ public class StartAUTServerStateCommand implements ICommand {
break;
case StartAUTServerStateMessage.IO:
// HERE notify error listener -> closing system
- log.fatal(Messages.NoJavaFound + StringConstants.COLON
+ log.error(Messages.NoJavaFound + StringConstants.COLON
+ StringConstants.SPACE
+ m_message.getDescription());
ClientTestFactory.getClientTest().fireAUTServerStateChanged(
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StopAUTServerStateCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StopAUTServerStateCommand.java
index 0602105a0..9df9df58f 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StopAUTServerStateCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StopAUTServerStateCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
@@ -26,8 +26,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*/
public class StopAUTServerStateCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory
- .getLog(StopAUTServerStateCommand.class);
+ private static Logger log = LoggerFactory
+ .getLogger(StopAUTServerStateCommand.class);
/** the message */
private StopAUTServerStateMessage m_message;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/TakeScreenshotResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/TakeScreenshotResponseCommand.java
index be3675e39..915f4a3de 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/TakeScreenshotResponseCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/TakeScreenshotResponseCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.TestResultNode;
import org.eclipse.jubula.communication.ICommand;
@@ -27,8 +27,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*/
public class TakeScreenshotResponseCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory
- .getLog(TakeScreenshotResponseCommand.class);
+ private static Logger log = LoggerFactory
+ .getLogger(TakeScreenshotResponseCommand.class);
/** the message */
private TakeScreenshotResponseMessage m_message;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java
index dc85caa83..2068f8a06 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java
@@ -14,8 +14,6 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jubula.client.core.AUTEvent;
import org.eclipse.jubula.client.core.AUTServerEvent;
@@ -43,6 +41,8 @@ import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.registration.AutIdentifier;
import org.eclipse.jubula.tools.xml.businessmodell.Profile;
import org.eclipse.jubula.tools.xml.businessprocess.ProfileBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -57,7 +57,7 @@ import org.eclipse.jubula.tools.xml.businessprocess.ProfileBuilder;
*/
public class AUTConnection extends BaseConnection {
/** the logger */
- private static Log log = LogFactory.getLog(AUTConnection.class);
+ private static Logger log = LoggerFactory.getLogger(AUTConnection.class);
/** the singleton instance */
private static AUTConnection instance = null;
@@ -115,7 +115,7 @@ public class AUTConnection extends BaseConnection {
throws ConnectionException {
String message = Messages.InitialisationOfAUTConnectionFailed
+ StringConstants.COLON + StringConstants.SPACE;
- log.fatal(message, throwable);
+ log.error(message, throwable);
throw new ConnectionException(message + throwable.getMessage(),
MessageIDs.E_AUT_CONNECTION_INIT);
}
@@ -259,7 +259,7 @@ public class AUTConnection extends BaseConnection {
try {
send(i18nMessage);
} catch (CommunicationException ce) {
- log.fatal(Messages.CommunicationErrorWhileSettingResourceBundle,
+ log.error(Messages.CommunicationErrorWhileSettingResourceBundle,
ce);
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/BaseConnection.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/BaseConnection.java
index 092e40b56..36a0bbcb5 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/BaseConnection.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/BaseConnection.java
@@ -12,8 +12,8 @@ package org.eclipse.jubula.client.core.communication;
import java.net.InetAddress;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.Communicator;
import org.eclipse.jubula.communication.ICommand;
@@ -34,7 +34,7 @@ import org.eclipse.jubula.tools.messagehandling.MessageIDs;
*/
public abstract class BaseConnection {
/** the logger */
- private static Log log = LogFactory.getLog(BaseConnection.class);
+ private static Logger log = LoggerFactory.getLogger(BaseConnection.class);
/** the communicator to use */
private Communicator m_communicator;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/ServerConnection.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/ServerConnection.java
index d044df810..a52203d4d 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/ServerConnection.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/ServerConnection.java
@@ -13,8 +13,8 @@ package org.eclipse.jubula.client.core.communication;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.AutStarterEvent;
import org.eclipse.jubula.client.core.ClientTestFactory;
import org.eclipse.jubula.client.core.ServerEvent;
@@ -22,6 +22,7 @@ import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.Communicator;
import org.eclipse.jubula.communication.listener.ICommunicationErrorListener;
import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
@@ -37,7 +38,7 @@ import org.eclipse.jubula.tools.messagehandling.MessageIDs;
public class ServerConnection extends BaseConnection {
/** the logger */
- private static Log log = LogFactory.getLog(ServerConnection.class);
+ private static Logger log = LoggerFactory.getLogger(ServerConnection.class);
/** the singleton instance */
private static ServerConnection instance = null;
@@ -82,7 +83,7 @@ public class ServerConnection extends BaseConnection {
new Integer(port).intValue());
} catch (UnknownHostException uhe) {
// log on info level, the configuration may be bad typed
- log.info(uhe);
+ log.info(DebugConstants.ERROR, uhe);
throw new ConnectionException(uhe.getMessage(),
MessageIDs.E_UNKNOWN_HOST);
}
@@ -149,7 +150,7 @@ public class ServerConnection extends BaseConnection {
} catch (ConnectionException ce) {
// the connection to the AUTServer is not established
// -> just log this
- log.debug(ce);
+ log.debug(DebugConstants.ERROR, ce);
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/DataEventDispatcher.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/DataEventDispatcher.java
index 9c9d6d39a..ae741b92e 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/DataEventDispatcher.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/DataEventDispatcher.java
@@ -17,8 +17,8 @@ import java.util.Set;
import javax.persistence.EntityNotFoundException;
import org.apache.commons.lang.exception.NestableRuntimeException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -120,7 +120,8 @@ public class DataEventDispatcher implements IReloadedSessionListener,
}
/** standard logging */
- private static final Log LOG = LogFactory.getLog(DataEventDispatcher.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(DataEventDispatcher.class);
/**
* clients interested in partial changes to the data in the master session
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CategoryPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CategoryPO.java
index 332903992..0faac6d34 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CategoryPO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CategoryPO.java
@@ -14,8 +14,8 @@ import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Transient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.persistence.GeneralStorage;
import org.eclipse.jubula.client.core.persistence.ProjectPM;
@@ -34,7 +34,7 @@ import org.eclipse.jubula.tools.exception.JBException;
class CategoryPO extends NodePO implements ICategoryPO {
/** The logger */
- private static final Log LOG = LogFactory.getLog(CategoryPO.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CategoryPO.class);
/**
* @param name name
@@ -71,7 +71,7 @@ class CategoryPO extends NodePO implements ICategoryPO {
parent = ProjectPM.loadProjectById(getParentProjectId(),
GeneralStorage.getInstance().getMasterSession());
} catch (JBException e) {
- LOG.fatal(Messages.CouldNotFindParentForCategory
+ LOG.error(Messages.CouldNotFindParentForCategory
+ StringConstants.COLON + StringConstants.SPACE + this
+ StringConstants.SEMICOLON + StringConstants.SPACE
+ Messages.ReturningNull + StringConstants.DOT
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java
index dd5cf76af..dc9c03ecb 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java
@@ -22,8 +22,8 @@ import javax.persistence.Transient;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.businessprocess.IWritableComponentNameCache;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.tools.constants.StringConstants;
@@ -45,7 +45,8 @@ import org.eclipse.jubula.tools.xml.businessmodell.Component;
class CompNamesPairPO implements ICompNamesPairPO {
/** The logger */
- private static transient Log log = LogFactory.getLog(CompNamesPairPO.class);
+ private static transient Logger log =
+ LoggerFactory.getLogger(CompNamesPairPO.class);
/** The first name. */
private String m_firstName;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ProjectPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ProjectPO.java
index cc2b7207f..3321a5964 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ProjectPO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ProjectPO.java
@@ -31,8 +31,8 @@ import javax.persistence.Transient;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.businessprocess.ProjectNameBP;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.persistence.PersistenceUtil;
@@ -47,7 +47,7 @@ import org.eclipse.jubula.client.core.persistence.PersistenceUtil;
class ProjectPO extends ParamNodePO implements IProjectPO {
/** standard logging */
- private static Log log = LogFactory.getLog(ProjectPO.class);
+ private static Logger log = LoggerFactory.getLogger(ProjectPO.class);
/** the properties for this project */
private ProjectPropertiesPO m_projectProperties = null;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReentryProperty.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReentryProperty.java
index bd283aed5..cf46022b4 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReentryProperty.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReentryProperty.java
@@ -11,8 +11,8 @@
package org.eclipse.jubula.client.core.model;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.tools.constants.StringConstants;
@@ -85,7 +85,8 @@ public final class ReentryProperty {
{CONTINUE, EXIT, STOP};
/** The logger */
- private static final Log LOG = LogFactory.getLog(TestExecution.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(TestExecution.class);
/**
* <code>m_value</code> reentry property
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeTracker.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeTracker.java
index f7cdcddae..f1fd3662b 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeTracker.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeTracker.java
@@ -13,8 +13,8 @@ package org.eclipse.jubula.client.core.model;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.businessprocess.ExternalTestDataBP;
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.i18n.Messages;
@@ -40,7 +40,8 @@ import org.eclipse.jubula.tools.messagehandling.MessageIDs;
public class ResultTreeTracker implements IExecStackModificationListener {
/** the logger */
- private static Log log = LogFactory.getLog(ResultTreeTracker.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ResultTreeTracker.class);
/**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/SpecTestCasePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/SpecTestCasePO.java
index 085dc4b02..3eaf796b0 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/SpecTestCasePO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/SpecTestCasePO.java
@@ -18,8 +18,8 @@ import javax.persistence.Entity;
import javax.persistence.Transient;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.businessprocess.IParamNameMapper;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.persistence.GeneralStorage;
@@ -47,7 +47,8 @@ import org.eclipse.jubula.tools.exception.JBException;
class SpecTestCasePO extends TestCasePO implements ISpecTestCasePO {
/** The logger */
- private static final Log LOG = LogFactory.getLog(SpecTestCasePO.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(SpecTestCasePO.class);
/**
* <code>m_isInterfaceLocked</code> flag for lock of parameter(s)modification
@@ -202,7 +203,7 @@ class SpecTestCasePO extends TestCasePO implements ISpecTestCasePO {
msg.append(StringConstants.SPACE);
msg.append(Messages.ReturningNull);
msg.append(StringConstants.DOT);
- LOG.fatal(msg.toString(), e);
+ LOG.error(msg.toString(), e);
}
}
return parent;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/CompNamePM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/CompNamePM.java
index 2ecd98529..9cd239fcd 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/CompNamePM.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/CompNamePM.java
@@ -27,8 +27,8 @@ import javax.persistence.PersistenceException;
import javax.persistence.Query;
import javax.persistence.criteria.CriteriaQuery;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.businessprocess.CompNamesBP;
import org.eclipse.jubula.client.core.businessprocess.ComponentNamesBP;
import org.eclipse.jubula.client.core.businessprocess.IComponentNameMapper;
@@ -233,7 +233,7 @@ public class CompNamePM extends AbstractNamePM {
/**
* <code>log</code>logger
*/
- private static Log log = LogFactory.getLog(ParamNamePM.class);
+ private static Logger log = LoggerFactory.getLogger(ParamNamePM.class);
/** The ILockedObjectPO for locks on ComponentNames tabe in database */
private static LockedObjectPO lockObj = null;
@@ -274,7 +274,7 @@ public class CompNamePM extends AbstractNamePM {
compNames.addAll(q.getResultList());
} catch (PersistenceException e) {
OperationCanceledUtil.checkForOperationCanceled(e);
- log.fatal(Messages.CouldNotReadComponentNamesFromDBOfProjectWithID
+ log.error(Messages.CouldNotReadComponentNamesFromDBOfProjectWithID
+ StringConstants.SPACE + StringConstants.APOSTROPHE
+ String.valueOf(parentProjectId) + StringConstants.APOSTROPHE,
e);
@@ -303,7 +303,7 @@ public class CompNamePM extends AbstractNamePM {
compNames.addAll(q.getResultList());
} catch (PersistenceException e) {
OperationCanceledUtil.checkForOperationCanceled(e);
- log.fatal(Messages.CouldNotReadComponentNamesFromDBOfProjectWithID
+ log.error(Messages.CouldNotReadComponentNamesFromDBOfProjectWithID
+ StringConstants.SPACE + StringConstants.APOSTROPHE
+ String.valueOf(parentProjectId) + StringConstants.APOSTROPHE,
e);
@@ -396,7 +396,7 @@ public class CompNamePM extends AbstractNamePM {
q.executeUpdate();
} catch (PersistenceException e) {
OperationCanceledUtil.checkForOperationCanceled(e);
- log.fatal(Messages.CouldNotReadComponentNamesFromDBOfProjectWithID
+ log.error(Messages.CouldNotReadComponentNamesFromDBOfProjectWithID
+ StringConstants.SPACE + StringConstants.APOSTROPHE
+ String.valueOf(rootProjId) + StringConstants.APOSTROPHE, e);
PersistenceManager.handleDBExceptionForAnySession(null, e, s);
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java
index dff146fa8..4db18a9fd 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java
@@ -22,8 +22,8 @@ import javax.persistence.EntityTransaction;
import javax.persistence.PersistenceException;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jubula.client.core.businessprocess.CompNameMapperFactory;
import org.eclipse.jubula.client.core.businessprocess.ComponentNamesDecorator;
@@ -55,7 +55,7 @@ import org.eclipse.persistence.jpa.JpaEntityManager;
*/
public class EditSupport {
/** standard logging */
- private static Log log = LogFactory.getLog(EditSupport.class);
+ private static Logger log = LoggerFactory.getLogger(EditSupport.class);
/** Persistence (JPA / EclipseLink) session for editing */
private EntityManager m_session;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/GeneralStorage.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/GeneralStorage.java
index 3c83e3714..54446a98d 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/GeneralStorage.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/GeneralStorage.java
@@ -16,8 +16,8 @@ import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.LockModeType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jubula.client.core.businessprocess.ParamNameBP;
import org.eclipse.jubula.client.core.businessprocess.ProjectNameBP;
@@ -40,7 +40,8 @@ import javax.persistence.PersistenceException;
public class GeneralStorage implements IEntityManagerProvider {
/** standard logging */
- private static final Log LOG = LogFactory.getLog(GeneralStorage.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(GeneralStorage.class);
/**
* Comment for <code>instance</code>
@@ -176,7 +177,7 @@ public class GeneralStorage implements IEntityManagerProvider {
*/
public static void handleFatalError(Throwable t) {
final String msg = Messages.NonRecoverableError + StringConstants.DOT;
- LOG.fatal(msg, t);
+ LOG.error(msg, t);
throw new JBFatalAbortException(msg, t, MessageIDs.E_NON_RECOVERABLE);
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/NodePM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/NodePM.java
index 7d7452f88..0960a3366 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/NodePM.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/NodePM.java
@@ -27,8 +27,8 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.ICategoryPO;
@@ -295,7 +295,7 @@ public class NodePM extends PersistenceManager {
private static NodePM nodePersManager = null;
/** the logger */
- private static Log log = LogFactory.getLog(NodePM.class);
+ private static Logger log = LoggerFactory.getLogger(NodePM.class);
/** cache for project IDs */
private Map<String, Long> m_projectIDCache = null;
@@ -370,7 +370,7 @@ public class NodePM extends PersistenceManager {
return new CmdHandleChildIntoNodeList();
}
final String msg = Messages.UnsupportedINodePOSubclass;
- log.fatal(msg);
+ log.error(msg);
throw new JBFatalException(msg, MessageIDs.E_UNSUPPORTED_NODE);
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ParamNamePM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ParamNamePM.java
index 4b91e017e..5c76c1392 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ParamNamePM.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ParamNamePM.java
@@ -18,8 +18,8 @@ import javax.persistence.EntityTransaction;
import javax.persistence.NoResultException;
import javax.persistence.Query;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.businessprocess.progress.OperationCanceledUtil;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IParamNamePO;
@@ -39,7 +39,7 @@ public class ParamNamePM extends AbstractNamePM {
/**
* <code>log</code>logger
*/
- private static Log log = LogFactory.getLog(ParamNamePM.class);
+ private static Logger log = LoggerFactory.getLogger(ParamNamePM.class);
@@ -103,7 +103,7 @@ public class ParamNamePM extends AbstractNamePM {
paramNames = q.getResultList();
} catch (PersistenceException e) {
OperationCanceledUtil.checkForOperationCanceled(e);
- log.fatal(Messages.CouldNotReadParameterNamesFromDB, e);
+ log.error(Messages.CouldNotReadParameterNamesFromDB, e);
PersistenceManager.handleDBExceptionForAnySession(null, e, s);
} finally {
Persistor.instance().dropSessionWithoutLockRelease(s);
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceManager.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceManager.java
index 0f4c8f1f6..a6c882c5a 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceManager.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceManager.java
@@ -20,8 +20,8 @@ import javax.persistence.PersistenceException;
import javax.persistence.PessimisticLockException;
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.jubula.client.core.businessprocess.progress.OperationCanceledUtil;
@@ -39,7 +39,8 @@ import org.eclipse.jubula.tools.messagehandling.MessageIDs;
public abstract class PersistenceManager {
/** the logger */
- private static Log log = LogFactory.getLog(PersistenceManager.class);
+ private static Logger log =
+ LoggerFactory.getLogger(PersistenceManager.class);
/**
*
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java
index f532d20e9..df05b9c37 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java
@@ -31,8 +31,8 @@ import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -55,6 +55,7 @@ import org.eclipse.jubula.client.core.progress.JobChangeListener;
import org.eclipse.jubula.client.core.utils.DatabaseStateDispatcher;
import org.eclipse.jubula.client.core.utils.DatabaseStateEvent;
import org.eclipse.jubula.client.core.utils.DatabaseStateEvent.DatabaseState;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.exception.JBFatalAbortException;
@@ -105,7 +106,7 @@ public class Persistor {
}
/** standard logging */
- private static Log log = LogFactory.getLog(Persistor.class);
+ private static Logger log = LoggerFactory.getLogger(Persistor.class);
/** singleton */
private static Persistor instance = null;
@@ -155,7 +156,7 @@ public class Persistor {
buildSessionFactoryWithLoginData(userName, pwd, url, monitor);
} catch (PersistenceException e) {
String msg = Messages.CantSetupPersistence;
- log.fatal(msg, e);
+ log.error(msg, e);
throw new JBFatalException(msg,
MessageIDs.E_PERSISTENCE_CANT_SETUP);
} catch (DatabaseVersionConflictException dbvce) {
@@ -240,7 +241,7 @@ public class Persistor {
try {
connectToDBJob.join();
} catch (InterruptedException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
connectionGained.set(false);
}
@@ -392,7 +393,7 @@ public class Persistor {
if (se.getErrorCode() == 17002) {
final String msg = Messages.ProblemWithDatabaseSchemeConf
+ StringConstants.DOT;
- log.fatal(msg);
+ log.error(msg);
throw new PMDatabaseConfException(msg,
MessageIDs.E_ERROR_IN_SCHEMA_CONFIG);
}
@@ -404,7 +405,7 @@ public class Persistor {
} catch (PersistenceException pe) {
final String msg = Messages.ProblemWithInstallingDBScheme
+ StringConstants.DOT;
- log.fatal(msg);
+ log.error(msg);
throw new PMDatabaseConfException(msg,
MessageIDs.E_NO_DB_SCHEME);
} catch (DatabaseException dbe) {
@@ -418,7 +419,7 @@ public class Persistor {
// for a brief discussion on the topic.
final String msg = Messages.ProblemWithInstallingDBScheme
+ StringConstants.DOT;
- log.fatal(msg);
+ log.error(msg);
throw new PMDatabaseConfException(msg,
MessageIDs.E_NO_DB_SCHEME);
}
@@ -438,7 +439,7 @@ public class Persistor {
throw new DatabaseVersionConflictException(dbMaj, dbMin);
}
} else {
- log.fatal(Messages.DBVersion + StringConstants.COLON
+ log.error(Messages.DBVersion + StringConstants.COLON
+ StringConstants.SPACE + Messages.MajorVersionInvalid);
throw new DatabaseVersionConflictException(dbMaj, dbMin);
}
@@ -491,7 +492,7 @@ public class Persistor {
}
final String msg = Messages.ProblemInstallingDBScheme
+ StringConstants.DOT;
- log.fatal(msg);
+ log.error(msg);
throw new PMDatabaseConfException(msg, MessageIDs.E_NO_DB_SCHEME);
} finally {
if (em != null) {
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java
index 8cafadc93..7f28517e3 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java
@@ -26,8 +26,8 @@ import javax.persistence.PersistenceException;
import javax.persistence.Query;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.jubula.client.core.businessprocess.ComponentNamesBP;
@@ -77,7 +77,7 @@ public class ProjectPM extends PersistenceManager {
private static final int NUM_HBM_ADD_PROGRESS_EVENT_TYPES = 4;
/** standard logging */
- private static Log log = LogFactory.getLog(ProjectPM.class);
+ private static Logger log = LoggerFactory.getLogger(ProjectPM.class);
/**
* constructor must be hidden for class utilities (per CheckStyle)
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestDataCubePM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestDataCubePM.java
index 73d40ec67..5b64a4901 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestDataCubePM.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestDataCubePM.java
@@ -19,8 +19,8 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.model.IParamNodePO;
import org.eclipse.jubula.client.core.model.IParameterInterfacePO;
import org.eclipse.jubula.client.core.model.IProjectPO;
@@ -36,7 +36,7 @@ import org.eclipse.jubula.client.core.model.PoMaker;
*/
public class TestDataCubePM {
/** standard logging */
- private static Log log = LogFactory.getLog(TestDataCubePM.class);
+ private static Logger log = LoggerFactory.getLogger(TestDataCubePM.class);
/** hide */
private TestDataCubePM() {
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/LockManager.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/LockManager.java
index 002e53be3..19a6823c0 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/LockManager.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/LockManager.java
@@ -22,8 +22,8 @@ import javax.persistence.PersistenceException;
import javax.persistence.Query;
import javax.persistence.TemporalType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IPersistentObject;
import org.eclipse.jubula.client.core.persistence.PersistenceUtil;
@@ -67,7 +67,7 @@ public final class LockManager {
private static final int TIMEOUT_APPLICATION = 3 * UPDATE_TIMESTAMP_SECS;
/** standard logging */
- private static Log log = LogFactory.getLog(LockManager.class);
+ private static Logger log = LoggerFactory.getLogger(LockManager.class);
/** singleton instance */
private static LockManager instance = null;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/BundleUtils.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/BundleUtils.java
index c93425079..53c2505da 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/BundleUtils.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/BundleUtils.java
@@ -16,10 +16,11 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.jubula.client.core.i18n.Messages;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.JBFatalException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
@@ -33,7 +34,8 @@ import org.osgi.framework.Bundle;
*/
public class BundleUtils {
/** standard logging */
- private static final Log LOG = LogFactory.getLog(BundleUtils.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(BundleUtils.class);
/**
* Constructor
@@ -59,9 +61,9 @@ public class BundleUtils {
+ StringConstants.SPACE + resouceName + StringConstants.SPACE
+ Messages.NotFound + StringConstants.DOT);
} catch (MalformedURLException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
} catch (IOException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
}
return null;
}
@@ -82,7 +84,7 @@ public class BundleUtils {
} catch (IOException e) {
String msg = Messages.CantLoad + StringConstants.COLON
+ StringConstants.SPACE + propertyFileName;
- LOG.fatal(msg, e);
+ LOG.error(msg, e);
throw new JBFatalException(msg,
MessageIDs.E_PROPERTIES_FILE_NOT_FOUND);
} finally {
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ListenerManager.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ListenerManager.java
index 600bca219..efe3d5bef 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ListenerManager.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ListenerManager.java
@@ -14,8 +14,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.tools.exception.UnexpectedGenericTypeException;
@@ -29,7 +29,8 @@ import org.eclipse.jubula.tools.exception.UnexpectedGenericTypeException;
public class ListenerManager <TYPE extends IGenericListener> {
/** standard logging */
- private static final Log LOG = LogFactory.getLog(ListenerManager.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(ListenerManager.class);
/**
* <code>m_listeners</code> listener for occured events
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java
index 7f4901dad..19e26977c 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java
@@ -25,8 +25,8 @@ import org.apache.commons.collections.list.UnmodifiableList;
import org.apache.commons.lang.Validate;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.businessprocess.ExternalTestDataBP;
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.businessprocess.TestExecution.PauseMode;
@@ -140,7 +140,7 @@ public class Traverser {
public static final int NO_INDEX = -1;
/** The logger */
- private static final Log LOG = LogFactory.getLog(Traverser.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Traverser.class);
/**
* <code>m_root</code> root node
diff --git a/org.eclipse.jubula.client.inspector.ui/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.inspector.ui/META-INF/MANIFEST.MF
index a97c921ab..0694ff1d1 100644
--- a/org.eclipse.jubula.client.inspector.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.inspector.ui/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-RegisterBuddy: org.eclipse.jubula.client.core
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.6.1,4.0.0)",
- org.apache.commons.logging;bundle-version="[1.0.0,2.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.communication;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)",
diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/ActivateInspectorResponseCommand.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/ActivateInspectorResponseCommand.java
index 4aa184445..a71c2a30f 100644
--- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/ActivateInspectorResponseCommand.java
+++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/ActivateInspectorResponseCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.inspector.ui.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.inspector.ui.i18n.Messages;
import org.eclipse.jubula.client.inspector.ui.provider.sourceprovider.InspectorStateProvider;
import org.eclipse.jubula.communication.ICommand;
@@ -31,8 +31,8 @@ import org.eclipse.ui.services.ISourceProviderService;
public class ActivateInspectorResponseCommand implements ICommand {
/** the logger */
- private static Log log =
- LogFactory.getLog(ActivateInspectorResponseCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ActivateInspectorResponseCommand.class);
/** the message */
private ActivateInspectorResponseMessage m_message;
diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java
index 40b3e5a43..070d7e27c 100644
--- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java
+++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.inspector.ui.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.core.communication.AUTConnection;
import org.eclipse.jubula.client.core.communication.ConnectionException;
import org.eclipse.jubula.client.inspector.ui.i18n.Messages;
@@ -34,8 +34,8 @@ import org.eclipse.ui.services.ISourceProviderService;
public class InspectorComponentSelectedCommand implements ICommand {
/** the logger */
- private static Log log =
- LogFactory.getLog(InspectorComponentSelectedCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(InspectorComponentSelectedCommand.class);
/** the message */
private InspectorComponentSelectedMessage m_message;
diff --git a/org.eclipse.jubula.client.ui/.classpath b/org.eclipse.jubula.client.ui/.classpath
index 8f56e4685..e328b4c78 100644
--- a/org.eclipse.jubula.client.ui/.classpath
+++ b/org.eclipse.jubula.client.ui/.classpath
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="icons"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF
index 72316e82c..646bd71bf 100644
--- a/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF
@@ -41,26 +41,38 @@ Export-Package: org.eclipse.jubula.client.ui,
org.eclipse.jubula.client.ui.widgets,
org.eclipse.jubula.client.ui.wizards,
org.eclipse.jubula.client.ui.wizards.pages
-Require-Bundle: org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.jubula.client.archive;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
- org.eclipse.ui.views;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.6.1,4.0.0)";visibility:=reexport,
- org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.6.1,4.0.0)",
+ org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)",
org.eclipse.help;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.console;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ui.console;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.cheatsheets;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.6.1,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui.views;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.databinding;bundle-version="[1.3.1,2.0.0)",
org.eclipse.core.databinding.beans;bundle-version="[1.2.1,2.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.3.1,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.search;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+ org.eclipse.core.filesystem;bundle-version="[1.3.1,2.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.search;bundle-version="[3.6.0,4.0.0)",
+ org.apache.oro;bundle-version="[2.0.8,3.0.0)",
org.apache.commons.codec;bundle-version="[1.3.0,2.0.0)",
org.apache.commons.collections;bundle-version="[3.2.0,4.0.0)",
- org.apache.oro;bundle-version="[2.0.8,3.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
- org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)"
+ org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ ch.qos.logback.classic;bundle-version="0.9.19",
+ ch.qos.logback.core;bundle-version="0.9.19",
+ javax.persistence;bundle-version="[2.0.3,3.0.0)",
+ org.eclipse.persistence.core;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.persistence.jpa;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.jubula.communication;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.archive;bundle-version="[1.0.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-BundleShape: jar
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/Plugin.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/Plugin.java
index d9b0c2e23..f42af4772 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/Plugin.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/Plugin.java
@@ -21,8 +21,6 @@ import java.util.Set;
import javax.persistence.PersistenceException;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -114,6 +112,8 @@ import org.eclipse.ui.part.IContributedContentsView;
import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -133,7 +133,7 @@ public class Plugin extends AbstractUIPlugin implements IProgressConsole {
/** name of the Jubula console */
private static final String JB_CONSOLE_NAME = "Console"; //$NON-NLS-1$
/** for log messages */
- private static Log log = LogFactory.getLog(Plugin.class);
+ private static Logger log = LoggerFactory.getLogger(Plugin.class);
/** single instance of plugin */
private static Plugin plugin;
/** StatusLineText */
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ImportFileBP.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ImportFileBP.java
index 4c8a21a87..06305f7fd 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ImportFileBP.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ImportFileBP.java
@@ -16,8 +16,8 @@ import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
@@ -77,7 +77,7 @@ public class ImportFileBP implements IProjectNameConflictResolver,
}
/** the logger */
- private static Log log = LogFactory.getLog(ImportFileBP.class);
+ private static Logger log = LoggerFactory.getLogger(ImportFileBP.class);
/** single instance of ImExportCvsBP */
private static ImportFileBP instance = null;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ProblemsBP.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ProblemsBP.java
index bfada406a..b75caa853 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ProblemsBP.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ProblemsBP.java
@@ -19,8 +19,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
@@ -64,6 +64,7 @@ import org.eclipse.jubula.client.ui.constants.Constants;
import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.jubula.client.ui.utils.Utils;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.GDConfigXmlException;
import org.eclipse.jubula.tools.exception.JBException;
@@ -87,7 +88,7 @@ public class ProblemsBP implements IProjectLoadedListener, IDataChangedListener,
private static ProblemsBP instance;
/** the logger */
- private static Log log = LogFactory.getLog(ProblemsBP.class);
+ private static Logger log = LoggerFactory.getLogger(ProblemsBP.class);
/** all comp names-related problem types */
private final Set<Integer> m_compNameProblemTypes =
@@ -591,7 +592,7 @@ public class ProblemsBP implements IProjectLoadedListener, IDataChangedListener,
m_markerList.add(marker);
m_markerToShowList.add(marker);
} catch (CoreException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
}
}
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ShowClientLogBP.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ShowClientLogBP.java
index ba5050b3f..8e7dc9f59 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ShowClientLogBP.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ShowClientLogBP.java
@@ -22,15 +22,11 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.FileAppender;
-
-
-
/**
* @author BREDEX GmbH
* @created 09.04.2008
*/
public final class ShowClientLogBP extends AbstractActionBP {
-
/** single instance */
private static ShowClientLogBP instance = null;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionContributor.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionContributor.java
index 53925adba..0ad35c627 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionContributor.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionContributor.java
@@ -15,8 +15,8 @@ import java.net.UnknownHostException;
import java.util.List;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jubula.client.core.AUTEvent;
import org.eclipse.jubula.client.core.AUTServerEvent;
@@ -55,6 +55,7 @@ import org.eclipse.jubula.client.ui.utils.JobUtils;
import org.eclipse.jubula.client.ui.utils.Utils;
import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.TimingConstantsClient;
import org.eclipse.jubula.tools.exception.Assert;
@@ -79,8 +80,8 @@ public class TestExecutionContributor
private static TestExecutionContributor instance;
/** the logger */
- private static Log log = LogFactory
- .getLog(TestExecutionContributor.class);
+ private static Logger log = LoggerFactory
+ .getLogger(TestExecutionContributor.class);
/** ClientTest */
private IClientTest m_clientTest;
@@ -804,7 +805,7 @@ public class TestExecutionContributor
AUTConnection.getInstance().getCommunicator()
.interruptAllTimeouts();
} catch (ConnectionException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
}
setClientMinimized(false);
}
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionGUIController.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionGUIController.java
index bca2e300e..359309645 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionGUIController.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionGUIController.java
@@ -14,8 +14,8 @@ import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -64,7 +64,8 @@ import org.eclipse.osgi.util.NLS;
public class TestExecutionGUIController {
/** The logger */
- static final Log LOG = LogFactory.getLog(TestExecutionGUIController.class);
+ static final Logger LOG =
+ LoggerFactory.getLogger(TestExecutionGUIController.class);
/** the timeout for the info nagger dialog if RCP AUT startup takes too long */
private static final int NAGGER_TIMEOUT = 120 * 1000;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/CapGUIPropertySource.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/CapGUIPropertySource.java
index 54636fb0a..f4bbfa776 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/CapGUIPropertySource.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/CapGUIPropertySource.java
@@ -18,8 +18,6 @@ import java.util.Locale;
import java.util.Map;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jubula.client.core.businessprocess.CapBP;
import org.eclipse.jubula.client.core.businessprocess.ComponentNamesBP;
@@ -66,6 +64,8 @@ import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.PropertyDescriptor;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -125,8 +125,8 @@ public class CapGUIPropertySource extends AbstractGuiNodePropertySource {
Messages.CapGUIPropertySourceParameter;
/** for LOG messages */
- static final Log LOG =
- LogFactory.getLog(CapGUIPropertySource.class);
+ static final Logger LOG =
+ LoggerFactory.getLogger(CapGUIPropertySource.class);
/** List of component types (short names)*/
private static String[] componentTypes;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/AUTConfigPropertiesDialog.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/AUTConfigPropertiesDialog.java
index 6f66658d8..6fe8b73e4 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/AUTConfigPropertiesDialog.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/AUTConfigPropertiesDialog.java
@@ -14,8 +14,6 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.core.databinding.validation.IValidator;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -41,6 +39,8 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -49,9 +49,9 @@ import org.eclipse.swt.widgets.Shell;
*/
public class AUTConfigPropertiesDialog extends TitleAreaDialog
implements IDialogStatusListener {
-
/** The logger */
- private static Log log = LogFactory.getLog(AUTConfigPropertiesDialog.class);
+ private static Logger log = LoggerFactory.getLogger(
+ AUTConfigPropertiesDialog.class);
/** the name of the selected aut configuration */
private IAUTConfigPO m_autConfig;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/ProjectDialog.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/ProjectDialog.java
index 2681bb898..db553c9cd 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/ProjectDialog.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/ProjectDialog.java
@@ -18,8 +18,8 @@ import java.util.Map;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jubula.client.core.model.IProjectPO;
@@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.Shell;
*/
public class ProjectDialog extends TitleAreaDialog {
/** standard logging */
- private static Log log = LogFactory.getLog(TitleAreaDialog.class);
+ private static Logger log = LoggerFactory.getLogger(TitleAreaDialog.class);
/** number of columns = 1 */
private static final int NUM_COLUMNS_1 = 1;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractJBEditor.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractJBEditor.java
index 3ce11274d..7e8d9cff7 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractJBEditor.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractJBEditor.java
@@ -16,8 +16,6 @@ import java.util.List;
import javax.persistence.EntityManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
@@ -51,6 +49,7 @@ import org.eclipse.jubula.client.ui.utils.UIIdentitiyElementComparer;
import org.eclipse.jubula.client.ui.utils.Utils;
import org.eclipse.jubula.client.ui.views.IJBPart;
import org.eclipse.jubula.client.ui.views.ITreeViewerContainer;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
@@ -64,6 +63,8 @@ import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.part.EditorPart;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -93,8 +94,8 @@ public abstract class AbstractJBEditor extends EditorPart implements IJBEditor,
protected static final String INSERT = "_INSERT"; //$NON-NLS-1$
/** the logger */
- protected static final Log LOG = LogFactory
- .getLog(AbstractJBEditor.class);
+ protected static final Logger LOG = LoggerFactory
+ .getLogger(AbstractJBEditor.class);
/** List of ISelectionChangedListener */
private List<ISelectionChangedListener> m_selectionChangedListenerList =
@@ -512,7 +513,7 @@ public abstract class AbstractJBEditor extends EditorPart implements IJBEditor,
try {
ComponentNamesBP.getInstance().init();
} catch (PMException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
Utils.createMessageDialog(e, null, null);
}
}
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingMultiPageEditor.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingMultiPageEditor.java
index f5983c43a..24c354413 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingMultiPageEditor.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingMultiPageEditor.java
@@ -20,8 +20,8 @@ import java.util.Set;
import javax.persistence.EntityManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -185,8 +185,8 @@ public class ObjectMappingMultiPageEditor extends MultiPageEditorPart
public static final String CLEANUP_ID = PlatformUI.PLUGIN_ID + ".CleanupSubMenu"; //$NON-NLS-1$
/** the logger */
- private static final Log LOG =
- LogFactory.getLog(ObjectMappingMultiPageEditor.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(ObjectMappingMultiPageEditor.class);
/** separator for categories shown in the table view of this editor */
private static final String CAT_SEPARATOR = "/"; //$NON-NLS-1$
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/CreateNewProjectVersionHandler.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/CreateNewProjectVersionHandler.java
index 9103530a4..93787a88a 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/CreateNewProjectVersionHandler.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/CreateNewProjectVersionHandler.java
@@ -14,8 +14,6 @@ import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -60,6 +58,8 @@ import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.progress.IProgressService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -69,8 +69,8 @@ import org.eclipse.ui.progress.IProgressService;
@SuppressWarnings("synthetic-access")
public class CreateNewProjectVersionHandler extends AbstractHandler {
/** standard logging */
- private static Log log = LogFactory
- .getLog(CreateNewProjectVersionHandler.class);
+ private static Logger log = LoggerFactory
+ .getLogger(CreateNewProjectVersionHandler.class);
/**
* Operation for Create New Version action.
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/OMEDeleteUnusedComponentNamesHandler.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/OMEDeleteUnusedComponentNamesHandler.java
index c42d7266f..57d83f72e 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/OMEDeleteUnusedComponentNamesHandler.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/OMEDeleteUnusedComponentNamesHandler.java
@@ -16,8 +16,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
@@ -37,6 +37,7 @@ import org.eclipse.jubula.client.ui.handlers.delete.DeleteTreeItemHandlerOMEdito
import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.jubula.client.ui.provider.contentprovider.objectmapping.OMEditorTreeContentProvider;
import org.eclipse.jubula.client.ui.search.query.ShowResponsibleNodeForComponentName;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -47,8 +48,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
*/
public class OMEDeleteUnusedComponentNamesHandler extends AbstractHandler {
/** standard logging */
- static final Log LOG = LogFactory
- .getLog(OMEDeleteUnusedComponentNamesHandler.class);
+ static final Logger LOG = LoggerFactory
+ .getLogger(OMEDeleteUnusedComponentNamesHandler.class);
/**
* @author Markus Tiede
@@ -182,9 +183,9 @@ public class OMEDeleteUnusedComponentNamesHandler extends AbstractHandler {
}
});
} catch (InvocationTargetException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
} catch (InterruptedException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
}
return null;
}
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/ExportAllHandler.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/ExportAllHandler.java
index 3925c7b6f..20ba97bec 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/ExportAllHandler.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/ExportAllHandler.java
@@ -16,8 +16,8 @@ import java.util.List;
import javax.persistence.EntityManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -30,6 +30,7 @@ import org.eclipse.jubula.client.ui.Plugin;
import org.eclipse.jubula.client.ui.businessprocess.ExportAllBP;
import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.jubula.client.ui.utils.Utils;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -45,7 +46,7 @@ import org.eclipse.ui.PlatformUI;
public class ExportAllHandler extends AbstractProjectHandler {
/** the logger */
- private static Log log = LogFactory.getLog(ExportAllHandler.class);
+ private static Logger log = LoggerFactory.getLogger(ExportAllHandler.class);
/**
* @author BREDEX GmbH
@@ -162,7 +163,7 @@ public class ExportAllHandler extends AbstractProjectHandler {
.busyCursorWhile(op);
} catch (InvocationTargetException ite) {
// Exception occurred during operation
- log.error(ite.getCause());
+ log.error(DebugConstants.ERROR, ite.getCause());
} catch (InterruptedException ie) {
// Operation was canceled. This is already handled by the
// operation. Do nothing.
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/ExportProjectHandler.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/ExportProjectHandler.java
index 2da6707ff..e6caddac2 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/ExportProjectHandler.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/ExportProjectHandler.java
@@ -14,8 +14,8 @@ import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -28,6 +28,7 @@ import org.eclipse.jubula.client.ui.Plugin;
import org.eclipse.jubula.client.ui.controllers.PMExceptionHandler;
import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.jubula.client.ui.utils.Utils;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.exception.ProjectDeletedException;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -102,7 +103,8 @@ public class ExportProjectHandler extends AbstractProjectHandler {
}
/** the logger */
- private static Log log = LogFactory.getLog(ExportProjectHandler.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ExportProjectHandler.class);
/**
*
@@ -146,7 +148,7 @@ public class ExportProjectHandler extends AbstractProjectHandler {
PlatformUI.getWorkbench().getProgressService().busyCursorWhile(op);
} catch (InvocationTargetException ite) {
// Exception occurred during operation
- log.error(ite.getCause());
+ log.error(DebugConstants.ERROR, ite.getCause());
} catch (InterruptedException ie) {
// Operation canceled.
// Do nothing.
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SaveProjectAsHandler.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SaveProjectAsHandler.java
index 6b3baf35f..bf537473e 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SaveProjectAsHandler.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SaveProjectAsHandler.java
@@ -14,8 +14,8 @@ import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -48,6 +48,7 @@ import org.eclipse.jubula.client.ui.dialogs.InputDialog;
import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.jubula.client.ui.utils.DialogUtils;
import org.eclipse.jubula.client.ui.utils.Utils;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.Assert;
import org.eclipse.jubula.tools.exception.ConverterException;
@@ -66,7 +67,8 @@ import org.eclipse.ui.PlatformUI;
@SuppressWarnings("synthetic-access")
public class SaveProjectAsHandler extends AbstractProjectHandler {
/** standard logging */
- private static Log log = LogFactory.getLog(SaveProjectAsHandler.class);
+ private static Logger log =
+ LoggerFactory.getLogger(SaveProjectAsHandler.class);
/**
* Worker operation for SaveProjectAs action.
@@ -347,7 +349,7 @@ public class SaveProjectAsHandler extends AbstractProjectHandler {
fireReady();
} catch (InvocationTargetException ite) {
// Exception occurred during operation
- log.error(ite.getCause());
+ log.error(DebugConstants.ERROR, ite.getCause());
} catch (InterruptedException e) {
// Operation was canceled.
// We have to clear the GUI because all of
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SelectDatabaseHandler.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SelectDatabaseHandler.java
index 8cace84cd..d3e28fc71 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SelectDatabaseHandler.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SelectDatabaseHandler.java
@@ -14,8 +14,8 @@ import java.lang.reflect.InvocationTargetException;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -36,6 +36,7 @@ import org.eclipse.jubula.client.ui.dialogs.DBLoginDialog;
import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.jubula.client.ui.utils.DialogUtils;
import org.eclipse.jubula.client.ui.utils.Utils;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.eclipse.ui.PlatformUI;
@@ -46,7 +47,8 @@ import org.eclipse.ui.PlatformUI;
*/
public class SelectDatabaseHandler extends AbstractHandler {
/** the logger */
- private static Log log = LogFactory.getLog(SelectDatabaseHandler.class);
+ private static Logger log =
+ LoggerFactory.getLogger(SelectDatabaseHandler.class);
/**
* {@inheritDoc}
@@ -85,7 +87,7 @@ public class SelectDatabaseHandler extends AbstractHandler {
try {
returnStatus = connectToDatabase(userName, pwd, dbInfo);
} catch (InterruptedException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
}
}
@@ -144,7 +146,7 @@ public class SelectDatabaseHandler extends AbstractHandler {
});
} catch (InvocationTargetException ite) {
// Exception occurred during operation
- log.error(ite.getCause(), ite.getCause());
+ log.error(DebugConstants.ERROR, ite.getCause());
} catch (InterruptedException ie) {
throw ie;
}
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/perspective/ExecutionPerspective.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/perspective/ExecutionPerspective.java
index b8705afe5..998d8d816 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/perspective/ExecutionPerspective.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/perspective/ExecutionPerspective.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.ui.perspective;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.ui.constants.Constants;
import org.eclipse.ui.IFolderLayout;
import org.eclipse.ui.IPageLayout;
@@ -26,7 +26,8 @@ import org.eclipse.ui.IPerspectiveFactory;
public class ExecutionPerspective implements IPerspectiveFactory {
/** The logger */
- static final Log LOG = LogFactory.getLog(ExecutionPerspective.class);
+ static final Logger LOG =
+ LoggerFactory.getLogger(ExecutionPerspective.class);
/** Ration 0.27f */
private static final float RATIO_0_27 = 0.27f;
/** Ration 0.5f */
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/perspective/ReportPerspective.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/perspective/ReportPerspective.java
index d9606c6a1..0f355dcef 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/perspective/ReportPerspective.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/perspective/ReportPerspective.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.client.ui.perspective;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.ui.constants.Constants;
import org.eclipse.ui.IFolderLayout;
import org.eclipse.ui.IPageLayout;
@@ -26,7 +26,7 @@ import org.eclipse.ui.IPerspectiveFactory;
public class ReportPerspective implements IPerspectiveFactory {
/** The logger */
- static final Log LOG = LogFactory.getLog(ReportPerspective.class);
+ static final Logger LOG = LoggerFactory.getLogger(ReportPerspective.class);
/**
* constructor
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/properties/ProjectGeneralPropertyPage.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/properties/ProjectGeneralPropertyPage.java
index 0688109cd..4815e6d7f 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/properties/ProjectGeneralPropertyPage.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/properties/ProjectGeneralPropertyPage.java
@@ -16,8 +16,8 @@ import java.util.Set;
import javax.persistence.EntityNotFoundException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jubula.client.core.businessprocess.ComponentNamesBP;
import org.eclipse.jubula.client.core.businessprocess.ProjectNameBP;
@@ -95,8 +95,8 @@ public class ProjectGeneralPropertyPage extends AbstractProjectPropertyPage {
/**
* the logger
*/
- private static Log log =
- LogFactory.getLog(ProjectGeneralPropertyPage.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ProjectGeneralPropertyPage.class);
/** the m_text field for the project name */
private CheckedText m_projectNameTextField;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/propertytester/AbstractBooleanPropertyTester.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/propertytester/AbstractBooleanPropertyTester.java
index 8033fb0c8..4bf0b87ac 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/propertytester/AbstractBooleanPropertyTester.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/propertytester/AbstractBooleanPropertyTester.java
@@ -11,11 +11,11 @@
package org.eclipse.jubula.client.ui.propertytester;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.osgi.util.NLS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Markus Tiede
@@ -23,8 +23,8 @@ import org.eclipse.osgi.util.NLS;
*/
public abstract class AbstractBooleanPropertyTester extends PropertyTester {
/** the logger */
- private static final Log LOG = LogFactory
- .getLog(AbstractBooleanPropertyTester.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(AbstractBooleanPropertyTester.class);
/** {@inheritDoc} */
public final boolean test(Object receiver, String property, Object[] args,
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/propertytester/ComponentNameCollectionPropertyTester.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/propertytester/ComponentNameCollectionPropertyTester.java
index 119494c15..eb893cf3f 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/propertytester/ComponentNameCollectionPropertyTester.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/propertytester/ComponentNameCollectionPropertyTester.java
@@ -16,8 +16,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.client.core.model.IComponentNamePO;
import org.eclipse.jubula.client.core.model.IObjectMappingAssoziationPO;
@@ -29,6 +27,8 @@ import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.jubula.tools.objects.IComponentIdentifier;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IWorkbenchPart;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -55,8 +55,8 @@ public class ComponentNameCollectionPropertyTester
ARE_IN_CURRENT_PROJECT, ARE_SAME_TECH_PROP, ARE_SAME_TYPE_PROP };
/** <code>LOG</code> */
- private static final Log LOG =
- LogFactory.getLog(ComponentNameCollectionPropertyTester.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(ComponentNameCollectionPropertyTester.class);
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/CommandHelper.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/CommandHelper.java
index c969c88c8..f3b649b00 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/CommandHelper.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/CommandHelper.java
@@ -13,8 +13,8 @@ package org.eclipse.jubula.client.ui.utils;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.commands.common.CommandException;
import org.eclipse.jface.action.IContributionItem;
@@ -49,7 +49,7 @@ import org.eclipse.ui.menus.CommandContributionItemParameter;
*/
public abstract class CommandHelper {
/** standard logging */
- private static Log log = LogFactory.getLog(CommandHelper.class);
+ private static Logger log = LoggerFactory.getLogger(CommandHelper.class);
/**
* Constructor
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/Utils.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/Utils.java
index 7471c169f..d32625fb8 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/Utils.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/Utils.java
@@ -21,8 +21,8 @@ import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -83,7 +83,7 @@ import org.eclipse.ui.WorkbenchException;
public class Utils {
/** the logger */
- private static Log log = LogFactory.getLog(Utils.class);
+ private static Logger log = LoggerFactory.getLogger(Utils.class);
/** The error dialog */
private static Dialog dlg = null;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestSuiteBrowser.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestSuiteBrowser.java
index d81c52a6b..28b27d86f 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestSuiteBrowser.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestSuiteBrowser.java
@@ -12,8 +12,8 @@ package org.eclipse.jubula.client.ui.views;
import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jface.action.GroupMarker;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
@@ -92,7 +92,7 @@ public class TestSuiteBrowser extends AbstractJBTreeView implements
/** Add-Submenu ID */
public static final String ADD_ID = PlatformUI.PLUGIN_ID + ".AddSubMenu"; //$NON-NLS-1$
/** standard logging */
- static final Log LOG = LogFactory.getLog(TestSuiteBrowser.class);
+ static final Logger LOG = LoggerFactory.getLogger(TestSuiteBrowser.class);
/** flag for initialization state of context menu */
private boolean m_isContextMenuInitialized = false;
/** menu manager for context menu */
@@ -484,7 +484,7 @@ public class TestSuiteBrowser extends AbstractJBTreeView implements
TestJobEditor edit = Plugin.getDefault().getActiveTJEditor();
if (edit == null) {
String msg = Messages.NoActiveTCEditorPleaseFixTheMethod;
- LOG.fatal(msg);
+ LOG.error(msg);
throw new JBFatalException(msg, MessageIDs.E_NO_OPENED_EDITOR);
}
return edit;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestresultSummaryView.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestresultSummaryView.java
index 6d3fe49dd..6b790b1bb 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestresultSummaryView.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestresultSummaryView.java
@@ -25,8 +25,8 @@ import org.apache.commons.collections.ComparatorUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -319,7 +319,8 @@ public class TestresultSummaryView extends ViewPart implements
private static final String MONITORING_DETAILS =
Messages.TestresultSummaryMonitoringDetails;
/** standard logging */
- private static Log log = LogFactory.getLog(TestresultSummaryView.class);
+ private static Logger log =
+ LoggerFactory.getLogger(TestresultSummaryView.class);
/** column tag for memento*/
private static final String TAG_COLUMN = "column"; //$NON-NLS-1$
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/imageview/SWT2DUtil.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/imageview/SWT2DUtil.java
index 9a7d0cbfb..9f3d88e04 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/imageview/SWT2DUtil.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/imageview/SWT2DUtil.java
@@ -15,8 +15,9 @@ package org.eclipse.jubula.client.ui.views.imageview;
import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
@@ -27,7 +28,7 @@ import org.eclipse.swt.graphics.Rectangle;
*/
public class SWT2DUtil {
/** The logger */
- private static final Log LOG = LogFactory.getLog(SWT2DUtil.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SWT2DUtil.class);
/**
* hide
@@ -112,7 +113,7 @@ public class SWT2DUtil {
return new Point((int)Math.floor(dest.getX()), (int)Math.floor(dest
.getY()));
} catch (Exception e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
return new Point(0, 0);
}
}
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/JBMarkerResolutionGenerator.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/JBMarkerResolutionGenerator.java
index 6ec076fd1..3d553cf2b 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/JBMarkerResolutionGenerator.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/JBMarkerResolutionGenerator.java
@@ -14,8 +14,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.resources.IMarker;
@@ -51,6 +49,8 @@ import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IMarkerResolution;
import org.eclipse.ui.IMarkerResolutionGenerator;
import org.eclipse.ui.dialogs.PreferencesUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -60,10 +60,9 @@ import org.eclipse.ui.dialogs.PreferencesUtil;
* @created 02.06.2008
*/
public class JBMarkerResolutionGenerator implements IMarkerResolutionGenerator {
-
/** the logger */
- private static Log log =
- LogFactory.getLog(JBMarkerResolutionGenerator.class);
+ private static Logger log =
+ LoggerFactory.getLogger(JBMarkerResolutionGenerator.class);
/**
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ModifiableListObservable.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ModifiableListObservable.java
index f675e9779..1af4edfab 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ModifiableListObservable.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ModifiableListObservable.java
@@ -15,8 +15,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.client.ui.i18n.Messages;
@@ -28,7 +28,7 @@ import org.eclipse.jubula.client.ui.i18n.Messages;
public class ModifiableListObservable implements IModifiableListObservable {
/** standard logging */
- private static final Log LOG = LogFactory.getLog(
+ private static final Logger LOG = LoggerFactory.getLogger(
ModifiableListObservable.class);
/**
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ModifiableTriggerList.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ModifiableTriggerList.java
index b848d7421..4daebe663 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ModifiableTriggerList.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ModifiableTriggerList.java
@@ -17,8 +17,8 @@ import java.util.TreeSet;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jface.bindings.keys.KeySequenceText;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jubula.client.ui.constants.Layout;
@@ -60,7 +60,8 @@ public class ModifiableTriggerList extends Composite implements
IModifiableListObservable {
/** for log messages */
- private static Log log = LogFactory.getLog(ModifiableTriggerList.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ModifiableTriggerList.class);
/** GUI component */
private Text m_editor;
@@ -109,7 +110,7 @@ public class ModifiableTriggerList extends Composite implements
if (!emptyListAllowed && values != null && values.isEmpty()) {
String msg = Messages.ValuesForListMustNotBeEmpty
+ StringConstants.DOT;
- log.fatal(msg);
+ log.error(msg);
throw new IllegalArgumentException(msg);
}
m_observable = new ModifiableListObservable();
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ProjectWizard.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ProjectWizard.java
index 53935d015..759301b73 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ProjectWizard.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ProjectWizard.java
@@ -14,8 +14,8 @@ import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.databinding.validation.IValidator;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -48,6 +48,7 @@ import org.eclipse.jubula.client.ui.wizards.pages.AutConfigSettingWizardPage;
import org.eclipse.jubula.client.ui.wizards.pages.ProjectInfoWizardPage;
import org.eclipse.jubula.client.ui.wizards.pages.ProjectSettingWizardPage;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.exception.ProjectDeletedException;
@@ -88,7 +89,7 @@ public class ProjectWizard extends Wizard implements INewWizard {
private static final String UNBOUND_MODULES_PREFIX = "unbound_modules_"; //$NON-NLS-1$
/** the logger */
- private static Log log = LogFactory.getLog(ProjectWizard.class);
+ private static Logger log = LoggerFactory.getLogger(ProjectWizard.class);
/** the new project to create */
private IProjectPO m_newProject;
@@ -167,7 +168,7 @@ public class ProjectWizard extends Wizard implements INewWizard {
});
} catch (InvocationTargetException ite) {
// Exception occurred during operation
- log.error(ite.getCause());
+ log.error(DebugConstants.ERROR, ite.getCause());
} catch (InterruptedException ie) {
// Operation was canceled.
// Do nothing.
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/AutConfigSettingWizardPage.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/AutConfigSettingWizardPage.java
index 081d72f8e..1f7bd89bc 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/AutConfigSettingWizardPage.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/AutConfigSettingWizardPage.java
@@ -13,8 +13,8 @@ package org.eclipse.jubula.client.ui.wizards.pages;
import java.util.List;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.databinding.validation.IValidator;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.jubula.client.core.events.DataEventDispatcher;
@@ -47,7 +47,7 @@ public class AutConfigSettingWizardPage extends WizardPage
implements IDialogStatusListener {
/** The logger */
- private static Log log = LogFactory.getLog(
+ private static Logger log = LoggerFactory.getLogger(
AutConfigSettingWizardPage.class);
/** the name of the selected aut configuration */
private IAUTConfigPO m_autConfig;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportProjectsWizardPage.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportProjectsWizardPage.java
index 85ac97a32..0ec394da5 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportProjectsWizardPage.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportProjectsWizardPage.java
@@ -17,8 +17,8 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.jubula.client.ui.Plugin;
@@ -31,6 +31,7 @@ import org.eclipse.jubula.client.ui.provider.ControlDecorator;
import org.eclipse.jubula.client.ui.utils.DialogUtils;
import org.eclipse.jubula.client.ui.utils.Utils;
import org.eclipse.jubula.client.ui.widgets.JBText;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -61,7 +62,8 @@ public class ImportProjectsWizardPage extends WizardPage
implements IProjectImportInfoProvider {
/** the logger */
- private static Log log = LogFactory.getLog(ImportProjectsWizardPage.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ImportProjectsWizardPage.class);
/** number of colums in GridLayout */
private static final int NUM_COLUMS = 6;
@@ -395,7 +397,7 @@ public class ImportProjectsWizardPage extends WizardPage
try {
m_fileURLs.add(new File(fileName).toURI().toURL());
} catch (MalformedURLException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
}
}
diff --git a/org.eclipse.jubula.communication/.classpath b/org.eclipse.jubula.communication/.classpath
index a471b0bb3..0226d1685 100644
--- a/org.eclipse.jubula.communication/.classpath
+++ b/org.eclipse.jubula.communication/.classpath
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jubula.communication/META-INF/MANIFEST.MF b/org.eclipse.jubula.communication/META-INF/MANIFEST.MF
index 1148aa129..dbe000200 100644
--- a/org.eclipse.jubula.communication/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.communication/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Export-Package: org.eclipse.jubula.communication,
org.eclipse.jubula.communication.message.swt,
org.eclipse.jubula.communication.parser,
org.eclipse.jubula.communication.writer
-Require-Bundle: org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)"
+Require-Bundle: org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/AbortingExceptionHandler.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/AbortingExceptionHandler.java
index 43073232f..3494d1933 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/AbortingExceptionHandler.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/AbortingExceptionHandler.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.communication;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An exception handler which always returns false.
@@ -22,7 +22,8 @@ import org.apache.commons.logging.LogFactory;
public class AbortingExceptionHandler implements IExceptionHandler {
/** the logger */
- private static Log log = LogFactory.getLog(AbortingExceptionHandler.class);
+ private static Logger log =
+ LoggerFactory.getLogger(AbortingExceptionHandler.class);
/**
* {@inheritDoc}
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/Communicator.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/Communicator.java
index ec0b09736..6d5af1a05 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/Communicator.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/Communicator.java
@@ -25,8 +25,8 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.connection.AutStarterSocket;
import org.eclipse.jubula.communication.connection.Connection;
import org.eclipse.jubula.communication.connection.ConnectionState;
@@ -38,6 +38,7 @@ import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.MessageHeader;
import org.eclipse.jubula.communication.message.MessageIdentifier;
import org.eclipse.jubula.communication.parser.MessageSerializer;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.exception.Assert;
import org.eclipse.jubula.tools.exception.AssertException;
import org.eclipse.jubula.tools.exception.CommunicationException;
@@ -87,7 +88,7 @@ public class Communicator {
private static final int THOUSAND = 1000;
/** the logger instance */
- private static Log log = LogFactory.getLog(Communicator.class);
+ private static Logger log = LoggerFactory.getLogger(Communicator.class);
/** the port for connecting a server (this instance will act as a client) */
private int m_port = 0;
@@ -312,13 +313,13 @@ public class Communicator {
fireConnectingFailed(m_inetAddress, m_port);
}
} catch (IllegalArgumentException iae) {
- log.debug(iae);
+ log.debug(DebugConstants.ERROR, iae);
fireConnectingFailed(m_inetAddress, m_port);
} catch (IOException ioe) {
- log.debug(ioe);
+ log.debug(DebugConstants.ERROR, ioe);
fireConnectingFailed(m_inetAddress, m_port);
} catch (SecurityException se) {
- log.debug(se);
+ log.debug(DebugConstants.ERROR, se);
fireConnectingFailed(m_inetAddress, m_port);
throw se;
}
@@ -491,17 +492,17 @@ public class Communicator {
m_connection.send(new MessageHeader(MessageHeader.MESSAGE,
message), messageToSend);
} catch (SerialisationException se) {
- log.error(se);
+ log.error(DebugConstants.ERROR, se);
throw new CommunicationException(
"could not send message:" //$NON-NLS-1$
+ se.getMessage(), MessageIDs.E_MESSAGE_NOT_SEND);
} catch (IOException ioe) {
- log.error(ioe);
+ log.error(DebugConstants.ERROR, ioe);
throw new CommunicationException(
"io error occured during sending a message:" //$NON-NLS-1$
+ ioe.getMessage(), MessageIDs.E_MESSAGE_SEND);
} catch (IllegalArgumentException iae) {
- log.error(iae);
+ log.error(DebugConstants.ERROR, iae);
throw new CommunicationException(
"message could not send", MessageIDs.E_MESSAGE_NOT_SEND); //$NON-NLS-1$
}
@@ -576,12 +577,12 @@ public class Communicator {
messageToSend);
awaitingCommand.start();
} catch (SerialisationException se) {
- log.error(se);
+ log.error(DebugConstants.ERROR, se);
throw new CommunicationException(
"could not send message as request:" //$NON-NLS-1$
+ se.getMessage(), MessageIDs.E_MESSAGE_NOT_TO_REQUEST);
} catch (IOException ioe) {
- log.error(ioe);
+ log.error(DebugConstants.ERROR, ioe);
synchronized (m_awaitingCommands) {
m_awaitingCommands.remove(messageIdentifier);
}
@@ -589,11 +590,11 @@ public class Communicator {
"io error occured during requesting a message: "//$NON-NLS-1$
+ ioe.getMessage(), MessageIDs.E_MESSAGE_REQUEST);
} catch (IllegalArgumentException iae) {
- log.error(iae);
+ log.error(DebugConstants.ERROR, iae);
synchronized (m_awaitingCommands) {
m_awaitingCommands.remove(messageIdentifier);
}
- log.debug(iae);
+ log.debug(DebugConstants.ERROR, iae);
throw new CommunicationException(
"message could not send as a request", //$NON-NLS-1$
MessageIDs.E_MESSAGE_NOT_TO_REQUEST);
@@ -1047,13 +1048,13 @@ public class Communicator {
}
} catch (IOException ioe) {
- log.debug(ioe);
+ log.debug(DebugConstants.ERROR, ioe);
fireAcceptingFailed(m_serverSocket.getLocalPort());
// HERE exception manager if the IOExceptions
// are numerous, at the moment stop accepting
setAccepting(false);
} catch (Throwable t) {
- log.error(t);
+ log.error(DebugConstants.ERROR, t);
setAccepting(false);
// HERE exception handler for accepting ?
// setAccepting(getAcceptingExceptionHandler().handle(t));
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/commands/SetCompSystemI18nCommand.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/commands/SetCompSystemI18nCommand.java
index 15c7ad21c..95d3f2704 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/commands/SetCompSystemI18nCommand.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/commands/SetCompSystemI18nCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.communication.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.SendCompSystemI18nMessage;
@@ -26,7 +26,8 @@ import org.eclipse.jubula.tools.i18n.CompSystemI18n;
public class SetCompSystemI18nCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(SetCompSystemI18nCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(SetCompSystemI18nCommand.class);
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/AutStarterSocket.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/AutStarterSocket.java
index 5af5ef58e..c7ba3187b 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/AutStarterSocket.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/AutStarterSocket.java
@@ -16,8 +16,8 @@ import java.io.PrintStream;
import java.net.ServerSocket;
import java.net.Socket;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.tools.jarutils.IVersion;
import org.eclipse.jubula.tools.utils.TimeUtil;
@@ -34,7 +34,7 @@ import org.eclipse.jubula.tools.utils.TimeUtil;
public class AutStarterSocket extends ServerSocket {
/** the logger */
- private static Log log = LogFactory.getLog(AutStarterSocket.class);
+ private static Logger log = LoggerFactory.getLogger(AutStarterSocket.class);
/**
* @param port
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/Connection.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/Connection.java
index 19473c23b..825615489 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/Connection.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/Connection.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.Set;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.IExceptionHandler;
import org.eclipse.jubula.communication.listener.IErrorHandler;
import org.eclipse.jubula.communication.listener.IMessageHandler;
@@ -33,6 +33,7 @@ import org.eclipse.jubula.communication.message.MessageHeader;
import org.eclipse.jubula.communication.message.MessageHeader.InvalidHeaderVersionException;
import org.eclipse.jubula.communication.parser.MessageHeaderSerializer;
import org.eclipse.jubula.communication.writer.MessageWriter;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.SerialisationException;
@@ -84,7 +85,7 @@ public class Connection {
private static final long SEQUENCE_START = 1;
/** the logger */
- private static Log log = LogFactory.getLog(Connection.class);
+ private static Logger log = LoggerFactory.getLogger(Connection.class);
/**
* the sequence number used by this connection to identify messages will be
@@ -469,7 +470,7 @@ public class Connection {
log.error("invalid header length token: " //$NON-NLS-1$
+ headerLengthToken, e);
} catch (InvalidHeaderVersionException ihve) {
- log.error(ihve);
+ log.error(DebugConstants.ERROR, ihve);
} catch (Throwable t) {
log.error("exception raised", t); //$NON-NLS-1$
final IExceptionHandler exceptionHandler =
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/GDSocket.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/GDSocket.java
index 2264a948e..5a7043a92 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/GDSocket.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/GDSocket.java
@@ -19,8 +19,9 @@ import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
import java.net.Socket;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.exception.JBVersionException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.utils.TimeUtil;
@@ -39,7 +40,7 @@ import org.eclipse.jubula.tools.utils.TimeUtil;
*/
public class GDSocket extends Socket {
/** the logger */
- private static Log log = LogFactory.getLog(GDSocket.class);
+ private static Logger log = LoggerFactory.getLogger(GDSocket.class);
/** flag wheter a connection could established or not */
private boolean m_connectionEstablished = false;
@@ -110,7 +111,7 @@ public class GDSocket extends Socket {
handleState(false);
throw gdve;
} catch (IOException ioe) {
- log.error(ioe);
+ log.error(DebugConstants.ERROR, ioe);
handleState(false);
}
}
@@ -188,7 +189,7 @@ public class GDSocket extends Socket {
setConnectionEstablished(false);
}
} catch (IOException ioe) {
- log.error(ioe);
+ log.error(DebugConstants.ERROR, ioe);
handleState(false);
}
}
diff --git a/org.eclipse.jubula.documentation.gen/.classpath b/org.eclipse.jubula.documentation.gen/.classpath
index 9cfdd2054..320f2860d 100644
--- a/org.eclipse.jubula.documentation.gen/.classpath
+++ b/org.eclipse.jubula.documentation.gen/.classpath
@@ -5,5 +5,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.tools"/>
<classpathentry kind="lib" path="/org.eclipse.jubula.rc.common.orbit/org.apache.commons.cli_1.2.0.v201011021000.jar"/>
+ <classpathentry kind="lib" path="/org.eclipse.jubula.rc.common.orbit/org.apache.commons.lang_2.4.0.v201005080502.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.examples.extension.rcp.toolkit/META-INF/MANIFEST.MF b/org.eclipse.jubula.examples.extension.rcp.toolkit/META-INF/MANIFEST.MF
index 3326161d3..e4b647518 100644
--- a/org.eclipse.jubula.examples.extension.rcp.toolkit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.examples.extension.rcp.toolkit/META-INF/MANIFEST.MF
@@ -5,8 +5,12 @@ Bundle-SymbolicName: org.eclipse.jubula.examples.extension.rcp.toolkit;singleton
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.examples.extension.rcp.toolkit.Activator
Bundle-Vendor: %Bundle-Provider.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.toolkit.provider.rcp;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";resolution:=optional
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
diff --git a/org.eclipse.jubula.examples.extension.swing.toolkit/META-INF/MANIFEST.MF b/org.eclipse.jubula.examples.extension.swing.toolkit/META-INF/MANIFEST.MF
index ab2e0998e..4c1f90e09 100644
--- a/org.eclipse.jubula.examples.extension.swing.toolkit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.examples.extension.swing.toolkit/META-INF/MANIFEST.MF
@@ -5,8 +5,11 @@ Bundle-SymbolicName: org.eclipse.jubula.examples.extension.swing.toolkit;singlet
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.examples.extension.swing.toolkit.Activator
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %Bundle-Provider.0
diff --git a/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF b/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF
index a91d66e19..70e786a1e 100644
--- a/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.apache.oro;bundle-version="[2.0.8,3.0.0)",
org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.communication;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.jubula.communication;bundle-version="[1.0.0,2.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-ClassPath: .,
resources/,
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java
index e5b647ad7..1938155ea 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java
@@ -22,8 +22,8 @@ import java.util.Arrays;
import java.util.List;
import java.util.logging.LogManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.Communicator;
import org.eclipse.jubula.communication.listener.ICommunicationErrorListener;
import org.eclipse.jubula.communication.message.AUTServerStateMessage;
@@ -40,6 +40,7 @@ import org.eclipse.jubula.rc.common.registration.AgentRegisterAut;
import org.eclipse.jubula.rc.common.registration.IRegisterAut;
import org.eclipse.jubula.tools.constants.AUTServerExitConstants;
import org.eclipse.jubula.tools.constants.CommandConstants;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.TimingConstantsServer;
import org.eclipse.jubula.tools.exception.CommunicationException;
@@ -77,7 +78,7 @@ import org.eclipse.jubula.tools.registration.AutIdentifier;
*/
public abstract class AUTServer {
/** the logger */
- private static Log log = LogFactory.getLog(AUTServer.class);
+ private static Logger log = LoggerFactory.getLogger(AUTServer.class);
/** the instance */
private static AUTServer instance = null;
@@ -300,7 +301,7 @@ public abstract class AUTServer {
}
if (args.length < Constants.MIN_ARGS_REQUIRED) {
- log.fatal("wrong number of arguments: " //$NON-NLS-1$
+ log.error("wrong number of arguments: " //$NON-NLS-1$
+ "must be at least " //$NON-NLS-1$
+ String.valueOf(Constants.MIN_ARGS_REQUIRED)
+ ", but were " + Arrays.asList(args).toString()); //$NON-NLS-1$
@@ -433,18 +434,18 @@ public abstract class AUTServer {
try {
autReg.register();
} catch (IOException ioe) {
- log.fatal("Exception during AUT registration", ioe); //$NON-NLS-1$
+ log.error("Exception during AUT registration", ioe); //$NON-NLS-1$
System.exit(AUTServerExitConstants.AUT_START_ERROR);
}
}
} catch (IllegalArgumentException iae) {
- log.fatal("Exception in start()", iae); //$NON-NLS-1$
+ log.error("Exception in start()", iae); //$NON-NLS-1$
System.exit(AUTServerExitConstants.EXIT_INVALID_ARGS);
} catch (CommunicationException ce) {
- log.fatal("Exception in start()", ce); //$NON-NLS-1$
+ log.error("Exception in start()", ce); //$NON-NLS-1$
System.exit(AUTServerExitConstants.EXIT_COMMUNICATION_ERROR);
} catch (SecurityException se) {
- log.fatal("Exception in start()", se); //$NON-NLS-1$
+ log.error("Exception in start()", se); //$NON-NLS-1$
System.exit(AUTServerExitConstants
.EXIT_SECURITY_VIOLATION_REFLECTION);
} catch (ClassNotFoundException cnfe) {
@@ -462,7 +463,7 @@ public abstract class AUTServer {
AUTServerStateMessage.EXIT_AUT_WRONG_CLASS_VERSION,
ucve.getMessage()));
} catch (CommunicationException ce) {
- log.fatal("Exception in start()", ce); //$NON-NLS-1$
+ log.error("Exception in start()", ce); //$NON-NLS-1$
}
System.exit(AUTServerExitConstants.EXIT_AUT_WRONG_CLASS_VERSION);
}
@@ -526,7 +527,7 @@ public abstract class AUTServer {
try {
m_communicator.run();
} catch (SecurityException se) {
- log.fatal("Exception in start()", se); //$NON-NLS-1$
+ log.error("Exception in start()", se); //$NON-NLS-1$
System.exit(AUTServerExitConstants
.EXIT_SECURITY_VIOLATION_COMMUNICATION);
} catch (JBVersionException e) {
@@ -553,7 +554,7 @@ public abstract class AUTServer {
m_communicator.send(new AUTServerStateMessage(
exitCode, errorMessage));
} catch (CommunicationException ce) {
- log.fatal("Exception in start()", ce); //$NON-NLS-1$
+ log.error("Exception in start()", ce); //$NON-NLS-1$
}
}
@@ -671,7 +672,7 @@ public abstract class AUTServer {
public void invokeAUT() throws ExceptionInInitializerError,
InvocationTargetException, NoSuchMethodException {
if (m_autMainMethod == null) {
- log.fatal("the main method of the AUT could not be found!"); //$NON-NLS-1$
+ log.error("the main method of the AUT could not be found!"); //$NON-NLS-1$
throw new NoSuchMethodException("no public static main in AUT"); //$NON-NLS-1$
}
try {
@@ -683,16 +684,16 @@ public abstract class AUTServer {
m_autMainMethod.invoke(null, new Object[] {m_autArgs});
} catch (IllegalArgumentException iae) {
m_isAutRunning = false;
- log.fatal(iae);
+ log.error(DebugConstants.ERROR, iae);
} catch (IllegalAccessException iae) {
m_isAutRunning = false;
- log.fatal(iae);
+ log.error(DebugConstants.ERROR, iae);
} catch (NullPointerException npe) {
m_isAutRunning = false;
- log.fatal(npe);
+ log.error(DebugConstants.ERROR, npe);
} catch (RuntimeException re) {
m_isAutRunning = false;
- log.fatal("unexpected exception thrown by AUT: ", re); //$NON-NLS-1$
+ log.error("unexpected exception thrown by AUT: ", re); //$NON-NLS-1$
throw re;
}
}
@@ -839,7 +840,7 @@ public abstract class AUTServer {
+ ":" + String.valueOf(port) //$NON-NLS-1$
+ " failed()"; //$NON-NLS-1$
- log.fatal(message);
+ log.error(message);
} catch (SecurityException se) {
log.error("security violation during getting the " //$NON-NLS-1$
+ " host name from ip address " //$NON-NLS-1$
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServerConfiguration.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServerConfiguration.java
index 204e68ed7..4a8e27fc3 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServerConfiguration.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServerConfiguration.java
@@ -387,7 +387,7 @@ public class AUTServerConfiguration {
}
String message = "Component " + typeName //$NON-NLS-1$
+ " does not exist"; //$NON-NLS-1$
- log.fatal(message);
+ log.error(message);
throw new GDConfigXmlException(message, MessageIDs.E_NO_COMPONENT);
}
@@ -416,7 +416,7 @@ public class AUTServerConfiguration {
}
String message = "Component " + typeName //$NON-NLS-1$
+ " does not exist"; //$NON-NLS-1$
- log.fatal(message);
+ log.error(message);
throw new GDConfigXmlException(message, MessageIDs.E_NO_COMPONENT);
}
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/businessprocess/ReflectionBP.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/businessprocess/ReflectionBP.java
index 7add9c730..9ead477a8 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/businessprocess/ReflectionBP.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/businessprocess/ReflectionBP.java
@@ -46,17 +46,17 @@ public class ReflectionBP {
Method m = object.getClass().getMethod(name, paramTypes);
m.invoke(object, args);
} catch (SecurityException e) {
- LOG.fatal("Security manager indicated a security violation!", e); //$NON-NLS-1$
+ LOG.error("Security manager indicated a security violation!", e); //$NON-NLS-1$
} catch (IllegalArgumentException e) {
- LOG.fatal(e);
+ LOG.error(e);
} catch (NoSuchMethodException e) {
- LOG.fatal("Class: " + object.getClass().getName() //$NON-NLS-1$
+ LOG.error("Class: " + object.getClass().getName() //$NON-NLS-1$
+ " does not contain method: " + name + "!"); //$NON-NLS-1$ //$NON-NLS-2$
} catch (IllegalAccessException e) {
- LOG.fatal(e);
+ LOG.error(e);
} catch (InvocationTargetException e) {
- LOG.fatal("InvocationTargetException: ", e); //$NON-NLS-1$
- LOG.fatal("TargetException: ", e.getTargetException()); //$NON-NLS-1$
+ LOG.error("InvocationTargetException: ", e); //$NON-NLS-1$
+ LOG.error("TargetException: ", e.getTargetException()); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTHighlightComponentCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTHighlightComponentCommand.java
index e91356444..490e3b217 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTHighlightComponentCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTHighlightComponentCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.AUTHighlightComponentMessage;
import org.eclipse.jubula.communication.message.AUTHighlightComponentResponseMessage;
@@ -30,8 +30,8 @@ import org.eclipse.jubula.rc.common.AUTServer;
*/
public class AUTHighlightComponentCommand implements ICommand {
/** the logger */
- private static Log log =
- LogFactory.getLog(AUTHighlightComponentCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(AUTHighlightComponentCommand.class);
/** the message */
private AUTHighlightComponentMessage m_message;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTStartCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTStartCommand.java
index 1d3063fa1..2a9c67500 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTStartCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTStartCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.AUTStartMessage;
import org.eclipse.jubula.communication.message.AUTStateMessage;
@@ -30,7 +30,7 @@ import org.eclipse.jubula.rc.common.AUTServer;
*/
public class AUTStartCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(AUTStartCommand.class);
+ private static Logger log = LoggerFactory.getLogger(AUTStartCommand.class);
/** the message */
private AUTStartMessage m_message;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractCapTestCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractCapTestCommand.java
index 3a35146a0..0a96e4042 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractCapTestCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractCapTestCommand.java
@@ -13,8 +13,8 @@ package org.eclipse.jubula.rc.common.commands;
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.CAPTestMessage;
import org.eclipse.jubula.communication.message.CAPTestResponseMessage;
@@ -32,6 +32,7 @@ import org.eclipse.jubula.rc.common.exception.MethodParamException;
import org.eclipse.jubula.rc.common.exception.StepExecutionException;
import org.eclipse.jubula.rc.common.exception.StepVerifyFailedException;
import org.eclipse.jubula.rc.common.implclasses.Verifier;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.i18n.CompSystemI18n;
import org.eclipse.jubula.tools.objects.IComponentIdentifier;
import org.eclipse.jubula.tools.objects.event.EventFactory;
@@ -53,7 +54,7 @@ import org.eclipse.jubula.tools.utils.TimeUtil;
public abstract class AbstractCapTestCommand implements ICommand {
/** The logger */
- private static final Log LOG = LogFactory.getLog(
+ private static final Logger LOG = LoggerFactory.getLogger(
AbstractCapTestCommand.class);
/** The message. */
@@ -81,7 +82,7 @@ public abstract class AbstractCapTestCommand implements ICommand {
private void handleComponentNotFound(CAPTestResponseMessage response,
Throwable e) {
if (LOG.isWarnEnabled()) {
- LOG.warn(e);
+ LOG.warn(DebugConstants.ERROR, e);
}
response.setTestErrorEvent(EventFactory
.createComponentNotFoundErrorEvent());
@@ -155,11 +156,11 @@ public abstract class AbstractCapTestCommand implements ICommand {
handleComponentNotFound(response, e);
}
} catch (UnsupportedComponentException buce) {
- LOG.error(buce);
+ LOG.error(DebugConstants.ERROR, buce);
response.setTestErrorEvent(EventFactory.createConfigErrorEvent());
} catch (Throwable e) {
if (LOG.isErrorEnabled()) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
}
response.setTestErrorEvent(
EventFactory.createImplClassErrorEvent());
@@ -241,13 +242,13 @@ public abstract class AbstractCapTestCommand implements ICommand {
ite.getTargetException();
event = e.getEvent();
if (LOG.isDebugEnabled()) {
- LOG.debug(e);
+ LOG.debug(DebugConstants.ERROR, e);
}
} else if (ite.getTargetException() instanceof ExecutionEvent) {
ExecutionEvent e = (ExecutionEvent)ite.getTargetException();
response.setState(e.getEvent());
if (LOG.isDebugEnabled()) {
- LOG.debug(e);
+ LOG.debug(DebugConstants.ERROR, e);
}
} else {
event = EventFactory.createConfigErrorEvent();
@@ -257,9 +258,9 @@ public abstract class AbstractCapTestCommand implements ICommand {
}
}
} catch (IllegalArgumentException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
} catch (MethodParamException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
} finally {
if (AUTServer.getInstance().getMode() != oldMode) {
AUTServer.getInstance().setMode(oldMode);
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractSendAUTListOfSupportedComponentsCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractSendAUTListOfSupportedComponentsCommand.java
index 49b4a76f9..6148402ea 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractSendAUTListOfSupportedComponentsCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractSendAUTListOfSupportedComponentsCommand.java
@@ -14,8 +14,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.AUTStartStateMessage;
import org.eclipse.jubula.communication.message.Message;
@@ -46,7 +46,7 @@ public abstract class AbstractSendAUTListOfSupportedComponentsCommand
implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(
+ private static Logger log = LoggerFactory.getLogger(
AbstractSendAUTListOfSupportedComponentsCommand.class);
/** the (empty) message */
private SendAUTListOfSupportedComponentsMessage m_message;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ChangeAUTModeCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ChangeAUTModeCommand.java
index 1b3e1c3da..d214308e6 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ChangeAUTModeCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ChangeAUTModeCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.AUTModeChangedMessage;
import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
@@ -34,7 +34,8 @@ import org.eclipse.jubula.tools.exception.CommunicationException;
*/
public class ChangeAUTModeCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(ChangeAUTModeCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ChangeAUTModeCommand.class);
/** the message */
private ChangeAUTModeMessage m_message;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/EndTestExecutionCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/EndTestExecutionCommand.java
index 46ef21e87..1733f417d 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/EndTestExecutionCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/EndTestExecutionCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.EndTestExecutionMessage;
import org.eclipse.jubula.communication.message.EndTestExecutionResponseMessage;
@@ -25,8 +25,8 @@ import org.eclipse.jubula.communication.message.Message;
*/
public class EndTestExecutionCommand implements ICommand {
/** Logger */
- private static final Log LOG = LogFactory
- .getLog(EndTestExecutionCommand.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(EndTestExecutionCommand.class);
/** message */
private EndTestExecutionMessage m_message;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/InitTestExecutionCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/InitTestExecutionCommand.java
index 3f37e9500..eb014217a 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/InitTestExecutionCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/InitTestExecutionCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.InitTestExecutionMessage;
import org.eclipse.jubula.communication.message.Message;
@@ -28,8 +28,8 @@ import org.eclipse.jubula.rc.common.driver.RobotConfiguration;
public class InitTestExecutionCommand implements ICommand {
/** Logger */
- private static final Log LOG =
- LogFactory.getLog(InitTestExecutionCommand.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(InitTestExecutionCommand.class);
/** message */
private InitTestExecutionMessage m_message;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/NullCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/NullCommand.java
index c25daf1d0..42ca8c0fb 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/NullCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/NullCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.NullMessage;
@@ -27,7 +27,7 @@ import org.eclipse.jubula.communication.message.NullMessage;
public class NullCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(NullCommand.class);
+ private static Logger log = LoggerFactory.getLogger(NullCommand.class);
/** the message */
private NullMessage m_message;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ShowDialogResultCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ShowDialogResultCommand.java
index f2b8bdbfd..067888f75 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ShowDialogResultCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ShowDialogResultCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.Communicator;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
@@ -33,7 +33,8 @@ import org.eclipse.jubula.tools.exception.CommunicationException;
*/
public class ShowDialogResultCommand implements ICommand {
/** the logger */
- private static Log log = LogFactory.getLog(ShowDialogResultCommand.class);
+ private static Logger log =
+ LoggerFactory.getLogger(ShowDialogResultCommand.class);
/** the message */
private ServerShowDialogResponseMessage m_message;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/TakeScreenshotCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/TakeScreenshotCommand.java
index 778d319f6..7d27cc8f3 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/TakeScreenshotCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/TakeScreenshotCommand.java
@@ -17,12 +17,13 @@ import java.awt.Robot;
import java.awt.Toolkit;
import java.awt.image.BufferedImage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.TakeScreenshotMessage;
import org.eclipse.jubula.communication.message.TakeScreenshotResponseMessage;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.serialisation.SerializedImage;
@@ -33,8 +34,8 @@ import org.eclipse.jubula.tools.serialisation.SerializedImage;
*/
public class TakeScreenshotCommand implements ICommand {
/** Logger */
- private static final Log LOG = LogFactory
- .getLog(TakeScreenshotCommand.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(TakeScreenshotCommand.class);
/** message */
private TakeScreenshotMessage m_message;
@@ -55,7 +56,7 @@ public class TakeScreenshotCommand implements ICommand {
response.setScreenshot(SerializedImage.computeSerializeImage(bi));
} catch (AWTException e) {
if (LOG.isErrorEnabled()) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
}
}
return response;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/logger/AutServerLogger.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/logger/AutServerLogger.java
index 3304c8d1e..78fd52021 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/logger/AutServerLogger.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/logger/AutServerLogger.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.logger;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Wrapper class for org.apache.commons.logging
@@ -24,28 +24,24 @@ import org.apache.commons.logging.LogFactory;
* @created 10.05.2006
*/
public class AutServerLogger {
-
-
/** The Logger */
- private Log m_log;
-
+ private Logger m_log;
/**
* Constructor
* @param clazz the caller class
*/
public AutServerLogger(Class clazz) {
- m_log = LogFactory.getLog(clazz);
+ m_log = LoggerFactory.getLogger(clazz);
}
-
/**
* {@inheritDoc}
* @param message
* @param t
*/
public void debug(Object message, Throwable t) {
- m_log.debug(message, t);
+ m_log.debug(String.valueOf(message), t);
}
/**
@@ -53,7 +49,7 @@ public class AutServerLogger {
* @param message
*/
public void debug(Object message) {
- m_log.debug(message);
+ m_log.debug(String.valueOf(message));
}
/**
@@ -62,7 +58,7 @@ public class AutServerLogger {
* @param t
*/
public void error(Object message, Throwable t) {
- m_log.error(message, t);
+ m_log.error(String.valueOf(message), t);
}
/**
@@ -70,24 +66,7 @@ public class AutServerLogger {
* @param message
*/
public void error(Object message) {
- m_log.error(message);
- }
-
- /**
- * {@inheritDoc}
- * @param message
- * @param t
- */
- public void fatal(Object message, Throwable t) {
- m_log.fatal(message, t);
- }
-
- /**
- * {@inheritDoc}
- * @param message
- */
- public void fatal(Object message) {
- m_log.fatal(message);
+ m_log.error(String.valueOf(message));
}
/**
@@ -96,7 +75,7 @@ public class AutServerLogger {
* @param t
*/
public void info(Object message, Throwable t) {
- m_log.info(message, t);
+ m_log.info(String.valueOf(message), t);
}
/**
@@ -104,7 +83,7 @@ public class AutServerLogger {
* @param message
*/
public void info(Object message) {
- m_log.info(message);
+ m_log.info(String.valueOf(message));
}
/**
@@ -113,7 +92,7 @@ public class AutServerLogger {
* @param t
*/
public void trace(Object message, Throwable t) {
- m_log.trace(message, t);
+ m_log.trace(String.valueOf(message), t);
}
/**
@@ -121,7 +100,7 @@ public class AutServerLogger {
* @param message
*/
public void trace(Object message) {
- m_log.trace(message);
+ m_log.trace(String.valueOf(message));
}
/**
@@ -130,7 +109,7 @@ public class AutServerLogger {
* @param t
*/
public void warn(Object message, Throwable t) {
- m_log.warn(message, t);
+ m_log.warn(String.valueOf(message), t);
}
/**
@@ -138,7 +117,7 @@ public class AutServerLogger {
* @param message
*/
public void warn(Object message) {
- m_log.warn(message);
+ m_log.warn(String.valueOf(message));
}
/**
@@ -161,14 +140,6 @@ public class AutServerLogger {
* {@inheritDoc}
* @return
*/
- public boolean isFatalEnabled() {
- return m_log.isFatalEnabled();
- }
-
- /**
- * {@inheritDoc}
- * @return
- */
public boolean isInfoEnabled() {
return m_log.isInfoEnabled();
}
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/registration/AgentRegisterAut.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/registration/AgentRegisterAut.java
index d8cf43681..4de848fa9 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/registration/AgentRegisterAut.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/registration/AgentRegisterAut.java
@@ -19,8 +19,8 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.connection.ConnectionState;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.tools.constants.TimingConstantsServer;
@@ -38,7 +38,8 @@ import org.eclipse.jubula.tools.utils.TimeUtil;
public class AgentRegisterAut implements IRegisterAut {
/** the logger */
- private static final Log LOG = LogFactory.getLog(AgentRegisterAut.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(AgentRegisterAut.class);
/** the address of the Aut Agent with which to register */
private InetSocketAddress m_agentAddr;
diff --git a/org.eclipse.jubula.rc.rcp/src/org/eclipse/jubula/rc/rcp/accessor/plugin/RcpAccessorPlugin.java b/org.eclipse.jubula.rc.rcp/src/org/eclipse/jubula/rc/rcp/accessor/plugin/RcpAccessorPlugin.java
index f0eea5306..32ca828fa 100644
--- a/org.eclipse.jubula.rc.rcp/src/org/eclipse/jubula/rc/rcp/accessor/plugin/RcpAccessorPlugin.java
+++ b/org.eclipse.jubula.rc.rcp/src/org/eclipse/jubula/rc/rcp/accessor/plugin/RcpAccessorPlugin.java
@@ -12,8 +12,8 @@ package org.eclipse.jubula.rc.rcp.accessor.plugin;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.rcp.accessor.Startup;
@@ -21,6 +21,7 @@ import org.eclipse.jubula.rc.rcp.gef.inspector.GefInspectorListenerAppender;
import org.eclipse.jubula.rc.swt.SwtAUTServer;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
import org.eclipse.jubula.tools.constants.CommandConstants;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.RcpAccessorConstants;
import org.eclipse.jubula.tools.utils.EnvironmentUtils;
import org.eclipse.swt.widgets.Display;
@@ -36,7 +37,8 @@ import org.osgi.framework.BundleContext;
public class RcpAccessorPlugin extends AbstractUIPlugin implements IStartup {
/** the logger */
- private static Log log = LogFactory.getLog(RcpAccessorPlugin.class);
+ private static Logger log =
+ LoggerFactory.getLogger(RcpAccessorPlugin.class);
/**
@@ -96,7 +98,7 @@ public class RcpAccessorPlugin extends AbstractUIPlugin implements IStartup {
}
} catch (InterruptedException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
}
}
diff --git a/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF b/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF
index 0d8e200f8..fe256ce2a 100644
--- a/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Require-Bundle: org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.communication;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.rc.common;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.jubula.rc.common;bundle-version="[1.0.0,2.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)"
Export-Package: com.bredexsw.guidancer.autserver.swing.implclasses,
org.eclipse.jubula.rc.swing,
org.eclipse.jubula.rc.swing.commands,
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java
index d81db17b9..54e509ee2 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java
@@ -23,8 +23,8 @@ import java.util.Set;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.driver.IRobot;
import org.eclipse.jubula.rc.common.driver.IRobotFactory;
@@ -37,6 +37,7 @@ import org.eclipse.jubula.rc.swing.listener.FocusTracker;
import org.eclipse.jubula.rc.swing.listener.MappingListener;
import org.eclipse.jubula.rc.swing.listener.RecordListener;
import org.eclipse.jubula.tools.constants.AUTServerExitConstants;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.utils.EnvironmentUtils;
@@ -70,7 +71,8 @@ import org.eclipse.jubula.tools.utils.EnvironmentUtils;
public class SwingAUTServer extends AUTServer {
/** the logger */
- private static final Log LOG = LogFactory.getLog(SwingAUTServer.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(SwingAUTServer.class);
/**
* name of Environment Variable or Java Property that defines the
@@ -129,10 +131,10 @@ public class SwingAUTServer extends AUTServer {
(AWTEventListener)listener, mask);
} catch (AWTError awte) {
// no default toolkit
- LOG.error(awte);
+ LOG.error(DebugConstants.ERROR, awte);
} catch (SecurityException se) {
// no permission to add an AWTEventListener
- LOG.fatal(se);
+ LOG.error(DebugConstants.ERROR, se);
System.exit(AUTServerExitConstants
.EXIT_SECURITY_VIOLATION_AWT_EVENT_LISTENER);
}
@@ -152,12 +154,12 @@ public class SwingAUTServer extends AUTServer {
(AWTEventListener)listener);
} catch (AWTError awte) {
// no default toolkit
- LOG.error(awte);
+ LOG.error(DebugConstants.ERROR, awte);
} catch (SecurityException se) {
// no permission to remove an AWTEventListener,
// should not occur, because addAWTEventListener() should be called
// first. But just in case, close the vm
- LOG.fatal(se);
+ LOG.error(DebugConstants.ERROR, se);
System.exit(AUTServerExitConstants
.EXIT_SECURITY_VIOLATION_AWT_EVENT_LISTENER);
}
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java
index 457fa28bf..e9a4e38c3 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java
@@ -333,11 +333,11 @@ public class AUTSwingHierarchy extends AUTHierarchy
}
} catch (IllegalArgumentException iae) {
// from isSupported -> log
- log.fatal("hierarchy map contains null values", iae); //$NON-NLS-1$
+ log.error("hierarchy map contains null values", iae); //$NON-NLS-1$
// and continue
} catch (ComponentNotManagedException e) {
// from isSupported -> log
- log.fatal("component '" + component.getName() + "' not found!", e); //$NON-NLS-1$ //$NON-NLS-2$
+ log.error("component '" + component.getName() + "' not found!", e); //$NON-NLS-1$ //$NON-NLS-2$
// and continue
}
}
diff --git a/org.eclipse.jubula.rc.swt/META-INF/MANIFEST.MF b/org.eclipse.jubula.rc.swt/META-INF/MANIFEST.MF
index 2c0fead30..9cd28f949 100644
--- a/org.eclipse.jubula.rc.swt/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.rc.swt/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Require-Bundle: org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.communication;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.rc.common;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.jubula.rc.common;bundle-version="[1.0.0,2.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Export-Package: com.bredexsw.guidancer.autswtserver.implclasses,
org.eclipse.jubula.rc.swt,
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/SwtAUTServer.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/SwtAUTServer.java
index fe1d0c216..b86c8dbe6 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/SwtAUTServer.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/SwtAUTServer.java
@@ -12,8 +12,8 @@ package org.eclipse.jubula.rc.swt;
import java.lang.reflect.InvocationTargetException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.driver.IRobot;
import org.eclipse.jubula.rc.common.driver.IRobotFactory;
@@ -27,6 +27,7 @@ import org.eclipse.jubula.rc.swt.listener.MappingListener;
import org.eclipse.jubula.rc.swt.listener.RecordListener;
import org.eclipse.jubula.rc.swt.listener.TableSelectionTracker;
import org.eclipse.jubula.tools.constants.AUTServerExitConstants;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Listener;
@@ -58,7 +59,8 @@ import org.eclipse.swt.widgets.Listener;
public class SwtAUTServer extends AUTServer {
/** the logger */
- private static final Log LOG = LogFactory.getLog(SwtAUTServer.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(SwtAUTServer.class);
/** the aut display */
private Display m_display = null;
@@ -169,7 +171,7 @@ public class SwtAUTServer extends AUTServer {
// no permission to remove an SWTEventListener,
// should not occur, because addSWTEventListener() should be called
// first. But just in case, close the vm
- LOG.fatal(se);
+ LOG.error(DebugConstants.ERROR, se);
System.exit(AUTServerExitConstants
.EXIT_SECURITY_VIOLATION_AWT_EVENT_LISTENER);
}
@@ -202,7 +204,7 @@ public class SwtAUTServer extends AUTServer {
// no permission to remove an SWTEventListener,
// should not occur, because addSWTEventListener() should be called
// first. But just in case, close the vm
- LOG.fatal(se);
+ LOG.error(DebugConstants.ERROR, se);
System.exit(AUTServerExitConstants
.EXIT_SECURITY_VIOLATION_AWT_EVENT_LISTENER);
}
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/SendAUTListOfSupportedComponentsCommand.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/SendAUTListOfSupportedComponentsCommand.java
index 27f6d49a3..be192ecd6 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/SendAUTListOfSupportedComponentsCommand.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/SendAUTListOfSupportedComponentsCommand.java
@@ -12,14 +12,15 @@ package org.eclipse.jubula.rc.swt.commands;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.commands.AbstractSendAUTListOfSupportedComponentsCommand;
import org.eclipse.jubula.rc.common.exception.UnsupportedComponentException;
import org.eclipse.jubula.rc.common.implclasses.IComponentFactory;
import org.eclipse.jubula.rc.swt.SwtAUTServer;
import org.eclipse.jubula.rc.swt.listener.ComponentHandler;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.xml.businessmodell.ConcreteComponent;
@@ -41,7 +42,7 @@ public class SendAUTListOfSupportedComponentsCommand
extends AbstractSendAUTListOfSupportedComponentsCommand {
/** the logger */
- private static Log log = LogFactory.getLog(
+ private static Logger log = LoggerFactory.getLogger(
SendAUTListOfSupportedComponentsCommand.class);
/** list of comp IDs */
private List m_componentIds;
@@ -73,7 +74,7 @@ public class SendAUTListOfSupportedComponentsCommand
try {
m_componentIds.add(createIdentifier(m_concrete));
} catch (UnsupportedComponentException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
}
}
});
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtAUTHierarchy.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtAUTHierarchy.java
index 07075de3b..285ff4190 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtAUTHierarchy.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtAUTHierarchy.java
@@ -291,11 +291,11 @@ public class SwtAUTHierarchy extends AUTHierarchy {
}
} catch (IllegalArgumentException iae) {
// from isSupported -> log
- log.fatal("hierarchy map contains null values", iae); //$NON-NLS-1$
+ log.error("hierarchy map contains null values", iae); //$NON-NLS-1$
// and continue
} catch (ComponentNotManagedException e) {
// from isSupported -> log
- log.fatal("component '" + component.getClass().getName() + "' not found!", e); //$NON-NLS-1$ //$NON-NLS-2$
+ log.error("component '" + component.getClass().getName() + "' not found!", e); //$NON-NLS-1$ //$NON-NLS-2$
// and continue
}
}
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractAutSwtEventListener.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractAutSwtEventListener.java
index 007fe791a..72387e337 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractAutSwtEventListener.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractAutSwtEventListener.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.rc.swt.listener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.AUTServerConfiguration;
@@ -21,6 +21,7 @@ import org.eclipse.jubula.rc.common.exception.UnsupportedComponentException;
import org.eclipse.jubula.rc.common.listener.AUTEventListener;
import org.eclipse.jubula.rc.swt.SwtAUTServer;
import org.eclipse.jubula.rc.swt.utils.SwtUtils;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
import org.eclipse.jubula.tools.objects.IComponentIdentifier;
import org.eclipse.swt.SWT;
@@ -50,7 +51,7 @@ public abstract class AbstractAutSwtEventListener extends BaseSwtEventListener
implements AUTEventListener {
/** the logger */
- private static final Log LOG = LogFactory.getLog(
+ private static final Logger LOG = LoggerFactory.getLogger(
AbstractAutSwtEventListener.class);
/** the lock object for m_currentComponent */
private Object m_componentLock = new Object();
@@ -168,7 +169,7 @@ public abstract class AbstractAutSwtEventListener extends BaseSwtEventListener
componentClass);
}
} catch (IllegalArgumentException e) {
- LOG.warn(e);
+ LOG.warn(DebugConstants.ERROR, e);
} catch (UnsupportedComponentException uce) {
closeBorderShell();
return;
@@ -305,7 +306,7 @@ public abstract class AbstractAutSwtEventListener extends BaseSwtEventListener
+ String.valueOf(comp) + "' not found!", e); //$NON-NLS-1$
return false;
} catch (IllegalArgumentException e) {
- LOG.debug(e);
+ LOG.debug(DebugConstants.ERROR, e);
return false;
}
return component != null;
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java
index a3e3cf47e..d5db966cf 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java
@@ -14,8 +14,8 @@ import java.awt.Point;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
import org.eclipse.jubula.communication.message.ServerShowDialogMessage;
import org.eclipse.jubula.rc.common.AUTServer;
@@ -75,7 +75,8 @@ public class CheckListener extends AbstractAutSwtEventListener {
CheckListener.class);
/** the logger */
- private static final Log LOG = LogFactory.getLog(CheckListener.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(CheckListener.class);
/** active listener */
private boolean m_active = true;
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/ComponentHandler.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/ComponentHandler.java
index 84e70ec00..7d82580c7 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/ComponentHandler.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/ComponentHandler.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.rc.swt.listener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.driver.IEventThreadQueuer;
@@ -26,6 +26,7 @@ import org.eclipse.jubula.rc.common.listener.BaseAUTListener;
import org.eclipse.jubula.rc.swt.SwtAUTServer;
import org.eclipse.jubula.rc.swt.components.SwtAUTHierarchy;
import org.eclipse.jubula.rc.swt.driver.EventThreadQueuerSwtImpl;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.TimingConstantsServer;
import org.eclipse.jubula.tools.exception.InvalidDataException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
@@ -53,7 +54,7 @@ public class ComponentHandler extends BaseSwtEventListener
implements BaseAUTListener {
/** the logger */
- private static Log log = LogFactory.getLog(ComponentHandler.class);
+ private static Logger log = LoggerFactory.getLogger(ComponentHandler.class);
/** the Container hierarchy of the AUT*/
private static SwtAUTHierarchy autHierarchy = new SwtAUTHierarchy();
@@ -96,7 +97,7 @@ public class ComponentHandler extends BaseSwtEventListener
try {
return autHierarchy.getComponentIdentifier(component);
} catch (ComponentNotManagedException cnme) {
- log.warn(cnme);
+ log.warn(DebugConstants.ERROR, cnme);
throw new NoIdentifierForComponentException(
"unable to create an identifier for '" //$NON-NLS-1$
+ component + "'", //$NON-NLS-1$
@@ -151,7 +152,7 @@ public class ComponentHandler extends BaseSwtEventListener
try {
return autHierarchy.findComponent(componentIdentifier);
} catch (ComponentNotManagedException cnme) {
- log.warn(cnme);
+ log.warn(DebugConstants.ERROR, cnme);
if (retry) {
while (System.currentTimeMillis() - start < timeout) {
@@ -194,10 +195,10 @@ public class ComponentHandler extends BaseSwtEventListener
throw new ComponentNotFoundException(
cnme.getMessage(), MessageIDs.E_COMPONENT_NOT_FOUND);
} catch (IllegalArgumentException iae) {
- log.error(iae);
+ log.error(DebugConstants.ERROR, iae);
throw iae;
} catch (InvalidDataException ide) {
- log.error(ide);
+ log.error(DebugConstants.ERROR, ide);
throw new ComponentNotFoundException(
ide.getMessage(), MessageIDs.E_COMPONENT_NOT_FOUND);
}
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/FocusTracker.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/FocusTracker.java
index a043827b6..2d24869e8 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/FocusTracker.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/FocusTracker.java
@@ -10,10 +10,11 @@
*******************************************************************************/
package org.eclipse.jubula.rc.swt.listener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.rc.common.exception.RobotException;
import org.eclipse.jubula.rc.common.listener.BaseAUTListener;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.objects.event.EventFactory;
import org.eclipse.jubula.tools.objects.event.TestErrorEvent;
import org.eclipse.swt.SWT;
@@ -29,7 +30,7 @@ import org.eclipse.swt.widgets.Widget;
public class FocusTracker extends BaseSwtEventListener
implements BaseAUTListener {
/** the logger */
- private static Log log = LogFactory.getLog(FocusTracker.class);
+ private static Logger log = LoggerFactory.getLogger(FocusTracker.class);
/** <code>focusOwner</code> the current tracked focus owning Widget */
private static Widget focusOwner = null;
@@ -71,7 +72,7 @@ public class FocusTracker extends BaseSwtEventListener
this.getClass().getClassLoader());
try {
if (log.isDebugEnabled()) {
- log.debug(event);
+ log.debug(DebugConstants.ERROR, event);
}
switch (event.type) {
case SWT.FocusIn:
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/MappingListener.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/MappingListener.java
index 207f9f82c..e8ff641e7 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/MappingListener.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/MappingListener.java
@@ -10,13 +10,14 @@
*******************************************************************************/
package org.eclipse.jubula.rc.swt.listener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.message.ObjectMappedMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.Constants;
import org.eclipse.jubula.rc.common.exception.NoIdentifierForComponentException;
import org.eclipse.jubula.rc.swt.SwtAUTServer;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
import org.eclipse.jubula.tools.objects.IComponentIdentifier;
import org.eclipse.swt.SWT;
@@ -49,7 +50,8 @@ import org.eclipse.swt.widgets.Widget;
public class MappingListener extends AbstractAutSwtEventListener {
/** the logger */
- private static final Log LOG = LogFactory.getLog(MappingListener.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(MappingListener.class);
/**
* {@inheritDoc}
@@ -123,7 +125,7 @@ public class MappingListener extends AbstractAutSwtEventListener {
// no identifier for the component, LOG this as an error
LOG.error("no identifier for '" + currComp); //$NON-NLS-1$
} catch (CommunicationException ce) {
- LOG.error(ce);
+ LOG.error(DebugConstants.ERROR, ce);
// do nothing here: a closed connection
// is handled by the AUTServer
}
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java
index 02cde748f..aef83e9b6 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.rc.swt.listener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.Constants;
@@ -66,13 +66,13 @@ import org.eclipse.swt.widgets.Widget;
*
*/
public class RecordListener extends AbstractAutSwtEventListener {
-
/** the logger */
private static AutServerLogger log = new AutServerLogger(
RecordListener.class);
/** the logger */
- private static final Log LOG = LogFactory.getLog(RecordListener.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(RecordListener.class);
/** widget the popup is occured on */
private Widget m_popupSource = null;
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/utils/SwtUtils.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/utils/SwtUtils.java
index 96490c99a..b8fd8eb85 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/utils/SwtUtils.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/utils/SwtUtils.java
@@ -17,8 +17,8 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.CompSystemConstants;
import org.eclipse.jubula.rc.common.driver.IEventThreadQueuer;
@@ -75,7 +75,7 @@ public class SwtUtils {
private static final String GTK = "gtk"; //$NON-NLS-1$
/** the logger */
- private static Log log = LogFactory.getLog(SwtUtils.class);
+ private static Logger log = LoggerFactory.getLogger(SwtUtils.class);
/**
* Utility constructor
diff --git a/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF
index 68a967ff2..d098fd3e3 100644
--- a/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@ Bundle-Name: Jubula Toolkit Support
Bundle-SymbolicName: org.eclipse.jubula.toolkit.common;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.common.PluginStarter
-Require-Bundle: org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.ui;bundle-version="[3.6.1,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.apache.commons.logging;bundle-version="1.1.1",
- org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.core.databinding;bundle-version="[1.3.1,2.0.0)"
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.core.databinding;bundle-version="[1.3.1,2.0.0)",
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.jubula.toolkit.common,
org.eclipse.jubula.toolkit.common.businessprocess,
diff --git a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/businessprocess/ToolkitSupportBP.java b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/businessprocess/ToolkitSupportBP.java
index cfd112d7d..e58fd8b39 100644
--- a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/businessprocess/ToolkitSupportBP.java
+++ b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/businessprocess/ToolkitSupportBP.java
@@ -13,8 +13,8 @@ package org.eclipse.jubula.toolkit.common.businessprocess;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jubula.toolkit.common.IToolKitProvider;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.i18n.Messages;
@@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Composite;
public class ToolkitSupportBP {
/** The logger */
- private static Log log = LogFactory.getLog(ToolkitSupportBP.class);
+ private static Logger log = LoggerFactory.getLogger(ToolkitSupportBP.class);
/** Map of {@link IToolKitProvider} */
private static Map<ToolkitPluginDescriptor, IToolKitProvider>
diff --git a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/utils/ToolkitUtils.java b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/utils/ToolkitUtils.java
index b1cc226e4..28e0f8953 100644
--- a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/utils/ToolkitUtils.java
+++ b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/utils/ToolkitUtils.java
@@ -18,28 +18,28 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.i18n.Messages;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.ToolkitConstants;
import org.eclipse.jubula.tools.xml.businessmodell.CompSystem;
import org.eclipse.jubula.tools.xml.businessmodell.ToolkitPluginDescriptor;
import org.eclipse.swt.widgets.Composite;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author BREDEX GmbH
* @created 24.04.2007
*/
public class ToolkitUtils {
-
/** The logger */
- private static final Log LOG = LogFactory.getLog(ToolkitUtils.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(ToolkitUtils.class);
/** Map with description of toolkit level abstractness*/
private static Map<String, Integer> abstractness =
@@ -197,37 +197,37 @@ public class ToolkitUtils {
autConfigDialog = constructor.newInstance(
new Object[]{parent, style, autConfig, autName});
} catch (SecurityException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
throw new ToolkitPluginException(
logMsg.toString()
+ String.valueOf(className), e);
} catch (IllegalArgumentException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
throw new ToolkitPluginException(
logMsg.toString()
+ String.valueOf(className), e);
} catch (ClassNotFoundException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
throw new ToolkitPluginException(
logMsg.toString()
+ String.valueOf(className), e);
} catch (NoSuchMethodException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
throw new ToolkitPluginException(
logMsg.toString()
+ String.valueOf(className), e);
} catch (InstantiationException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
throw new ToolkitPluginException(
logMsg.toString()
+ String.valueOf(className), e);
} catch (IllegalAccessException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
throw new ToolkitPluginException(
logMsg.toString()
+ String.valueOf(className), e);
} catch (InvocationTargetException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
throw new ToolkitPluginException(
logMsg.toString()
+ String.valueOf(className), e);
diff --git a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/xml/businessprocess/ComponentBuilder.java b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/xml/businessprocess/ComponentBuilder.java
index a3fb64f42..9462b087c 100644
--- a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/xml/businessprocess/ComponentBuilder.java
+++ b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/xml/businessprocess/ComponentBuilder.java
@@ -17,8 +17,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
@@ -28,6 +26,7 @@ import org.eclipse.jubula.toolkit.common.PluginStarter;
import org.eclipse.jubula.toolkit.common.businessprocess.ToolkitSupportBP;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.i18n.Messages;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.ToolkitConstants;
import org.eclipse.jubula.tools.exception.GDConfigXmlException;
@@ -37,8 +36,8 @@ import org.eclipse.jubula.tools.utils.generator.AbstractComponentBuilder;
import org.eclipse.jubula.tools.xml.businessmodell.CompSystem;
import org.eclipse.jubula.tools.xml.businessmodell.ToolkitPluginDescriptor;
import org.eclipse.jubula.tools.xml.businessprocess.ConfigVersion;
-
-import com.thoughtworks.xstream.core.BaseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class contains methods for reading the configuration file and for
@@ -54,7 +53,7 @@ public class ComponentBuilder extends AbstractComponentBuilder {
private static ComponentBuilder instance;
/** The logger. */
- private static Log log = LogFactory.getLog(ComponentBuilder.class);
+ private static Logger log = LoggerFactory.getLogger(ComponentBuilder.class);
/**
@@ -103,12 +102,12 @@ public class ComponentBuilder extends AbstractComponentBuilder {
} catch (IOException fileNotFoundEx) {
final String msg = Messages.ComponenConfigurationNotFound
+ StringConstants.EXCLAMATION_MARK;
- log.fatal(msg, fileNotFoundEx);
+ log.error(msg, fileNotFoundEx);
throw new ToolkitPluginException(msg, fileNotFoundEx);
} catch (CoreException coreEx) {
final String msg = Messages.CouldNotCreateToolkitProvider
+ StringConstants.EXCLAMATION_MARK;
- log.fatal(msg, coreEx);
+ log.error(msg, coreEx);
throw new ToolkitPluginException(msg, coreEx);
}
}
@@ -158,13 +157,13 @@ public class ComponentBuilder extends AbstractComponentBuilder {
return descr;
}
} catch (NumberFormatException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
throw new ToolkitPluginException(
Messages.ErrorWhileReadingAttributes + StringConstants.COLON
+ StringConstants.SPACE
+ String.valueOf(toolkitId), e);
} catch (InvalidRegistryObjectException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
throw new ToolkitPluginException(
Messages.ErrorWhileReadingAttributes + StringConstants.COLON
+ StringConstants.SPACE
@@ -193,8 +192,8 @@ public class ComponentBuilder extends AbstractComponentBuilder {
if (super.getCompSystem() == null) {
try {
initCompSystem();
- } catch (BaseException e) {
- log.fatal(e.getMessage());
+ } catch (RuntimeException e) {
+ log.error(e.getMessage());
throw new GDConfigXmlException(e.getMessage(),
MessageIDs.E_GENERAL_COMPONENT_ERROR);
} catch (ToolkitPluginException tke) {
diff --git a/org.eclipse.jubula.toolkit.generate.interfaces/.classpath b/org.eclipse.jubula.toolkit.generate.interfaces/.classpath
index 406a82d34..2ec4aeaa9 100644
--- a/org.eclipse.jubula.toolkit.generate.interfaces/.classpath
+++ b/org.eclipse.jubula.toolkit.generate.interfaces/.classpath
@@ -5,5 +5,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.toolkit.common"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.tools"/>
+ <classpathentry kind="lib" path="/org.eclipse.jubula.rc.common.orbit/org.apache.commons.lang_2.4.0.v201005080502.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.toolkit.provider.base/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.base/META-INF/MANIFEST.MF
index 858f8b4bc..73f59a948 100644
--- a/org.eclipse.jubula.toolkit.provider.base/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.base/META-INF/MANIFEST.MF
@@ -4,8 +4,11 @@ Bundle-Name: Jubula Toolkit - Abstract
Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.base;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.base.PluginStarter
-Require-Bundle: org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Jubula
Bundle-ClassPath: .
diff --git a/org.eclipse.jubula.toolkit.provider.concrete/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.concrete/META-INF/MANIFEST.MF
index 67904d932..1094c02df 100644
--- a/org.eclipse.jubula.toolkit.provider.concrete/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.concrete/META-INF/MANIFEST.MF
@@ -5,7 +5,10 @@ Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.concrete;singleton:=tru
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.concrete.PluginStarter
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Jubula
Bundle-ClassPath: .
diff --git a/org.eclipse.jubula.toolkit.provider.html/.classpath b/org.eclipse.jubula.toolkit.provider.html/.classpath
index c377d8af1..5e4c1fe99 100644
--- a/org.eclipse.jubula.toolkit.provider.html/.classpath
+++ b/org.eclipse.jubula.toolkit.provider.html/.classpath
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jubula.toolkit.provider.html/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.html/META-INF/MANIFEST.MF
index 5ad9f6f41..817041872 100644
--- a/org.eclipse.jubula.toolkit.provider.html/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.html/META-INF/MANIFEST.MF
@@ -4,10 +4,15 @@ Bundle-Name: Jubula Toolkit - HTML
Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.html;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.html.PluginStarter
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.client.ui;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
- org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)"
+ org.eclipse.jubula.toolkit.provider.rcp;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.ui;bundle-version="[1.0.0,2.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Jubula
Bundle-ClassPath: .
diff --git a/org.eclipse.jubula.toolkit.provider.rcp.gef/.classpath b/org.eclipse.jubula.toolkit.provider.rcp.gef/.classpath
index da5d5f6e3..64c5e31b7 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp.gef/.classpath
+++ b/org.eclipse.jubula.toolkit.provider.rcp.gef/.classpath
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.toolkit.provider.rcp.gef/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.rcp.gef/META-INF/MANIFEST.MF
index 44036c908..97e0a72e3 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp.gef/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.rcp.gef/META-INF/MANIFEST.MF
@@ -5,8 +5,12 @@ Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.rcp.gef;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.rcp.gef.PluginStarter
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.toolkit.provider.rcp;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.jubula.toolkit.provider.rcp;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.eclipse.jubula.client.ui;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
+ org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";resolution:=optional
Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/ToolkitProvider.java b/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/ToolkitProvider.java
index 63fd7e4eb..51a7e96ad 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/ToolkitProvider.java
+++ b/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/ToolkitProvider.java
@@ -25,7 +25,6 @@ import org.eclipse.swt.widgets.Composite;
* @created 26.04.2007
*/
public class ToolkitProvider implements IToolKitProvider {
-
/**
* <code>I18N_PROPERTIES</code>
*/
diff --git a/org.eclipse.jubula.toolkit.provider.rcp/.classpath b/org.eclipse.jubula.toolkit.provider.rcp/.classpath
index 24afd70a7..472ee29b1 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp/.classpath
+++ b/org.eclipse.jubula.toolkit.provider.rcp/.classpath
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.toolkit.provider.rcp/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.rcp/META-INF/MANIFEST.MF
index 82f5cfecf..0dc77b8a0 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.rcp/META-INF/MANIFEST.MF
@@ -5,7 +5,12 @@ Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.rcp;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.rcp.PluginStarter
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jubula.toolkit.provider.swt;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.toolkit.provider.swt;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.ui;bundle-version="[1.0.0,2.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.jubula.toolkit.provider.rcp/src/org/eclipse/jubula/toolkit/provider/rcp/gui/RcpAutConfigComponent.java b/org.eclipse.jubula.toolkit.provider.rcp/src/org/eclipse/jubula/toolkit/provider/rcp/gui/RcpAutConfigComponent.java
index b35b91b33..add190297 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp/src/org/eclipse/jubula/toolkit/provider/rcp/gui/RcpAutConfigComponent.java
+++ b/org.eclipse.jubula.toolkit.provider.rcp/src/org/eclipse/jubula/toolkit/provider/rcp/gui/RcpAutConfigComponent.java
@@ -19,7 +19,6 @@ import org.eclipse.swt.widgets.Composite;
/**
* @author BREDEX GmbH
* @created Nov 23, 2007
- *
*/
public class RcpAutConfigComponent extends SwtAutConfigComponent {
diff --git a/org.eclipse.jubula.toolkit.provider.swing/.classpath b/org.eclipse.jubula.toolkit.provider.swing/.classpath
index 24afd70a7..472ee29b1 100644
--- a/org.eclipse.jubula.toolkit.provider.swing/.classpath
+++ b/org.eclipse.jubula.toolkit.provider.swing/.classpath
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.toolkit.provider.swing/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.swing/META-INF/MANIFEST.MF
index 2ba5bfb3c..740585646 100644
--- a/org.eclipse.jubula.toolkit.provider.swing/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.swing/META-INF/MANIFEST.MF
@@ -5,8 +5,11 @@ Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.swing;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.swing.PluginStarter
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jubula.client.ui;bundle-version="[1.0.0,2.0.0)";resolution:=optional
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.eclipse.jubula.client.ui;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
+ org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Jubula
Bundle-ClassPath: .
diff --git a/org.eclipse.jubula.toolkit.provider.swt/.classpath b/org.eclipse.jubula.toolkit.provider.swt/.classpath
index 24afd70a7..472ee29b1 100644
--- a/org.eclipse.jubula.toolkit.provider.swt/.classpath
+++ b/org.eclipse.jubula.toolkit.provider.swt/.classpath
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.toolkit.provider.swt/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.swt/META-INF/MANIFEST.MF
index 93b1d0f05..8f5f01ce7 100644
--- a/org.eclipse.jubula.toolkit.provider.swt/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.swt/META-INF/MANIFEST.MF
@@ -5,8 +5,12 @@ Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.swt;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.swt.PluginStarter
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.jubula.client.ui;bundle-version="[1.0.0,2.0.0)";resolution:=optional;visibility:=reexport
+ org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
+ org.eclipse.jubula.tools;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.toolkit.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jubula.client.ui;bundle-version="[1.0.0,2.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Jubula
Bundle-ClassPath: .
diff --git a/org.eclipse.jubula.toolkit.provider.swt/src/org/eclipse/jubula/toolkit/provider/swt/ToolkitProvider.java b/org.eclipse.jubula.toolkit.provider.swt/src/org/eclipse/jubula/toolkit/provider/swt/ToolkitProvider.java
index 19a1bfcf6..77c257eb2 100644
--- a/org.eclipse.jubula.toolkit.provider.swt/src/org/eclipse/jubula/toolkit/provider/swt/ToolkitProvider.java
+++ b/org.eclipse.jubula.toolkit.provider.swt/src/org/eclipse/jubula/toolkit/provider/swt/ToolkitProvider.java
@@ -46,8 +46,6 @@ public class ToolkitProvider implements IToolKitProvider {
autConfig, autName);
}
-
-
/**
* {@inheritDoc}
*/
@@ -62,5 +60,4 @@ public class ToolkitProvider implements IToolKitProvider {
public ResourceBundle getI18nResourceBundle() {
return ResourceBundle.getBundle(I18N_PROPERTIES);
}
-
}
diff --git a/org.eclipse.jubula.tools/.classpath b/org.eclipse.jubula.tools/.classpath
index ff871f8e3..b34f1a89c 100644
--- a/org.eclipse.jubula.tools/.classpath
+++ b/org.eclipse.jubula.tools/.classpath
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="lib" path="lib/xpp3_min-1.1.3.4.O.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/*"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.tools/META-INF/MANIFEST.MF b/org.eclipse.jubula.tools/META-INF/MANIFEST.MF
index d172fd7d3..70eba5281 100644
--- a/org.eclipse.jubula.tools/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.tools/META-INF/MANIFEST.MF
@@ -8,21 +8,8 @@ Bundle-ClassPath: .,
lib/xpp3_min-1.1.3.4.O.jar
Bundle-Vendor: Eclipse Jubula
Export-Package: com.thoughtworks.xstream,
- com.thoughtworks.xstream.alias,
com.thoughtworks.xstream.converters,
- com.thoughtworks.xstream.converters.basic,
- com.thoughtworks.xstream.converters.collections,
- com.thoughtworks.xstream.converters.enums,
- com.thoughtworks.xstream.converters.extended,
- com.thoughtworks.xstream.converters.javabean,
- com.thoughtworks.xstream.converters.reflection,
- com.thoughtworks.xstream.core,
- com.thoughtworks.xstream.core.util,
com.thoughtworks.xstream.io,
- com.thoughtworks.xstream.io.path,
- com.thoughtworks.xstream.io.xml,
- com.thoughtworks.xstream.io.xml.xppdom,
- com.thoughtworks.xstream.mapper,
org.eclipse.jubula.tools.constants,
org.eclipse.jubula.tools.exception,
org.eclipse.jubula.tools.i18n,
@@ -35,13 +22,7 @@ Export-Package: com.thoughtworks.xstream,
org.eclipse.jubula.tools.utils,
org.eclipse.jubula.tools.utils.generator,
org.eclipse.jubula.tools.xml.businessmodell,
- org.eclipse.jubula.tools.xml.businessprocess,
- org.xmlpull.mxp1,
- org.xmlpull.v1
+ org.eclipse.jubula.tools.xml.businessprocess
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Require-Bundle: org.apache.commons.lang;bundle-version="2.4.0",
- org.slf4j.jcl;bundle-version="1.5.11";visibility:=reexport,
- org.slf4j.log4j;bundle-version="1.5.11";visibility:=reexport,
- org.slf4j.api;bundle-version="1.5.11";visibility:=reexport,
- ch.qos.logback.classic;bundle-version="0.9.19";visibility:=reexport,
- ch.qos.logback.core;bundle-version="0.9.19";visibility:=reexport
+ org.slf4j.api;bundle-version="[1.5.11,2.0.0)"
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/DebugConstants.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/DebugConstants.java
index 7bfbe0ef2..8bce1f490 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/DebugConstants.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/DebugConstants.java
@@ -15,10 +15,12 @@ package org.eclipse.jubula.tools.constants;
* @created 26.03.2007
*/
public class DebugConstants {
-
/** constant for vm parameter debugging */
public static final String VM_DEBUG = "DEBUG"; //$NON-NLS-1$
+ /** <code>ERROR</code> */
+ public static final String ERROR = "An error occured: "; //$NON-NLS-1$
+
/** to prevent instantiation */
private DebugConstants() {
// do nothing
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/Assert.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/Assert.java
index 0361c42bb..40267013f 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/Assert.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/Assert.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.tools.exception;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class provides an assert mechanism. A condition can be passed
@@ -23,9 +23,8 @@ import org.apache.commons.logging.LogFactory;
* @created 08.10.2004
*/
public class Assert {
-
/** standard logging */
- private static Log log = LogFactory.getLog(Assert.class);
+ private static Logger log = LoggerFactory.getLogger(Assert.class);
/**
* not to use
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/CompSystemI18n.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/CompSystemI18n.java
index c5beb54c7..647a4fc51 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/CompSystemI18n.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/CompSystemI18n.java
@@ -23,9 +23,10 @@ import java.util.MissingResourceException;
import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Class to internationalize all compSystem strings
@@ -34,7 +35,7 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*/
public class CompSystemI18n {
/** the logger */
- private static Log log = LogFactory.getLog(CompSystemI18n.class);
+ private static Logger log = LoggerFactory.getLogger(CompSystemI18n.class);
/** List of ResourceBundles */
private static final List PLUGIN_BUNDLES = new LinkedList();
@@ -221,7 +222,7 @@ public class CompSystemI18n {
PLUGIN_BUNDLES.clear();
addResourceBundle(bundle);
} catch (IOException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
}
}
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/I18n.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/I18n.java
index 830173500..cefcde6ee 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/I18n.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/I18n.java
@@ -14,9 +14,9 @@ import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.tools.constants.StringConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author BREDEX GmbH
@@ -24,7 +24,7 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*/
public class I18n {
/** the logger */
- private static Log log = LogFactory.getLog(I18n.class);
+ private static Logger log = LoggerFactory.getLogger(I18n.class);
/**
* Name of the Bundle.
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/JarResources.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/JarResources.java
index 5d5ca6e51..5dceee72b 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/JarResources.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/JarResources.java
@@ -21,8 +21,8 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream;
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
/**
* JarResources: JarResources maps all resources included in a Zip or Jar file.
@@ -34,7 +34,7 @@ public final class JarResources {
// don't use logging because this may not work due to class loading
// problems and therefor may crash the application.
-// private static final Log LOG = LogFactory.getLog(JarResources.class);
+// private static final Logger LOG = LoggerFactory.getLogger(JarResources.class);
/**
* jar resource mapping tables
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/objects/ComponentIdentifier.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/objects/ComponentIdentifier.java
index ff95376d2..8d64ea8ca 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/objects/ComponentIdentifier.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/objects/ComponentIdentifier.java
@@ -18,11 +18,11 @@ import java.util.List;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.TestDataConstants;
import org.eclipse.jubula.tools.i18n.CompSystemI18n;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -45,7 +45,8 @@ public class ComponentIdentifier implements Serializable, IComponentIdentifier {
static final long serialVersionUID = 1031;
/** the logger */
- private static Log log = LogFactory.getLog(ComponentIdentifier.class);
+ private static Logger log = LoggerFactory.getLogger(
+ ComponentIdentifier.class);
/**
* the name of the class as which class is being handled as
@@ -129,7 +130,7 @@ public class ComponentIdentifier implements Serializable, IComponentIdentifier {
m_hierarchyNames.size() - 1);
}
} catch (ClassCastException cce) {
- log.fatal("unexpected element type", cce); //$NON-NLS-1$
+ log.error("unexpected element type", cce); //$NON-NLS-1$
}
return StringConstants.EMPTY;
}
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/serialisation/SerializedImage.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/serialisation/SerializedImage.java
index 1dad25025..5f6a39c58 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/serialisation/SerializedImage.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/serialisation/SerializedImage.java
@@ -17,8 +17,9 @@ import java.io.IOException;
import javax.imageio.ImageIO;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.eclipse.jubula.tools.constants.DebugConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author BREDEX GmbH
@@ -26,7 +27,8 @@ import org.apache.commons.logging.LogFactory;
*/
public class SerializedImage {
/** Logger */
- private static final Log LOG = LogFactory.getLog(SerializedImage.class);
+ private static final Logger LOG = LoggerFactory.getLogger(
+ SerializedImage.class);
/**
* <code>IMAGE_FORMAT</code>
@@ -60,7 +62,7 @@ public class SerializedImage {
si.setData(imageByteOutputStream.toByteArray());
imageByteOutputStream.close();
} catch (IOException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
}
return si;
}
@@ -78,7 +80,7 @@ public class SerializedImage {
si.getData());
bi = ImageIO.read(imageByteInputStream);
} catch (IOException e) {
- LOG.error(e);
+ LOG.error(DebugConstants.ERROR, e);
}
return bi;
}
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/DevNull.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/DevNull.java
index 8b426c71f..0b02cecf4 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/DevNull.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/DevNull.java
@@ -15,8 +15,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class reads buffered from an inputstream in a seperated thread.
@@ -26,9 +26,8 @@ import org.apache.commons.logging.LogFactory;
* @created 10.08.2004
*/
public class DevNull extends Thread {
-
/** the logger */
- private static Log log = LogFactory.getLog(DevNull.class);
+ private static Logger log = LoggerFactory.getLogger(DevNull.class);
/** the error stream if a SUN VM does not know -javaagent */
private static final String UNRECOGNIZED_SUN_JO =
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/EnvironmentUtils.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/EnvironmentUtils.java
index e0e536c7a..0974e609d 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/EnvironmentUtils.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/EnvironmentUtils.java
@@ -20,9 +20,9 @@ import java.util.Enumeration;
import java.util.Properties;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.tools.constants.StringConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utility class for handling environment variables.
@@ -74,7 +74,7 @@ public class EnvironmentUtils {
private static final String ENV_CMD_LINUX = "env"; //$NON-NLS-1$
/** the logger */
- private static Log log = LogFactory.getLog(EnvironmentUtils.class);
+ private static Logger log = LoggerFactory.getLogger(EnvironmentUtils.class);
/**
* Private constructor
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/generator/AbstractComponentBuilder.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/generator/AbstractComponentBuilder.java
index ec50d3812..4fff539cd 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/generator/AbstractComponentBuilder.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/utils/generator/AbstractComponentBuilder.java
@@ -21,14 +21,15 @@ import java.util.Iterator;
import java.util.List;
import java.util.ResourceBundle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.exception.GDConfigXmlException;
import org.eclipse.jubula.tools.i18n.CompSystemI18n;
import org.eclipse.jubula.tools.utils.ClassPathHacker;
import org.eclipse.jubula.tools.xml.businessmodell.CompSystem;
import org.eclipse.jubula.tools.xml.businessmodell.Component;
import org.eclipse.jubula.tools.xml.businessmodell.ToolkitPluginDescriptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.thoughtworks.xstream.XStream;
@@ -39,7 +40,8 @@ import com.thoughtworks.xstream.XStream;
public class AbstractComponentBuilder {
/** The logger. */
- private static Log log = LogFactory.getLog(AbstractComponentBuilder.class);
+ private static Logger log =
+ LoggerFactory.getLogger(AbstractComponentBuilder.class);
/** The component system loaded from the configuration files. */
private CompSystem m_compSystem;
@@ -125,7 +127,7 @@ public class AbstractComponentBuilder {
setToolkitDescriptorToComponents(compSystem, descr);
addToolkitToCompSystem(compSystem);
} catch (IOException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
}
String resourceBundlePath =
config.getResourceBundlePath(configName);
@@ -134,7 +136,7 @@ public class AbstractComponentBuilder {
new File(resourceBundlePath)
.getCanonicalFile());
} catch (IOException e) {
- log.error(e);
+ log.error(DebugConstants.ERROR, e);
e.printStackTrace();
}
String resourceBundleFQN = config
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/Action.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/Action.java
index 57882624a..f16f59611 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/Action.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/Action.java
@@ -19,8 +19,8 @@ import org.apache.commons.lang.Validate;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class represents an action which belongs to a component.
* For example an action is a click on a button or a check for a value.
@@ -31,9 +31,8 @@ import org.apache.commons.logging.LogFactory;
* @created 08.07.2004
*/
public class Action {
-
/** the logger */
- private static Log log = LogFactory.getLog(Action.class);
+ private static Logger log = LoggerFactory.getLogger(Action.class);
/** paramlist of action */
private List m_params = new ArrayList();
@@ -156,7 +155,7 @@ public class Action {
}
String message = "Param " + name //$NON-NLS-1$
+ " does not exist"; //$NON-NLS-1$
- log.fatal(message);
+ log.error(message);
return new InvalidParam();
}
/**
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/CompSystem.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/CompSystem.java
index e1ff07cc5..201bcc963 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/CompSystem.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/CompSystem.java
@@ -24,8 +24,6 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.ToolkitConstants;
import org.eclipse.jubula.tools.exception.GDConfigXmlException;
@@ -33,6 +31,8 @@ import org.eclipse.jubula.tools.i18n.CompSystemI18n;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.objects.event.TestErrorEvent;
import org.eclipse.jubula.tools.xml.businessprocess.ConfigVersion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class represents a container for all components which can be tested by
@@ -45,7 +45,7 @@ public class CompSystem {
public static final String EMPTY_EXTPOINT_ENTRY = "null"; //$NON-NLS-1$
/** The logger */
- private static Log log = LogFactory.getLog(CompSystem.class);
+ private static Logger log = LoggerFactory.getLogger(CompSystem.class);
/** The list of all components. */
private List m_components;
@@ -283,7 +283,7 @@ public class CompSystem {
if (current.getType().equals(component.getType())) {
final String msg = "multiple definition of component type " //$NON-NLS-1$
+ component.getType();
- log.fatal(msg);
+ log.error(msg);
throw new GDConfigXmlException(msg,
MessageIDs.E_MULTIPLE_COMPONENT);
}
@@ -595,7 +595,7 @@ public class CompSystem {
String message = "AbstractComponent " + ac.getType() //$NON-NLS-1$
+ " has no realizing concreteComponents"; //$NON-NLS-1$
if (ac.isVisible()) {
- log.fatal("visible " + message); //$NON-NLS-1$
+ log.error("visible " + message); //$NON-NLS-1$
throw new GDConfigXmlException("visible " + message, //$NON-NLS-1$
MessageIDs.E_NO_ABSTRACT_COMPONENT);
}
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/Component.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/Component.java
index ae916f21e..09888dc86 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/Component.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/Component.java
@@ -18,10 +18,10 @@ import java.util.Set;
import org.apache.commons.lang.Validate;
import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.tools.exception.GDConfigXmlException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class represents Components which can be tested by Jubula.
@@ -39,7 +39,7 @@ public abstract class Component {
/**
* The logger
*/
- private static Log log = LogFactory.getLog(Component.class);
+ private static Logger log = LoggerFactory.getLogger(Component.class);
/**
* List of directly realized Components
@@ -229,7 +229,7 @@ public abstract class Component {
+ " at component " + getType() //$NON-NLS-1$
+ ": method " + present.getMethod() //$NON-NLS-1$
+ " vs. method " + action.getMethod(); //$NON-NLS-1$
- log.fatal(msg);
+ log.error(msg);
throw new GDConfigXmlException(msg,
MessageIDs.E_DUPLICATE_ACTION);
}
@@ -287,7 +287,7 @@ public abstract class Component {
}
sb.append(") does not exist."); //$NON-NLS-1$
String message = sb.toString();
- log.fatal(message);
+ log.error(message);
throw new GDConfigXmlException(message, MessageIDs.E_NO_ACTION);
}

Back to the top