Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.app.cmd/.classpath4
-rw-r--r--org.eclipse.jubula.app.cmd/.settings/org.eclipse.jdt.core.prefs25
-rw-r--r--org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Client.java4
-rw-r--r--org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/batch/ExecutionController.java11
-rw-r--r--org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/i18n/Messages.java5
-rw-r--r--org.eclipse.jubula.app.dbtool/.classpath2
-rw-r--r--org.eclipse.jubula.app.dbtool/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF11
-rw-r--r--org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/core/DBToolClient.java24
-rw-r--r--org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/i18n/Messages.java19
-rw-r--r--org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/i18n/messages.properties5
-rw-r--r--org.eclipse.jubula.app/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.jubula.app/plugin.properties2
-rw-r--r--org.eclipse.jubula.app/product/jubula.product7
-rw-r--r--org.eclipse.jubula.app/src/org/eclipse/jubula/app/Launcher.java34
-rw-r--r--org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/ActionBuilder.java80
-rw-r--r--org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java20
-rw-r--r--org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchWindowAdvisor.java23
-rw-r--r--org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/WorkSpaceData.java3
-rw-r--r--org.eclipse.jubula.app/src/org/eclipse/jubula/app/i18n/Messages.java49
-rw-r--r--org.eclipse.jubula.app/src/org/eclipse/jubula/app/i18n/messages.properties31
-rw-r--r--org.eclipse.jubula.autagent/.classpath5
-rw-r--r--org.eclipse.jubula.autagent/buildScript.xml13
-rw-r--r--org.eclipse.jubula.autagent/resources/log4j.properties8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java30
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java40
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java9
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java30
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java4
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java5
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/GetMonitoringDataCommand.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/IMonitoring.java31
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringDataStore.java4
-rw-r--r--org.eclipse.jubula.autlauncher/.classpath1
-rw-r--r--org.eclipse.jubula.autlauncher/resources/log4j.properties5
-rw-r--r--org.eclipse.jubula.autlauncher/src/org/eclipse/jubula/autlauncher/GDRun.java1
-rw-r--r--org.eclipse.jubula.build/feature/client/.gitignore3
-rw-r--r--org.eclipse.jubula.build/feature/client/build.properties (renamed from org.eclipse.jubula.build/feature/client/client.build.properties)57
-rw-r--r--org.eclipse.jubula.build/feature/client/buildFeature.xml42
-rw-r--r--org.eclipse.jubula.build/feature/client/customTargets.xml206
-rw-r--r--org.eclipse.jubula.build/lib/sablecc/parameter.sable38
-rw-r--r--org.eclipse.jubula.build/lib/sablecc/sablecc.jarbin0 -> 300893 bytes
-rw-r--r--org.eclipse.jubula.client.archive/.classpath10
-rw-r--r--org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF13
-rw-r--r--org.eclipse.jubula.client.archive/build.properties3
-rw-r--r--org.eclipse.jubula.client.archive/customBuildCallbacks.xml4
-rw-r--r--org.eclipse.jubula.client.archive/lib/javax.xml.stream_1.0.1.v201004272200.jarbin0 -> 39697 bytes
-rw-r--r--org.eclipse.jubula.client.archive/lib/org.apache.xmlbeans.jarbin0 -> 2666695 bytes
-rw-r--r--org.eclipse.jubula.client.archive/model/archiveModel.xsd4
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlExporter.java16
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java156
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java283
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java150
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/converter/HTMLTechnicalComponentIndexConverter.java97
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/Messages.java104
-rw-r--r--org.eclipse.jubula.client.cmd.controller/src/org/eclipse/jubula/client/cmd/controller/IClcServer.java2
-rw-r--r--org.eclipse.jubula.client.cmd/.classpath2
-rw-r--r--org.eclipse.jubula.client.cmd/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF10
-rw-r--r--org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/AbstractCmdlineClient.java4
-rw-r--r--org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/ClientStrings.java2
-rw-r--r--org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/i18n/Messages.java92
-rw-r--r--org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/i18n/messages.properties4
-rw-r--r--org.eclipse.jubula.client.core/.checkstyle3
-rw-r--r--org.eclipse.jubula.client.core/.classpath7
-rw-r--r--org.eclipse.jubula.client.core/.externalToolBuilders/eclipselink-static-weaving.launch2
-rw-r--r--org.eclipse.jubula.client.core/.externalToolBuilders/gen-parser.launch8
-rw-r--r--org.eclipse.jubula.client.core/.project10
-rw-r--r--org.eclipse.jubula.client.core/META-INF/MANIFEST.MF107
-rw-r--r--org.eclipse.jubula.client.core/META-INF/persistence.xml1
-rw-r--r--org.eclipse.jubula.client.core/build.properties4
-rw-r--r--org.eclipse.jubula.client.core/customBuildCallbacks.xml4
-rw-r--r--org.eclipse.jubula.client.core/lib/.gitignore1
-rw-r--r--org.eclipse.jubula.client.core/lib/dom4j-1.6.1.jarbin0 -> 313898 bytes
-rw-r--r--org.eclipse.jubula.client.core/lib/poi-3.2-FINAL-20081019.jarbin0 -> 1428690 bytes
-rw-r--r--org.eclipse.jubula.client.core/resources/.gitignore1
-rw-r--r--org.eclipse.jubula.client.core/resources/hibernate.properties (renamed from org.eclipse.jubula.client.core/resources/hibernate.properties.template)0
-rw-r--r--org.eclipse.jubula.client.core/resources/schema.properties.template2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTest.java118
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/IClientTest.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/MessageFactory.java164
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutAgentRegistration.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractComponentNameMapper.java21
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractParamInterfaceBP.java2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompletenessGuard.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java54
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java9
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ExternalTestDataBP.java81
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/FileXMLReportWriter.java12
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/INameMapper.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/JobConfiguration.java18
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBP.java25
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBPDecorator.java17
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ProjectNameBP.java34
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TDVariableStore.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestCaseParamCheckBP.java33
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java247
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java11
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TreeOpsBP.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/UsedToolkitBP.java42
-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/businessprocess/db/TestCaseBP.java12
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestSuiteBP.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/treeoperations/CollectComponentNameUsersOp.java10
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/classloader/CryptClassLoader.java154
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTModeChangedCommand.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTServerStateCommand.java14
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStartedCommand.java14
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java21
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java18
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPTestResponseCommand.java77
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ConnectToAutResponseCommand.java3
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisconnectFromAutAgentResponseCommand.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisplayManualTestStepResponseCommand.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/EndTestExecutionResponseCommand.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetAutConfigMapResponseCommand.java5
-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.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ObjectMappedCommand.java20
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/RegisteredAutListCommand.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ServerLogResponseCommand.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java34
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StopAUTServerStateCommand.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/TakeScreenshotResponseCommand.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java79
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/BaseConnection.java49
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/ServerConnection.java28
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/ErrorMessagePresenter.java17
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/IDatabaseVersionErrorHandler.java2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/IErrorMessagePresenter.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/NoopErrorMessagePresenter.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/DataEventDispatcher.java94
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/i18n/Messages.java432
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/i18n/messages.properties399
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/AUTContPO.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/AUTMainPO.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CapPO.java24
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CategoryPO.java14
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CheckConfContPO.java28
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java18
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/DBVersionPO.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/DocAttributeDescriptionPO.java27
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ExecTestCasePO.java19
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/I18NStringPO.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ICheckConfContPO.java10
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingPO.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IProjectPO.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/LogicComponentNotManagedException.java (renamed from org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/GuiDancerLogicComponentNotManagedException.java)4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/MonitoringValuePO.java92
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingCategoryPO.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingPO.java14
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingProfilePO.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ParamDescriptionPO.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ParameterDetailsPO.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ProjectPO.java3
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReentryProperty.java53
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeBuilder.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeTracker.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReusedProjectPO.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/SpecObjContPO.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/SpecTestCasePO.java35
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TDManagerPO.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestCasePO.java9
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestDataCubeContPO.java10
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestDataCubePO.java3
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestJobContPO.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultNode.java25
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultSummaryPO.java25
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestSuiteContPO.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/CompNamePM.java97
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ComponentNameExistsException.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/DatabaseVersionConflictException.java2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java64
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/GeneralStorage.java39
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/HibernateUtil.java3
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Hibernator.java327
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/HibernatorException.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/IncompatibleTypeException.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MultipleNodePM.java25
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/NodePM.java61
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ObjectMappingManager.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PMException.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ParamNamePM.java11
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceManager.java44
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java232
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultPM.java27
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultSummaryPM.java53
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TransactionSupport.java10
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/ApplicationPO.java26
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/LockManager.java20
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/test/CAPTestDataTwo.java142
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/test/MessageCapTest.java61
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/BundleUtils.java17
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/DBSchemaPropertyCreator.java29
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/DefaultEventHandler.java24
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/GuiParamValueConverter.java35
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IParamRefSymbolsProvider.java2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ListenerManager.java3
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ModelParamValueConverter.java38
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ParamValueConverter.java88
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ParsedParameter.java217
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Parser.java630
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/PrefStoreHelper.java2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/RefToken.java33
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/SemanticParsingException.java47
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/SimpleValueToken.java19
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TokenError.java16
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java45
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TreeTraverser.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TreeTraverserContext.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/VariableToken.java38
-rw-r--r--org.eclipse.jubula.client.inspector.ui/.checkstyle17
-rw-r--r--org.eclipse.jubula.client.inspector.ui/META-INF/MANIFEST.MF16
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/ActivateInspectorResponseCommand.java3
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java7
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/contribution/InspectorActiveIndicator.java3
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/ActivateInspectorHandler.java8
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/CopyHierarchyHandler.java3
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/i18n/Messages.java38
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/i18n/messages.properties (renamed from org.eclipse.jubula.client.core/resources/c3p0.properties)7
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/provider/sourceprovider/InspectableAutSourceProvider.java4
-rw-r--r--org.eclipse.jubula.client.ua.cheatsheets/.classpath1
-rw-r--r--org.eclipse.jubula.client.ua.cheatsheets/.gitignore2
-rw-r--r--org.eclipse.jubula.client.ua.cheatsheets/.project5
-rw-r--r--org.eclipse.jubula.client.ua.cheatsheets/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.jubula.client.ua.cheatsheets/src/.empty0
-rw-r--r--org.eclipse.jubula.client.ua.help/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.jubula.client.ua.welcome/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.jubula.client.ui/.classpath5
-rw-r--r--org.eclipse.jubula.client.ui/.settings/org.eclipse.jdt.core.prefs25
-rw-r--r--org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF41
-rw-r--r--org.eclipse.jubula.client.ui/plugin.properties29
-rw-r--r--org.eclipse.jubula.client.ui/plugin.xml286
-rw-r--r--org.eclipse.jubula.client.ui/schema/propertyPages.exsd4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/Plugin.java142
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/AbstractAction.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/AbstractNewTestCaseAction.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/CreateNewVersionAction.java60
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/CutTreeItemActionGDEditor.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/DeleteProjectAction.java18
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/DisconnectAction.java27
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/ExportAllAction.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/ExportFileAction.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/MoveTestCaseAction.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/NewProjectAction.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/NewTestCaseActionTCBrowser.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/OMMarkInAutAction.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/OMStopMappingModeAction.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/OpenProjectAction.java26
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/PasteTreeItemActionOMEditor.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/PasteTreeItemActionTCBrowser.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/SaveProjectAsAction.java69
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/SelectDatabaseAction.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/ShowClientLogAction.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/adapter/PropertySourceAdapterFactory.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/attribute/DefaultListRenderer.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ExportAllBP.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ImportFileBP.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ProblemsBP.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ShowClientLogBP.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/ShowServerLogBP.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/businessprocess/TextControlBP.java18
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/constants/Constants.java25
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/constants/ContextHelpIds.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/constants/IconConstants.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/constants/InputCodeHelper.java38
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/constants/Layout.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/CompNamePopupTextFieldToolTipListener.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/JubulaStateController.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/GDStateController.java)15
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/PMExceptionHandler.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/ProgressController.java25
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionGUIController.java16
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TreeViewContainerGUIController.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/EventHandlerDropTargetListener.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/TCBrowserDndSupport.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/TCEditorDndSupport.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/TJEditorDndSupport.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/TestSpecDropTargetListener.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/objectmapping/OMDropTargetListener.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertydescriptors/IntegerTextPropertyDescriptor.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertydescriptors/GDIntegerTextPropertyDescriptor.java)11
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertydescriptors/JBPropertyDescriptor.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertydescriptors/GDPropertyDescriptor.java)8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertydescriptors/ParamComboPropertyDescriptor.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertydescriptors/GDParamComboPropertyDescriptor.java)4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertydescriptors/ParamTextPropertyDescriptor.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertydescriptors/GDParamTextPropertyDescriptor.java)4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertydescriptors/PopupCompNameTextPropertyDescriptor.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertydescriptors/GDPopupCompNameTextPropertyDescriptor.java)10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/AbstractGuiNodePropertySource.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/AbstractPropertySource.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/CapGUIPropertySource.java28
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/EventExecTestCaseGUIPropertySource.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/ExecTestCaseGUIPropertySource.java14
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/OMLogicNameGUIPropertySource.java14
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/OMTechNameGUIPropertySource.java22
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/SpecTestCaseGUIPropertySource.java14
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/TestResultNodeGUIPropertySource.java38
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/TestSuiteGUIPropertySource.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/databinding/SimpleIntegerToStringConverter.java47
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/databinding/SimpleStringToIntegerConverter.java68
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/AUTPropertiesDialog.java34
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/AbstractEditParametersDialog.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/AddEventHandlerDialog.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/ClassPathDialog.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/CompNameExistsDialog.java16
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/DBLoginDialog.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/DatabaseConnectionDialog.java78
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EditParametersDialog.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EnterAutIdDialog.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EnterCommentDialog.java14
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EnterLogicalCompNameDialog.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EnterTestDataManagerDialog.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/InputDialog.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/JBPropertyDialog.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/GDPropertyDialog.java)6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/NewCAPDialog.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/NewServerPortDialog.java5
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/ProjectDialog.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/TestCaseTreeDialog.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/VersionDialog.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractJBEditor.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractGDEditor.java)36
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractTestCaseEditor.java18
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/CentralTestDataEditor.java20
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/IJBEditor.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/IGDEditor.java)6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/JBEditorHelper.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/GDEditorHelper.java)18
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingConfigComponent.java31
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingMultiPageEditor.java31
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/TestCaseEditor.java25
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/TestJobEditor.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/TestResultViewer.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/events/GuiEventDispatcher.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/extensions/ProjectPropertyExtensionHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/factory/TestDataControlFactory.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/filter/JBBrowserPatternFilter.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/filter/GDBrowserPatternFilter.java)2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/filter/JBFilteredTree.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/filter/GDFilteredTree.java)4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/filter/JBPatternFilter.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/filter/GDPatternFilter.java)6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/filter/ObjectMappingEditorPatternFilter.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/AbstractEditParametersHandler.java16
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/AbstractStartTestHandler.java9
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/AddExistingEventHandlerHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/AddNewCategoryHandler.java22
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/AddNewTestDataManagerHandler.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/AddTestResultSummaryCommentHandler.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/CreateAutDefinitionHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/DeleteTestresultsHandler.java3
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/EditParametersHandler.java16
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/EditTDMParametersHandler.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/ExtractTestCaseHandler.java31
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/MergeComponentNameInViewHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/MergeLogicalNameHandler.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/NewComponentNameInViewHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/NewLogicalNameHandler.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/NewTestJobHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/NewTestSuiteHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/OMNewCategoryHandler.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/ProjectPropertiesHandler.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/RefreshProjectHandler.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/RefreshTestresultsHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/RenameLogicalNameHandler.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/RevertEditorChangesHandler.java11
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/StartObjectMappingModeHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/StartObservationModeHandler.java14
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/StopAutHandler.java13
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/ToggleActiveStatusHandler.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/delete/DeleteComponentNameInViewHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/delete/DeleteHandlerHelper.java3
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/delete/DeleteTestDataManagerHandler.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/delete/DeleteTreeItemHandlerOMEditor.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/delete/DeleteTreeItemHandlerTCBrowser.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/delete/DeleteTreeItemHandlerTCEditor.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/delete/DeleteTreeItemHandlerTSBrowser.java22
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/existing/testcase/AbstractReferenceExistingTestCase.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/newcap/AbstractNewCAP.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/open/AbstractOpenHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/rename/AbstractRenameTreeItemHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/rename/RenameCategoryHandlerOMEditor.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/rename/RenameComponentNameInViewHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/rename/RenameTestDataCubeInEditorHandler.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/switchto/SwitchToDataSetViewHandler.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/model/CapGUI.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/model/DatabaseConnection.java134
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/model/DatabaseConnectionInfo.java61
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/model/ExecTestCaseGUI.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/model/H2ConnectionInfo.java52
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/model/OracleConnectionInfo.java100
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/model/SpecTestCaseGUI.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/DatabaseConnectionPreferencePage.java270
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/ObjectMappingPreferencePage.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/ObservationPreferencePage.java18
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/PrefPageBasic.java18
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/TestResultPreferencePage.java20
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/utils/InputComboUtil.java20
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/utils/Utils.java16
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/properties/AUTPropertyPage.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/properties/AbstractProjectPropertyPage.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/properties/ProjectGeneralPropertyPage.java30
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/properties/ProjectLanguagePropertyPage.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/properties/ProjectUsedPropertyPage.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/ControlDecorator.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/GDControlDecorator.java)4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contentprovider/AbstractTreeViewContentProvider.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contentprovider/AbstractGDTreeViewContentProvider.java)5
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contentprovider/CentralTestDataContentProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contentprovider/ComponentNameBrowserContentProvider.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contentprovider/ISortableTreeViewContentProvider.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contentprovider/IGDSortableTreeViewContentProvider.java)3
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contentprovider/TestCaseBrowserContentProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contentprovider/TestCaseEditorContentProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contentprovider/TestJobEditorContentProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contentprovider/TestSuiteBrowserContentProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contentprovider/objectmapping/OMEditorTreeContentProvider.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contextprovider/JBContextProvider.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/contextprovider/GDContextProvider.java)4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/CentralTestDataLabelProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/DirtyStarListLabelProvider.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/GeneralLabelProvider.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/GeneralGDLabelProvider.java)2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/TestSuiteBrowserLabelProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/decorators/MissingReferenceDecorator.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/decorators/TestDataDecorator.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/SearchResultPage.java14
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/ShowWhereUsedSpecTcQuery.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/TestDataSearchQuery.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/result/BasicSearchResult.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/AbstractJBSourceProvider.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/AbstractGDSourceProvider.java)4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/ActiveProjectSourceProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/AutServerSourceProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/AutStarterStateSourceProvider.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/AutStateSourceProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/AvailableAutSourceProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/TestExecutionSourceProvider.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/CommandHelper.java27
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/JBThread.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/GDThread.java)20
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/SelectionChecker.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/ServerManager.java24
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/Utils.java37
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/AbstractJBTreeView.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/AbstractGDTreeView.java)14
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/CompNamesPage.java24
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/CompNamesView.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/ComponentNameBrowser.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/IJBPart.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/IGDPart.java)11
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/JBPropertiesView.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/GDPropertiesView.java)69
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestCaseBrowser.java20
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestResultTreeView.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestSuiteBrowser.java14
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestresultSummaryView.java45
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TreeBuilder.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/dataset/AbstractDataSetPage.java38
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/dataset/DataSetView.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/dataset/GDDataSetView.java)14
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/GDActionCopyMarker.java210
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/GDDialogMarkerProperties.java542
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/GDLocationField.java146
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/JBMarkerResolutionGenerator.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/GDMarkerResolutionGenerator.java)12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/AbstractToolTipListener.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/AutConfigComponent.java60
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/AutIdListComposite.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/CheckedText.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/CompNamesProposalProvider.java5
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/IGDCheckable.java24
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/JBText.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/GDText.java)10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/JavaAutConfigComponent.java115
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ListElementChooserComposite.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ModifiableTriggerList.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/StatusLineContributionItem.java (renamed from org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/GDStatusLineContributionItem.java)7
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/TreeElementChooserComposite.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/UIComponentHelper.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/DatabaseMigrationAssistant.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ExportTestResultDetailsWizard.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ProjectWizard.java14
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/AUTSettingWizardPage.java30
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/DatabaseConnectionWizardPage.java405
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportProjectsWizardPage.java10
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportXLSTestdataWizardPage.java9
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ProjectSettingWizardPage.java33
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/x30
-rw-r--r--org.eclipse.jubula.communication/META-INF/MANIFEST.MF7
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/Communicator.java14
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/AutStarterSocket.java8
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/Connection.java4
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/ConnectionState.java38
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/GDSocket.java52
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/BuildMonitoringReportMessage.java8
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ConnectToAutMessage.java4
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ConnectToClientMessage.java18
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/InspectorComponentSelectedMessage.java2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageHeader.java13
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ResetMonitoringDataMessage.java9
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendAUTListOfSupportedComponentsMessage.java2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogResponseMessage.java12
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerMessage.java22
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/swing/SendSwingAUTListOfSupportedComponentsMessage.java2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/swt/SendSwtAUTListOfSupportedComponentsMessage.java2
-rw-r--r--org.eclipse.jubula.documentation.gen/.classpath1
-rw-r--r--org.eclipse.jubula.documentation.gen/lib/commons-configuration-1.2.jarbin0 -> 163822 bytes
-rw-r--r--org.eclipse.jubula.documentation.gen/script/build.xml72
-rw-r--r--org.eclipse.jubula.documentation.gen/script/texgen.sh2
-rw-r--r--org.eclipse.jubula.documentation/extensionapi/javadoc/javadoc.xml46
-rw-r--r--org.eclipse.jubula.documentation/gefapi/javadoc/javadoc.xml16
-rw-r--r--[-rwxr-xr-x]org.eclipse.jubula.documentation/script/html/NodeParser.pl0
-rw-r--r--[-rwxr-xr-x]org.eclipse.jubula.documentation/script/html/common.pl0
-rw-r--r--[-rwxr-xr-x]org.eclipse.jubula.documentation/script/html/fixAnchor.pl0
-rw-r--r--[-rwxr-xr-x]org.eclipse.jubula.documentation/script/html/fiximages.pl0
-rw-r--r--[-rwxr-xr-x]org.eclipse.jubula.documentation/script/html/generateContext.pl0
-rw-r--r--[-rwxr-xr-x]org.eclipse.jubula.documentation/script/html/latex2eclipse.pl0
-rw-r--r--[-rwxr-xr-x]org.eclipse.jubula.documentation/script/html/latex2html.pl0
-rw-r--r--[-rwxr-xr-x]org.eclipse.jubula.documentation/script/image/psd2latex0
-rw-r--r--org.eclipse.jubula.examples.app.cmd.controller/src/org/eclipse/jubula/examples/app/cmd/controller/CommandLineClientRemoteControl.java4
-rw-r--r--org.eclipse.jubula.examples.aut.adder.swt/buildScript.xml2
-rw-r--r--org.eclipse.jubula.examples.extension.rcp.toolkit/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.jubula.examples.extension.rcp.toolkit/src/org/eclipse/jubula/examples/extension/rcp/toolkit/provider/RcpExtensionProvider.java2
-rw-r--r--org.eclipse.jubula.examples.extension.swing.aut/src/org/eclipse/jubula/examples/extension/swing/aut/JSliderExampleAUT.java2
-rw-r--r--org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/swing/swing/implclasses/JSliderImplClass.java2
-rw-r--r--org.eclipse.jubula.examples.extension.swing.toolkit/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.jubula.examples.extension.swing.toolkit/src/org/eclipse/jubula/examples/extension/swing/toolkit/provider/MyToolkitProvider.java2
-rw-r--r--org.eclipse.jubula.examples/resources/development/gef/com.bredexsw.guidancer.examples.logic.identifier.zipbin0 -> 7873 bytes
-rw-r--r--org.eclipse.jubula.examples/resources/projects/samples/Samples_5.0.xmlbin534032 -> 498850 bytes
-rw-r--r--org.eclipse.jubula.feature.client/feature.xml91
-rw-r--r--org.eclipse.jubula.feature.cmd/feature.xml14
-rw-r--r--org.eclipse.jubula.feature.dbtool/feature.xml16
-rw-r--r--org.eclipse.jubula.feature/feature.xml8
-rw-r--r--org.eclipse.jubula.project.compatibility/lib/swt_3.1.jarbin0 -> 1216222 bytes
-rw-r--r--org.eclipse.jubula.project.compatibility/plugins/org.eclipse.core.runtime_3.1.0.jarbin0 -> 453884 bytes
-rw-r--r--org.eclipse.jubula.project.compatibility/plugins/org.eclipse.jface_3.1.0.jarbin0 -> 667433 bytes
-rw-r--r--org.eclipse.jubula.project.compatibility/plugins/org.eclipse.osgi_3.1.0.jarbin0 -> 743067 bytes
-rw-r--r--org.eclipse.jubula.project.compatibility/plugins/org.eclipse.swt.gtk.linux.x86_3.1.0.jarbin0 -> 1377739 bytes
-rw-r--r--org.eclipse.jubula.project.compatibility/plugins/org.eclipse.ui.workbench_3.1.0.jarbin0 -> 2866275 bytes
-rw-r--r--org.eclipse.jubula.project.compatibility/plugins/org.eclipse.ui_3.1.0.jarbin0 -> 121156 bytes
-rw-r--r--org.eclipse.jubula.project.configuration/target/definitions/jubula.target6
-rw-r--r--org.eclipse.jubula.rc.common.agent/.classpath4
-rw-r--r--org.eclipse.jubula.rc.common/.classpath5
-rw-r--r--org.eclipse.jubula.rc.common/lib/.keep0
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java72
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServerConfiguration.java22
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AutServerLauncher.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/classloader/ImplClassClassLoader.java4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/classloader/JBUrlClassLoader.java (renamed from org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/classloader/GDUrlClassLoader.java)7
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractCapTestCommand.java23
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractSendAUTListOfSupportedComponentsCommand.java22
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/components/AUTHierarchy.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/components/FindComponentBP.java3
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/driver/ClickOptions.java4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/driver/IEventThreadQueuer.java4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/driver/IRobot.java6
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/driver/RunnableWrapper.java2
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/ComponentNotFoundException.java (renamed from org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/GuiDancerComponentNotFoundException.java)4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/ComponentNotManagedException.java (renamed from org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/GuiDancerComponentNotManagedException.java)4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/EventSupportException.java4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/ExecutionEvent.java4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/InvalidImplClassException.java (renamed from org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/GuiDancerInvalidImplClassException.java)4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/NoIdentifierForComponentException.java (renamed from org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/GuiDancerNoIdentifierForComponentException.java)4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/OsNotSupportedException.java (renamed from org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/GuiDancerOsNotSupportedException.java)6
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/RobotException.java2
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/UnsupportedComponentException.java (renamed from org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/GuiDancerUnsupportedComponentException.java)6
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/implclasses/DefaultComponentFactory.java10
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/implclasses/IComponentFactory.java10
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/implclasses/IndexConverter.java21
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/implclasses/MenuUtilBase.java12
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/implclasses/Verifier.java4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/implclasses/tree/AbstractSelectTreeNodeOperation.java2
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/implclasses/tree/SelectTreeNodeOperation.java2
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/registration/AgentRegisterAut.java4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/util/WorkaroundUtil.java2
-rw-r--r--org.eclipse.jubula.rc.orbit/.project11
-rw-r--r--org.eclipse.jubula.rc.orbit/org.apache.commons.beanutils_1.7.0.v200902170505.jarbin0 -> 201353 bytes
-rw-r--r--org.eclipse.jubula.rc.orbit/org.apache.commons.cli_1.2.0.v201011021000.jarbin0 -> 48246 bytes
-rw-r--r--org.eclipse.jubula.rc.orbit/org.apache.commons.collections_3.2.0.v201005080500.jarbin0 -> 611223 bytes
-rw-r--r--org.eclipse.jubula.rc.orbit/org.apache.commons.lang_2.4.0.v201005080502.jarbin0 -> 275223 bytes
-rw-r--r--org.eclipse.jubula.rc.orbit/org.apache.commons.logging_1.1.1.v201005080502.jarbin0 -> 68099 bytes
-rw-r--r--org.eclipse.jubula.rc.orbit/org.apache.log4j_1.2.15.v201005080500.jarbin0 -> 413982 bytes
-rw-r--r--org.eclipse.jubula.rc.orbit/org.apache.oro_2.0.8.v201005080400.jarbin0 -> 75635 bytes
-rw-r--r--org.eclipse.jubula.rc.orbit/org.slf4j.api_1.5.11.v20100519-1910.jarbin0 -> 31763 bytes
-rw-r--r--org.eclipse.jubula.rc.orbit/org.slf4j.jcl_1.5.11.v20100419-1106.jarbin0 -> 23551 bytes
-rw-r--r--org.eclipse.jubula.rc.orbit/org.slf4j.log4j_1.5.11.v20100419-1106.jarbin0 -> 17654 bytes
-rw-r--r--org.eclipse.jubula.rc.rcp/.classpath1
-rw-r--r--org.eclipse.jubula.rc.rcp/META-INF/MANIFEST.MF18
-rw-r--r--org.eclipse.jubula.rc.rcp/build.properties7
-rw-r--r--org.eclipse.jubula.rc.rcp/src/org/eclipse/jubula/rc/rcp/gef/inspector/GefInspectorListenerAppender.java2
-rw-r--r--org.eclipse.jubula.rc.rcp/src/org/eclipse/jubula/rc/rcp/gef/util/FigureCanvasUtil.java2
-rw-r--r--org.eclipse.jubula.rc.swing/.classpath1
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java2
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/commands/CAPTestCommand.java4
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/commands/SendAUTListOfSupportedComponentsCommand.java6
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java302
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/driver/RobotFactoryConfig.java2
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/AbstractAutSwingEventListener.java (renamed from org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/AbstractGDAutSwingEventListener.java)14
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/BaseAWTEventListener.java2
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/CheckListener.java14
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/ComponentHandler.java34
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/MappingListener.java22
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordActions.java8
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordListener.java16
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/driver/EventThreadQueuerAwtImpl.java4
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/driver/RobotAwtImpl.java2
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/JComboBoxImplClass.java27
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/JListImplClass.java10
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/JTreeImplClass.java10
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/SwingApplicationImplClass.java4
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/utils/WorkerRunnable.java66
-rw-r--r--org.eclipse.jubula.rc.swt/.classpath1
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/SwtAUTServer.java23
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/CAPTestCommand.java4
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/SendAUTListOfSupportedComponentsCommand.java6
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtAUTHierarchy.java28
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/EventThreadQueuerSwtImpl.java4
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/RobotFactoryConfig.java2
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/RobotSwtImpl.java14
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/AbstractComboBoxImplClass.java24
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/CTabFolderImplClass.java12
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/ListImplClass.java12
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/SwtApplicationImplClass.java4
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/TableTreeImplClass.java10
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/TreeImplClass.java10
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/tree/ToggleCheckboxOperation.java2
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/tree/VerifyCheckboxOperation.java2
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractAutSwtEventListener.java (renamed from org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractGDAutSwtEventListener.java)14
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/BaseSwtEventListener.java2
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java6
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/ComponentHandler.java32
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/MappingListener.java6
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordActionsSWT.java8
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java11
-rw-r--r--org.eclipse.jubula.toolkit.common/.checkstyle3
-rw-r--r--org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF12
-rw-r--r--org.eclipse.jubula.toolkit.common/build.properties14
-rw-r--r--org.eclipse.jubula.toolkit.common/schema/com.bredexsw.guidancer.toolkitsupport.exsd4
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/businessprocess/ToolkitSupportBP.java17
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/i18n/Messages.java47
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/i18n/messages.properties12
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/monitoring/MonitoringAttribute.java4
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/monitoring/MonitoringUtils.java17
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/utils/ToolkitUtils.java33
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/xml/businessprocess/ComponentBuilder.java20
-rw-r--r--org.eclipse.jubula.toolkit.generate.interfaces/buildScript.xml24
-rw-r--r--org.eclipse.jubula.toolkit.generate.interfaces/lib/commons-configuration-1.1.jarbin0 -> 124282 bytes
-rw-r--r--org.eclipse.jubula.toolkit.generate.interfaces/resources/interface.properties2
-rw-r--r--org.eclipse.jubula.toolkit.provider.base/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.jubula.toolkit.provider.concrete/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.jubula.toolkit.provider.html/META-INF/MANIFEST.MF9
-rw-r--r--org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xml14
-rw-r--r--org.eclipse.jubula.toolkit.provider.html/src/org/eclipse/jubula/toolkit/provider/html/gui/HtmlAutConfigComponent.java38
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp.gef/.project6
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp.gef/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp/.project6
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.jubula.toolkit.provider.swing/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.jubula.toolkit.provider.swt/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.jubula.tools/.classpath11
-rw-r--r--org.eclipse.jubula.tools/META-INF/MANIFEST.MF58
-rw-r--r--org.eclipse.jubula.tools/build.properties4
-rw-r--r--org.eclipse.jubula.tools/buildScript.xml3
-rw-r--r--org.eclipse.jubula.tools/lib/xpp3_min-1.1.3.4.O.jarbin0 -> 24677 bytes
-rw-r--r--org.eclipse.jubula.tools/lib/xstream-1.3.1.jarbin0 -> 431406 bytes
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/CommandConstants.java6
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/MonitoringConstants.java39
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/StringConstants.java21
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/CommunicationException.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/ConfigurationException.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/ConverterException.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/GDConfigXmlException.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/IncompleteDataException.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/InvalidDataException.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/JBException.java (renamed from org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/GDException.java)6
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/JBFatalAbortException.java (renamed from org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/GDFatalAbortException.java)26
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/JBFatalException.java (renamed from org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/GDFatalException.java)14
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/JBRuntimeException.java (renamed from org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/GDRuntimeException.java)14
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/JBVersionException.java (renamed from org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/GDVersionException.java)10
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/ProjectDeletedException.java (renamed from org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/GDProjectDeletedException.java)7
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/SerialisationException.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/TestCaseParamCheckException.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/UnexpectedGenericTypeException.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/i18n/guidancerStrings.properties91
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/IVersion.java (renamed from org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/jarutils/IGdVersion.java)38
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/objects/IMonitoringValue.java42
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/objects/MonitoringValue.java92
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/serialisation/IXmlSerializer.java8
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/serialisation/XStreamXmlSerializer.java6
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/AbstractComponent.java7
-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.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/ConcreteComponent.java4
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/ParamValueSet.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessmodell/ToolkitPluginDescriptor.java2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessprocess/ConfigVersion.java24
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessprocess/XStreamXmlAttributeConverter.java2
680 files changed, 8707 insertions, 6764 deletions
diff --git a/org.eclipse.jubula.app.cmd/.classpath b/org.eclipse.jubula.app.cmd/.classpath
index 5061f0ef6..6dca1f5f4 100644
--- a/org.eclipse.jubula.app.cmd/.classpath
+++ b/org.eclipse.jubula.app.cmd/.classpath
@@ -1,12 +1,12 @@
<?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="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 combineaccessrules="false" kind="src" path="/org.eclipse.jubula.client.cmd.controller"/>
+ <classpathentry exported="true" kind="lib" path="lib/org.eclipse.jubula.client.cmd.controller.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.app.cmd/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.app.cmd/.settings/org.eclipse.jdt.core.prefs
index 3cb7c2644..6bc49a902 100644
--- a/org.eclipse.jubula.app.cmd/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jubula.app.cmd/.settings/org.eclipse.jdt.core.prefs
@@ -1,13 +1,12 @@
-#Mon Feb 18 14:22:08 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=error
-org.eclipse.jdt.core.compiler.source=1.5
+#Thu Jan 06 12:33:29 CET 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF b/org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF
index ecd5cdf6f..e3919d1f9 100644
--- a/org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF
@@ -1,11 +1,13 @@
Bundle-SymbolicName: org.eclipse.jubula.app.cmd;singleton=true
Bundle-Name: Jubula Commandline Client (Incubation)
-Bundle-Version: 0.4.0
+Bundle-Version: 0.9.0.qualifier
Bundle-Vendor: Eclipse Jubula
Bundle-Activator: org.eclipse.jubula.app.cmd.PluginStarter
Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.jubula.client.cmd,
- org.eclipse.jubula.client.core
+Require-Bundle: org.eclipse.jubula.client.cmd;bundle-version="[0.9.0,1.0.0)",
+ org.eclipse.jubula.client.core;bundle-version="[0.9.0,1.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)"
Bundle-ClassPath: org.eclipse.jubula.app.cmd.jar,
lib/org.eclipse.jubula.client.cmd.controller.jar
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 188170d02..813fb3159 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
@@ -23,7 +23,7 @@ import org.eclipse.jubula.client.core.businessprocess.ClientTestStrings;
import org.eclipse.jubula.client.core.businessprocess.JobConfiguration;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
-import org.eclipse.jubula.tools.exception.GDFatalException;
+import org.eclipse.jubula.tools.exception.JBFatalException;
/**
* @created Mar 21, 2006
@@ -87,7 +87,7 @@ public class Client extends AbstractCmdlineClient {
} catch (IllegalArgumentException e) {
log.error(e);
printConsoleError(e.getMessage());
- } catch (GDFatalException e) {
+ } catch (JBFatalException e) {
log.error(e);
printConsoleError(e.getMessage());
} catch (Throwable 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 e06ec8090..f144aa551 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
@@ -72,7 +72,7 @@ import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
-import org.eclipse.jubula.tools.exception.GDException;
+import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.i18n.I18n;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.registration.AutIdentifier;
@@ -248,7 +248,7 @@ public class ExecutionController implements IAUTServerEventListener,
}
/**
- * Name of the environment variable that defines the time GUIdancer should
+ * Name of the environment variable that defines the time the client should
* wait during AUT startup process.
*/
private static final String AUT_STARTUP_DELAY_VAR = "GD_AUT_STARTUP_DELAY"; //$NON-NLS-1$
@@ -373,7 +373,6 @@ public class ExecutionController implements IAUTServerEventListener,
timer.start();
}
// init ClientTest
- // guidancerConfig.xml has to be added to classpath
IClientTest clientTest = ClientTestFactory.getClientTest();
clientTest.connectToServer(m_job.getServer(), m_job.getPort());
if (!ServerConnection.getInstance().isConnected()) {
@@ -455,7 +454,7 @@ public class ExecutionController implements IAUTServerEventListener,
}
/**
- * run a GUIdancer job
+ * run a test job
*/
private void doSingleJob() {
AbstractCmdlineClient.printConsoleLn(
@@ -780,7 +779,7 @@ public class ExecutionController implements IAUTServerEventListener,
+ NLS.bind(Messages.ExecutionControllerProjectLoaded,
new Object[] {m_job.getProjectName()}), true);
}
- } catch (GDException e1) { // NOPMD by zeb on 10.04.07 14:47
+ } catch (JBException e1) { // NOPMD by zeb on 10.04.07 14:47
/* An exception was thrown while loading data or closing a session
* using Hibernate. The project is never set. This is detected
* during job validation (initAndValidate). */
@@ -951,7 +950,7 @@ public class ExecutionController implements IAUTServerEventListener,
*/
public void stateChanged(TestExecutionEvent event) {
if (event.getException() != null
- && event.getException() instanceof GDException) {
+ && event.getException() instanceof JBException) {
String errorMsg =
I18n.getString(event.getException().getMessage(), true);
AbstractCmdlineClient.printConsoleError(errorMsg);
diff --git a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/i18n/Messages.java b/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/i18n/Messages.java
index 492b2794f..578ed1752 100644
--- a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/i18n/Messages.java
+++ b/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/i18n/Messages.java
@@ -79,13 +79,13 @@ public class Messages extends NLS {
public static String ExecutionControllerTestJobBegin;
public static String ExecutionControllerTestSuiteBegin;
public static String ExecutionControllerTestSuiteEnd;
+ public static String ReceivedShutdownCommand;
public static String RetryStep;
public static String Step;
public static String TestCase;
public static String TestSuite;
public static String UtilsSeparator;
public static String WatchdogTimer;
- public static String ReceivedShutdownCommand;
static {
// initialize resource bundle
@@ -96,7 +96,6 @@ public class Messages extends NLS {
* Constructor
*/
private Messages() {
- super();
+ // hide
}
-
}
diff --git a/org.eclipse.jubula.app.dbtool/.classpath b/org.eclipse.jubula.app.dbtool/.classpath
index c377d8af1..da5d5f6e3 100644
--- a/org.eclipse.jubula.app.dbtool/.classpath
+++ b/org.eclipse.jubula.app.dbtool/.classpath
@@ -1,11 +1,11 @@
<?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="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"/>
</classpath>
diff --git a/org.eclipse.jubula.app.dbtool/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.app.dbtool/.settings/org.eclipse.jdt.core.prefs
index 3d9f46fe2..6942f8995 100644
--- a/org.eclipse.jubula.app.dbtool/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jubula.app.dbtool/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Wed Mar 11 13:02:57 CET 2009
+#Thu Jan 06 12:33:29 CET 2011
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
diff --git a/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF b/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF
index 57f2af8ee..9ba6157ce 100644
--- a/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app.dbtool/META-INF/MANIFEST.MF
@@ -2,13 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Jubula Database Tool (Incubation)
Bundle-SymbolicName: org.eclipse.jubula.app.dbtool;singleton:=true
-Bundle-Version: 0.4.0
+Bundle-Version: 0.9.0.qualifier
Bundle-Activator: org.eclipse.jubula.app.dbtool.bundle.Activator
Bundle-Vendor: Eclipse Jubula
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jubula.client.core,
- org.eclipse.jubula.client.cmd,
- org.eclipse.jubula.client.archive
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.jubula.client.core;bundle-version="[0.9.0,1.0.0)",
+ org.eclipse.jubula.client.cmd;bundle-version="[0.9.0,1.0.0)",
+ org.eclipse.jubula.client.archive;bundle-version="[0.9.0,1.0.0)",
+ org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: org.eclipse.jubula.app.dbtool.jar,
diff --git a/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/core/DBToolClient.java b/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/core/DBToolClient.java
index 27bd961e9..b6cc85a7b 100644
--- a/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/core/DBToolClient.java
+++ b/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/core/DBToolClient.java
@@ -32,9 +32,8 @@ import org.eclipse.jubula.client.core.persistence.TestResultPM;
import org.eclipse.jubula.client.core.persistence.TestResultSummaryPM;
import org.eclipse.jubula.client.core.progress.IProgressConsole;
import org.eclipse.jubula.tools.constants.StringConstants;
-import org.eclipse.jubula.tools.exception.GDException;
-import org.eclipse.jubula.tools.exception.GDProjectDeletedException;
-import org.eclipse.jubula.tools.i18n.I18n;
+import org.eclipse.jubula.tools.exception.JBException;
+import org.eclipse.jubula.tools.exception.ProjectDeletedException;
/**
@@ -212,7 +211,7 @@ public class DBToolClient extends AbstractCmdlineClient
new NullProgressMonitor(), this, false);
} catch (PMException pme) {
System.err.println(pme.getLocalizedMessage());
- } catch (GDProjectDeletedException gdpde) {
+ } catch (ProjectDeletedException gdpde) {
System.err.println(gdpde.getLocalizedMessage());
}
}
@@ -254,7 +253,7 @@ public class DBToolClient extends AbstractCmdlineClient
FileStorageBP.exportProjectList(exportProjects,
dirName, session, new NullProgressMonitor(), false,
listOfProjectFiles, this);
- } catch (GDException e) {
+ } catch (JBException e) {
reportExportAllFailed(exportDir, e);
} catch (InterruptedException e) {
// the monitor doesn't allow cancelation
@@ -291,7 +290,7 @@ public class DBToolClient extends AbstractCmdlineClient
FileStorageBP.exportProjectList(projects, dirName,
session, new NullProgressMonitor(), false,
listOfProjectFiles, this);
- } catch (GDException e) {
+ } catch (JBException e) {
reportExportAllFailed(exportDir, e);
} catch (InterruptedException e) {
// the monitor doesn't allow cancelation
@@ -314,7 +313,7 @@ public class DBToolClient extends AbstractCmdlineClient
try {
project = ProjectPM.loadProjectByNameAndVersion(name,
versionNr[0], versionNr[1]);
- } catch (GDException e) {
+ } catch (JBException e) {
reportMissingProject(name, version);
return;
}
@@ -334,7 +333,7 @@ public class DBToolClient extends AbstractCmdlineClient
project.getMajorProjectVersion(),
project.getMinorProjectVersion(), false);
}
- } catch (GDException e) {
+ } catch (JBException e) {
reportDeleteFailed(name, version, e);
} catch (InterruptedException e) {
// can't happen, this could only be thrown by a user
@@ -362,7 +361,7 @@ public class DBToolClient extends AbstractCmdlineClient
TestResultSummaryPM.deleteAllTestresultSummaries();
TestResultPM.deleteAllTestresultDetails();
}
- } catch (GDException e) {
+ } catch (JBException e) {
printConsoleError(e.getMessage());
} catch (InterruptedException e) {
// can't happen, this could only be thrown by a user
@@ -475,11 +474,8 @@ public class DBToolClient extends AbstractCmdlineClient
* @param exportDir directory name
* @param e error condition
*/
- private void reportExportAllFailed(String exportDir, GDException e) {
- //FIXME NLS The String "DBTool.ExportAllFailed" exists not in guidancerString.properties
- String i18nKey =
- "DBTool.ExportAllFailed"; //$NON-NLS-1$
- StringBuilder msg = new StringBuilder(I18n.getString(i18nKey));
+ private void reportExportAllFailed(String exportDir, JBException e) {
+ StringBuilder msg = new StringBuilder(Messages.DBToolExportAllFailed);
msg.append(StringConstants.SPACE);
msg.append(exportDir);
msg.append(StringConstants.NEWLINE);
diff --git a/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/i18n/Messages.java b/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/i18n/Messages.java
index 77ee6131e..199b2243b 100644
--- a/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/i18n/Messages.java
+++ b/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/i18n/Messages.java
@@ -18,27 +18,32 @@ import org.eclipse.osgi.util.NLS;
*/
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.jubula.app.dbtool.i18n.messages"; //$NON-NLS-1$
- public static String DBToolName;
+
public static String DBToolDelete;
public static String DBToolDeleteAll;
public static String DBToolDeleteFailed;
public static String DBToolDeleteKeepSummary;
- public static String DBToolInvalidVersion;
- public static String DBToolMissingProject;
+ public static String DBToolDir;
+ public static String DBToolExport;
public static String DBToolExportAll;
+ public static String DBToolExportAllFailed;
+ public static String DBToolImport;
public static String DBToolInvalidExportDirectory;
+ public static String DBToolInvalidVersion;
+ public static String DBToolMissingProject;
+ public static String DBToolName;
public static String DBToolNonEmptyExportDirectory;
- public static String DBToolExport;
- public static String DBToolDir;
- public static String DBToolImport;
public static String ExecutionControllerInvalidDBDataError;
-
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
+ /**
+ * Constructor
+ */
private Messages() {
+ // hide
}
}
diff --git a/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/i18n/messages.properties b/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/i18n/messages.properties
index 7b27ce16a..ba16ce601 100644
--- a/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/i18n/messages.properties
+++ b/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/i18n/messages.properties
@@ -5,7 +5,7 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
-DBToolName=GUIdancerDBTool
+DBToolName=CmdDbTool
DBToolDelete=Delete the project <project-name> with version <version-number> from the database.
DBToolDeleteAll=Delete all projects from the database.
DBToolDeleteFailed=The project could not be deleted. Please check for other users on the project.
@@ -17,5 +17,6 @@ DBToolInvalidExportDirectory=Can't use the directory
DBToolNonEmptyExportDirectory=Export directory not empty.
DBToolExport=Export a single project from the database into directory <directory>.
DBToolDir=Specifies the directory for import or export operations. Defaults to the current working directory.
-DBToolImport=Imports a GUIdancer export file back into the database from directory <directory>.
+DBToolImport=Imports an exported test project file back into the database from directory <directory>.
+DBToolExportAllFailed=Export All Failed
ExecutionControllerInvalidDBDataError=Database connection failed because of invalid or missing database detail \ No newline at end of file
diff --git a/org.eclipse.jubula.app/META-INF/MANIFEST.MF b/org.eclipse.jubula.app/META-INF/MANIFEST.MF
index 1e55f5f06..e028bcebc 100644
--- a/org.eclipse.jubula.app/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Jubula Application (Incubation)
Bundle-SymbolicName: org.eclipse.jubula.app;singleton:=true
-Bundle-Version: 0.4.0
+Bundle-Version: 0.9.0.qualifier
Bundle-Activator: org.eclipse.jubula.app.Activator
Bundle-Vendor: Eclipse Jubula
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;visibility:=reexport,
- org.eclipse.core.runtime;visibility:=reexport,
- org.eclipse.jubula.client.ui;visibility:=reexport
+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="[0.9.0,1.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
diff --git a/org.eclipse.jubula.app/plugin.properties b/org.eclipse.jubula.app/plugin.properties
index baf22eb67..3d592d8e4 100644
--- a/org.eclipse.jubula.app/plugin.properties
+++ b/org.eclipse.jubula.app/plugin.properties
@@ -8,5 +8,5 @@
ApplicationLauncher=Jubula Application
productName=Jubula
productDescription= Jubula product description
-aboutText=Jubula\n\nVersion: 0.4.0\n\nVisit http://www.eclipse.org/jubula
+aboutText=Jubula\n\nVersion: 0.9.0.qualifier\n\nVisit http://www.eclipse.org/jubula
IntroTitle=Welcome to Jubula \ No newline at end of file
diff --git a/org.eclipse.jubula.app/product/jubula.product b/org.eclipse.jubula.app/product/jubula.product
index da091acf4..fae276f5c 100644
--- a/org.eclipse.jubula.app/product/jubula.product
+++ b/org.eclipse.jubula.app/product/jubula.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="%productName" uid="org.eclipse.jubula.app.product.definition" id="org.eclipse.jubula.app.product" application="org.eclipse.jubula.app.launcher" version="0.4.0" useFeatures="true" includeLaunchers="true">
+<product name="%productName" uid="org.eclipse.jubula.app.product.definition" id="org.eclipse.jubula.app.product" application="org.eclipse.jubula.app.launcher" version="0.9.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="icons/about.gif"/>
@@ -45,7 +45,12 @@
<windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</windows>
</vm>
+ <plugins>
+ </plugins>
+
<features>
<feature id="org.eclipse.jubula.feature"/>
</features>
+
+
</product>
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 7eaf87980..e08a7ecef 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
@@ -62,7 +62,7 @@ public class Launcher implements IApplication,
private static Log log = LogFactory.getLog(Launcher.class);
/**
- * Creates a new GuiDancer application.
+ * Creates a new Application.
*/
public Launcher() {
// do nothing
@@ -81,8 +81,8 @@ public class Launcher implements IApplication,
Location instanceLoc = Platform.getInstanceLocation();
if (instanceLoc == null) {
MessageDialog.openError(shell, Messages
- .GuiDancerLauncherValidWorkspaceTitle,
- Messages.GuiDancerLauncherValidWorkspace);
+ .LauncherValidWorkspaceTitle,
+ Messages.LauncherValidWorkspace);
return false;
}
@@ -111,13 +111,13 @@ public class Launcher implements IApplication,
}
} catch (IllegalStateException e) {
MessageDialog.openError(shell, Messages
- .GuiDancerLauncherCannotBeSetTitle,
- Messages.GuiDancerLauncherCannotBeSet);
+ .LauncherCannotBeSetTitle,
+ Messages.LauncherCannotBeSet);
return false;
} catch (IOException e) {
MessageDialog.openError(shell, Messages
- .GuiDancerLauncherCannotBeSetTitle,
- Messages.GuiDancerLauncherCannotBeSet);
+ .LauncherCannotBeSetTitle,
+ Messages.LauncherCannotBeSet);
return false;
}
@@ -125,8 +125,8 @@ public class Launcher implements IApplication,
// already
// in use -- force the user to choose again
MessageDialog.openError(shell, Messages
- .GuiDancerLauncherAlreadyInUseTitle,
- Messages.GuiDancerLauncherAlreadyInUse);
+ .LauncherAlreadyInUseTitle,
+ Messages.LauncherAlreadyInUse);
}
}
@@ -159,8 +159,8 @@ public class Launcher implements IApplication,
url = file.toURL();
} catch (MalformedURLException e) {
MessageDialog.openError(shell, Messages
- .GuiDancerLauncherNotValidTitle,
- Messages.GuiDancerLauncherNotValid);
+ .LauncherNotValidTitle,
+ Messages.LauncherNotValid);
continue;
}
} while (!isValidWorkspace(shell, url));
@@ -193,10 +193,10 @@ public class Launcher implements IApplication,
// At this point workspace has been detected to be from a version
// other than the current ide version -- find out if the user wants
// to use it anyhow.
- String title = Messages.GuiDancerLauncherDifferentVersionTitle;
+ String title = Messages.LauncherDifferentVersionTitle;
// Use NLS.bind in Eclipse3.1
String message = NLS.bind(
- Messages.GuiDancerLauncherDifferentVersionMessage,
+ Messages.LauncherDifferentVersionMessage,
new Object[] { url.getFile() });
MessageBox mbox = new MessageBox(shell, SWT.OK | SWT.CANCEL
| SWT.ICON_WARNING | SWT.APPLICATION_MODAL);
@@ -232,8 +232,8 @@ public class Launcher implements IApplication,
} catch (IOException e) {
log.error(Messages.CouldNotReadVersionFile, e);
MessageDialog.openError(shell, Messages
- .GuiDancerLauncherCouldNotReadTitle,
- Messages.GuiDancerLauncherCouldNotRead);
+ .LauncherCouldNotReadTitle,
+ Messages.LauncherCouldNotRead);
return null;
}
}
@@ -262,8 +262,8 @@ public class Launcher implements IApplication,
} catch (IOException e) {
log.error(Messages.CouldNotWriteVersionFile, e);
MessageDialog.openError(shell, Messages
- .GuiDancerLauncherCouldNotWriteTitle,
- Messages.GuiDancerLauncherCouldNotWrite);
+ .LauncherCouldNotWriteTitle,
+ Messages.LauncherCouldNotWrite);
} finally {
try {
if (output != null) {
diff --git a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/ActionBuilder.java b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/ActionBuilder.java
index 8e4756c0f..a815e922d 100644
--- a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/ActionBuilder.java
+++ b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/ActionBuilder.java
@@ -30,10 +30,11 @@ import org.eclipse.jubula.client.ui.utils.CommandHelper;
import org.eclipse.swt.SWT;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.IWorkbenchCommandConstants;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ContributionItemFactory;
import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
+import org.eclipse.ui.actions.ContributionItemFactory;
import org.eclipse.ui.application.ActionBarAdvisor;
import org.eclipse.ui.application.IActionBarConfigurer;
import org.eclipse.ui.handlers.IHandlerService;
@@ -225,8 +226,9 @@ public class ActionBuilder {
private void fillMenuBar(IMenuManager menuBar) {
m_resetPersp.setEnabled(true);
menuBar.setRemoveAllWhenShown(true);
- menuBar.add(createProjectMenu());
+ menuBar.add(createFileMenu());
menuBar.add(createEditMenu());
+ menuBar.add(createSearchMenu());
menuBar.add(createRunMenu());
menuBar.add(createWindowMenu());
menuBar.add(createHelpMenu());
@@ -235,11 +237,12 @@ public class ActionBuilder {
/**
* Creates Edit menu.
+ *
* @return IMenuManager.
*/
private IMenuManager createEditMenu() {
IMenuManager editMenu = new MenuManager(Messages.ActionBuilderEdit,
- "JubulaEditMenu"); //$NON-NLS-1$
+ IWorkbenchActionConstants.M_EDIT);
/*
* JubulaEditSeparator1 = Create>
* JubulaEditSeparator1 = Add>
@@ -258,50 +261,50 @@ public class ActionBuilder {
editMenu.add(new GroupMarker("JubulaEditSeparator3")); //$NON-NLS-1$
return editMenu;
}
-
+
/**
- * Creates Run menu.
- * @return IMenuManager.
+ * Creates a Search menu.
+ *
+ * @return the menu manager for the created menu.
+ */
+ private IMenuManager createSearchMenu() {
+ IMenuManager searchMenu = new MenuManager(Messages.ActionBuilderSearch,
+ "org.eclipse.search.menu"); //$NON-NLS-1$
+ return searchMenu;
+ }
+
+ /**
+ * Creates a Run menu.
+ *
+ * @return the menu manager for the created menu.
*/
private IMenuManager createRunMenu() {
IMenuManager runMenu = new MenuManager(Messages.ActionBuilderRun,
- "JubulaRunMenu"); //$NON-NLS-1$
+ "org.eclipse.ui.run"); //$NON-NLS-1$
return runMenu;
}
/**
- * Creates the ProjectMenu.
- * {@inheritDoc}
- * @return an IMenuManager.
+ * Creates a File menu.
+ *
+ * @return the menu manager for the created menu.
*/
- private IMenuManager createProjectMenu() {
- IMenuManager projectMenu = new MenuManager(Messages
- .ActionBuilderMyFileEntry,
- "JubulaProjectMenu"); //$NON-NLS-1$
- //FIXME NLS rename JubulaProjectSeparator1 (look messages.properties)
- /*
- * JubulaProjectSeparator1 = new Project/open Project / saveAs
- * JubulaProjectSeparator2 = import/export
- * JubulaProjectSeparator3 = settings
- */
- projectMenu.add(new GroupMarker("JubulaProjectSeparator1")); //$NON-NLS-1$
- projectMenu.add(new Separator());
- projectMenu.add(m_fileSave);
- projectMenu.add(m_fileSaveAll);
- projectMenu.add(new Separator());
- CommandHelper.createContributionPushItem(projectMenu,
- CommandIDs.REFRESH_COMMAND_ID);
- projectMenu.add(new Separator());
- projectMenu.add(new GroupMarker("JubulaProjectSeparator3")); //$NON-NLS-1$
- projectMenu.add(new Separator());
- projectMenu.add(new GroupMarker("JubulaProjectSeparator4")); //$NON-NLS-1$
- projectMenu.add(new Separator());
- projectMenu.add(new GroupMarker("JubulaProjectSeparator5")); //$NON-NLS-1$
- projectMenu.add(new Separator());
- projectMenu.add(m_quitAction);
- return projectMenu;
+ private IMenuManager createFileMenu() {
+ IMenuManager fileMenu = new MenuManager(Messages
+ .ActionBuilderMyFileEntry,
+ IWorkbenchActionConstants.M_FILE);
+ fileMenu.add(m_fileSave);
+ fileMenu.add(m_fileSaveAll);
+ fileMenu.add(new Separator());
+ CommandHelper.createContributionPushItem(fileMenu,
+ IWorkbenchCommandConstants.FILE_RENAME);
+ CommandHelper.createContributionPushItem(fileMenu,
+ IWorkbenchCommandConstants.FILE_REFRESH);
+ fileMenu.add(new Separator());
+ fileMenu.add(m_quitAction);
+ return fileMenu;
}
-
+
/**
* Creates the Window menu.
* @return IMenuManager.
@@ -354,6 +357,9 @@ public class ActionBuilder {
helpMenu.add(m_helpCont);
helpMenu.add(new Separator("helpEnd")); //$NON-NLS-1$
+ CommandHelper.createContributionPushItem(
+ helpMenu, IWorkbenchCommandConstants.HELP_ABOUT);
+
return helpMenu;
}
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 7653992cf..a9406eedb 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
@@ -33,15 +33,15 @@ import org.eclipse.jubula.app.i18n.Messages;
import org.eclipse.jubula.client.core.businessprocess.ExternalTestDataBP;
import org.eclipse.jubula.client.core.businessprocess.progress.OperationCanceledUtil;
import org.eclipse.jubula.client.ui.Plugin;
-import org.eclipse.jubula.client.ui.Plugin.GDStatus;
+import org.eclipse.jubula.client.ui.Plugin.ClientStatus;
import org.eclipse.jubula.client.ui.businessprocess.ProblemsBP;
import org.eclipse.jubula.client.ui.constants.Constants;
import org.eclipse.jubula.client.ui.controllers.TestExecutionContributor;
import org.eclipse.jubula.client.ui.search.query.AbstractSearchQuery;
import org.eclipse.jubula.client.ui.utils.Utils;
import org.eclipse.jubula.tools.constants.StringConstants;
-import org.eclipse.jubula.tools.exception.GDFatalException;
-import org.eclipse.jubula.tools.exception.GDRuntimeException;
+import org.eclipse.jubula.tools.exception.JBFatalException;
+import org.eclipse.jubula.tools.exception.JBRuntimeException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.search.ui.IQueryListener;
@@ -76,7 +76,7 @@ public class JubulaWorkbenchAdvisor extends WorkbenchAdvisor {
private static Log log = LogFactory.getLog(JubulaWorkbenchAdvisor.class);
/**
- * Constructs a new <code>GuiDancerWorkbenchAdvisor</code>.
+ * Constructs a new <code>JubulaWorkbenchAdvisor</code>.
*/
public JubulaWorkbenchAdvisor() {
// do nothing
@@ -196,7 +196,7 @@ public class JubulaWorkbenchAdvisor extends WorkbenchAdvisor {
/**
* doing sth after Startup
- * (starts the spec perspective after the guiDancer-start)
+ * (starts the spec perspective after the application-start)
*/
public void postStartup() {
setupPermanentServices();
@@ -219,7 +219,7 @@ public class JubulaWorkbenchAdvisor extends WorkbenchAdvisor {
Utils.createMessageDialog(MessageIDs.E_NO_PERSPECTIVE,
new Object[]{Constants.SPEC_PERSPECTIVE}, null);
}
- Plugin.getDefault().setDGStatus(GDStatus.RUNNING);
+ Plugin.getDefault().setClientStatus(ClientStatus.RUNNING);
}
/**
@@ -317,8 +317,8 @@ public class JubulaWorkbenchAdvisor extends WorkbenchAdvisor {
return;
}
log.error(Messages.UnhandledRuntimeException, exception);
- if (exception instanceof GDRuntimeException) {
- Utils.createMessageDialog(((GDRuntimeException)exception)
+ if (exception instanceof JBRuntimeException) {
+ Utils.createMessageDialog(((JBRuntimeException)exception)
.getErrorId());
return;
} else if (exception instanceof PersistenceException) {
@@ -351,7 +351,7 @@ public class JubulaWorkbenchAdvisor extends WorkbenchAdvisor {
if (!Plugin.isRCPException(exception)
&& !Plugin.isContentAssistException(exception)) {
- Utils.createMessageDialog(new GDFatalException(exception,
+ Utils.createMessageDialog(new JBFatalException(exception,
MessageIDs.E_UNEXPECTED_EXCEPTION));
}
} else {
@@ -472,7 +472,7 @@ public class JubulaWorkbenchAdvisor extends WorkbenchAdvisor {
*/
public boolean preShutdown() {
try {
- Plugin.getDefault().setDGStatus(GDStatus.STOPPING);
+ Plugin.getDefault().setClientStatus(ClientStatus.STOPPING);
// Close all open editors
IWorkbenchWindow[] allWW = PlatformUI.getWorkbench()
.getWorkbenchWindows();
diff --git a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchWindowAdvisor.java b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchWindowAdvisor.java
index 350fb8fb8..99d0641dd 100644
--- a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchWindowAdvisor.java
+++ b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchWindowAdvisor.java
@@ -15,7 +15,10 @@ import org.eclipse.jubula.app.Activator;
import org.eclipse.jubula.app.i18n.Messages;
import org.eclipse.jubula.client.ui.Plugin;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.WorkbenchException;
import org.eclipse.ui.application.ActionBarAdvisor;
import org.eclipse.ui.application.IActionBarConfigurer;
@@ -30,6 +33,15 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
*/
public class JubulaWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
+ /**
+ * all basic action sets that should be hidden when running Jubula as
+ * a stand-alone client
+ */
+ private static final String [] ACTION_SETS_TO_HIDE = new String [] {
+ "org.eclipse.ui.actionSet.openFiles", //$NON-NLS-1$
+ "org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo" //$NON-NLS-1$
+ };
+
/** Key to look up the action builder on the window configurer. */
private static final String BUILDER_KEY = "builder"; //$NON-NLS-1$
/***/
@@ -71,6 +83,17 @@ public class JubulaWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
*/
public void postWindowOpen() {
super.postWindowOpen();
+ for (IWorkbenchWindow window
+ : PlatformUI.getWorkbench().getWorkbenchWindows()) {
+
+ IWorkbenchPage page = window.getActivePage();
+ if (page != null) {
+ for (String actionSetToHide : ACTION_SETS_TO_HIDE) {
+ page.hideActionSet(actionSetToHide);
+ }
+ }
+ }
+
AbstractUIPlugin plugin = Activator.getDefault();
ImageRegistry imageRegistry = plugin.getImageRegistry();
getWindowConfigurer().getWindow().getShell().setImages(
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 835200dc1..aca9987ba 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
@@ -102,8 +102,7 @@ public class WorkSpaceData {
public String getInitialDefault() {
if (m_initialDefault == null) {
m_initialDefault = System.getProperty("user.dir") + File.separator //$NON-NLS-1$
- //FIXME NLS To Rename "GuidancerWorspace"?
- + "guidancerWorkspace"; //$NON-NLS-1$
+ + "jubulaWorkspace"; //$NON-NLS-1$
}
return m_initialDefault;
}
diff --git a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/i18n/Messages.java b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/i18n/Messages.java
index 7ef51df30..2511fecb6 100644
--- a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/i18n/Messages.java
+++ b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/i18n/Messages.java
@@ -18,21 +18,7 @@ import org.eclipse.osgi.util.NLS;
*/
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.jubula.app.i18n.messages"; //$NON-NLS-1$
-
- public static String GuiDancerLauncherAlreadyInUse;
- public static String GuiDancerLauncherAlreadyInUseTitle;
- public static String GuiDancerLauncherCannotBeSet;
- public static String GuiDancerLauncherCannotBeSetTitle;
- public static String GuiDancerLauncherCouldNotRead;
- public static String GuiDancerLauncherCouldNotReadTitle;
- public static String GuiDancerLauncherCouldNotWrite;
- public static String GuiDancerLauncherCouldNotWriteTitle;
- public static String GuiDancerLauncherDifferentVersionMessage;
- public static String GuiDancerLauncherDifferentVersionTitle;
- public static String GuiDancerLauncherNotValid;
- public static String GuiDancerLauncherNotValidTitle;
- public static String GuiDancerLauncherValidWorkspace;
- public static String GuiDancerLauncherValidWorkspaceTitle;
+
public static String ActionBuilderCutItem;
public static String ActionBuilderCutToolTip;
public static String ActionBuilderEdit;
@@ -52,19 +38,14 @@ public class Messages extends NLS {
public static String ActionBuilderRun;
public static String ActionBuilderSaveAllItem;
public static String ActionBuilderSaveAllToolTip;
- public static String ActionBuilderSaveAsPoint;
public static String ActionBuilderSaveAs;
+ public static String ActionBuilderSaveAsPoint;
public static String ActionBuilderSaveItem;
public static String ActionBuilderSaveToolTip;
+ public static String ActionBuilderSearch;
public static String ActionBuildershowView;
public static String ActionBuilderWindowEntry;
public static String CannotOpenThePerspective;
- public static String UnhandledRuntimeException;
- public static String JubulaWorkbenchWindowAdvisorWindowTitle;
- public static String LaunchWorkspaceData;
- public static String UnableToWriteWorkspaceData;
- public static String WorkSpaceDataCantWriteDataTitle;
- public static String WorkSpaceDataCanWriteData;
public static String ChooseWorkspaceDialogBrowse;
public static String ChooseWorkspaceDialogDialogMessage;
public static String ChooseWorkspaceDialogDialogText;
@@ -74,12 +55,36 @@ public class Messages extends NLS {
public static String ChooseWorkspaceDialogWorkspace;
public static String CouldNotReadVersionFile;
public static String CouldNotWriteVersionFile;
+ public static String LauncherAlreadyInUse;
+ public static String LauncherAlreadyInUseTitle;
+ public static String LauncherCannotBeSet;
+ public static String LauncherCannotBeSetTitle;
+ public static String LauncherCouldNotRead;
+ public static String LauncherCouldNotReadTitle;
+ public static String LauncherCouldNotWrite;
+ public static String LauncherCouldNotWriteTitle;
+ public static String LauncherDifferentVersionMessage;
+ public static String LauncherDifferentVersionTitle;
+ public static String LauncherNotValid;
+ public static String LauncherNotValidTitle;
+ public static String LauncherValidWorkspace;
+ public static String LauncherValidWorkspaceTitle;
+ public static String JubulaWorkbenchWindowAdvisorWindowTitle;
+ public static String LaunchWorkspaceData;
+ public static String UnableToWriteWorkspaceData;
+ public static String UnhandledRuntimeException;
+ public static String WorkSpaceDataCantWriteDataTitle;
+ public static String WorkSpaceDataCanWriteData;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
+ /**
+ * Constructor
+ */
private Messages() {
+ // hide
}
}
diff --git a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/i18n/messages.properties b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/i18n/messages.properties
index b4c66ed52..910556320 100644
--- a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/i18n/messages.properties
+++ b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/i18n/messages.properties
@@ -5,20 +5,20 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
-GuiDancerLauncherAlreadyInUse=Workspace already in use. Please choose another one
-GuiDancerLauncherAlreadyInUseTitle=Workspace in use
-GuiDancerLauncherCannotBeSet=Error in runtime. Workspace cannot be set.\n\nExiting.
-GuiDancerLauncherCannotBeSetTitle=Workspace cannot be set
-GuiDancerLauncherCouldNotRead=Could not read version file.
-GuiDancerLauncherCouldNotReadTitle=Could not read
-GuiDancerLauncherCouldNotWrite=Could not write version file.
-GuiDancerLauncherCouldNotWriteTitle=Could not write
-GuiDancerLauncherDifferentVersionMessage=This workspace has been written with a different version of the product and needs to be updated.\r\n\r\n\r\nUpdating the workspace may make it incompatible with other versions of the product.\r\nPress OK to update the workspace and open it. Press Cancel to select a different workspace.
-GuiDancerLauncherDifferentVersionTitle=Different Workspace Version
-GuiDancerLauncherNotValid=Selected workspace is not valid; choose a different one.
-GuiDancerLauncherNotValidTitle=Invalid Workspace
-GuiDancerLauncherValidWorkspace=GUIdancer needs a valid workspace; restart without the @none option.
-GuiDancerLauncherValidWorkspaceTitle=Workspace not optional
+LauncherAlreadyInUse=Workspace already in use. Please choose another one
+LauncherAlreadyInUseTitle=Workspace in use
+LauncherCannotBeSet=Error in runtime. Workspace cannot be set.\n\nExiting.
+LauncherCannotBeSetTitle=Workspace cannot be set
+LauncherCouldNotRead=Could not read version file.
+LauncherCouldNotReadTitle=Could not read
+LauncherCouldNotWrite=Could not write version file.
+LauncherCouldNotWriteTitle=Could not write
+LauncherDifferentVersionMessage=This workspace has been written with a different version of the product and needs to be updated.\r\n\r\n\r\nUpdating the workspace may make it incompatible with other versions of the product.\r\nPress OK to update the workspace and open it. Press Cancel to select a different workspace.
+LauncherDifferentVersionTitle=Different Workspace Version
+LauncherNotValid=Selected workspace is not valid; choose a different one.
+LauncherNotValidTitle=Invalid Workspace
+LauncherValidWorkspace=The Application needs a valid workspace; restart without the @none option.
+LauncherValidWorkspaceTitle=Workspace not optional
ActionBuilderCutItem=Cu&t
ActionBuilderCutToolTip=Cut
ActionBuilderEdit=&Edit
@@ -26,7 +26,7 @@ ActionBuilderExitItem=E&xit
ActionBuilderExportAll=Export Projects to ...
ActionBuilderHelpContentItem=Help Content
ActionBuilderHelpContentToolTip=&Help Content
-ActionBuilderMyFileEntry=&Project
+ActionBuilderMyFileEntry=&File
ActionBuilderMyHelpEntry=&Help
ActionBuilderNavigateEntry=&Navigate
ActionBuilderopenPerspective=&Open Perspective
@@ -42,6 +42,7 @@ ActionBuilderSaveAsPoint=Save As...
ActionBuilderSaveAs=Export Project as ...
ActionBuilderSaveItem=&Save
ActionBuilderSaveToolTip=Save
+ActionBuilderSearch=Se&arch
ActionBuildershowView=Show &View
ActionBuilderWindowEntry=&Window
CannotOpenThePerspective=Cannot open the perspective:
diff --git a/org.eclipse.jubula.autagent/.classpath b/org.eclipse.jubula.autagent/.classpath
index bd33b3e37..4cb31d500 100644
--- a/org.eclipse.jubula.autagent/.classpath
+++ b/org.eclipse.jubula.autagent/.classpath
@@ -4,5 +4,10 @@
<classpathentry kind="src" path="/org.eclipse.jubula.communication"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.tools"/>
+ <classpathentry kind="lib" path="/org.eclipse.jubula.rc.orbit/org.apache.commons.cli_1.2.0.v201011021000.jar"/>
+ <classpathentry kind="lib" path="/org.eclipse.jubula.rc.orbit/org.apache.log4j_1.2.15.v201005080500.jar"/>
+ <classpathentry kind="lib" path="/org.eclipse.jubula.rc.orbit/org.slf4j.api_1.5.11.v20100519-1910.jar"/>
+ <classpathentry kind="lib" path="/org.eclipse.jubula.rc.orbit/org.slf4j.jcl_1.5.11.v20100419-1106.jar"/>
+ <classpathentry kind="lib" path="/org.eclipse.jubula.rc.orbit/org.slf4j.log4j_1.5.11.v20100419-1106.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.autagent/buildScript.xml b/org.eclipse.jubula.autagent/buildScript.xml
index 59de1cc4e..e6809b5ff 100644
--- a/org.eclipse.jubula.autagent/buildScript.xml
+++ b/org.eclipse.jubula.autagent/buildScript.xml
@@ -138,18 +138,7 @@
./lib/AutStarter.jar
./resources/
./logs/
- ./lib/org.jacoco.core_0.4.1.20101112194955.jar
- ./lib/org.jacoco.report_0.4.1.20101112194955.jar
- ./lib/com.bredexsw.guidancer.autagent.monitoring.jacoco.jar
- ./lib/com.bredexsw.guidancer.autagent.monitoring.yourkit.jar
- ./lib/yjp-controller-api-redist.jar
- ./lib/asm-3.3.jar
- ./lib/asm-analysis-3.3.jar
- ./lib/asm-commons-3.3.jar
- ./lib/asm-tree-3.3.jar
- ./lib/asm-util-3.3.jar
- ./lib/asm-xml-3.3.jar
- ./lib/commons-io-1.4.jar
+ ./lib/commons-io-1.4.jar
./lib/" />
</manifest>
</jar>
diff --git a/org.eclipse.jubula.autagent/resources/log4j.properties b/org.eclipse.jubula.autagent/resources/log4j.properties
index f48d65a4a..aa00828aa 100644
--- a/org.eclipse.jubula.autagent/resources/log4j.properties
+++ b/org.eclipse.jubula.autagent/resources/log4j.properties
@@ -5,13 +5,7 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
-# logging for GUIdancer
-
-
-#[WindowsSyslog]
-# log4j.appender.all=org.apache.log4j.nt.NTEventLogAppender
-# log4j.appender.all.source=GUIdancer
-#[WindowsSyslog]
+# application logging
#[UnixEventlog]
# log4j.appender.all=org.apache.log4j.net.SyslogAppender
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 95ce6242b..4f77b7f7e 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
@@ -54,7 +54,7 @@ import org.eclipse.jubula.tools.constants.AUTServerExitConstants;
import org.eclipse.jubula.tools.constants.ConfigurationConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
-import org.eclipse.jubula.tools.exception.GDVersionException;
+import org.eclipse.jubula.tools.exception.JBVersionException;
import org.eclipse.jubula.tools.i18n.I18n;
import org.eclipse.jubula.tools.registration.AutIdentifier;
import org.eclipse.jubula.tools.utils.DevNull;
@@ -225,7 +225,6 @@ public class AutStarter {
*/
public static void main(String[] args) {
// create the single instance here
-
final AutStarter server = AutStarter.getInstance();
CommandLineParser parser = new PosixParser();
@@ -389,7 +388,7 @@ public class AutStarter {
log.error("no command line", npe); //$NON-NLS-1$
printHelp();
exitCode = EXIT_INVALID_OPTIONS;
- } catch (GDVersionException ve) {
+ } catch (JBVersionException ve) {
log.error(ve.getMessage(), ve);
exitCode = EXIT_CLIENT_SERVER_VERSION_ERROR;
} finally {
@@ -450,13 +449,16 @@ public class AutStarter {
/**
* initializes the Socket for the client to connect.
- * @param port int
- * @throws IOException error
- * @throws GDVersionException in case of version error between Client and
- * AutStarter
+ *
+ * @param port
+ * int
+ * @throws IOException
+ * error
+ * @throws JBVersionException
+ * in case of version error between Client and AutStarter
*/
private void initClientConnectionSocket(int port) throws IOException,
- GDVersionException {
+ JBVersionException {
Map<String, IConnectionInitializer> clientTypeToInitializer =
new HashMap<String, IConnectionInitializer>();
@@ -487,12 +489,14 @@ public class AutStarter {
/**
* initializes the Socket for the AUTServer to connect
- * @throws IOException error
- * @throws GDVersionException in case of a version error between Client
- * and AutStarter
+ *
+ * @throws IOException
+ * error
+ * @throws JBVersionException
+ * in case of a version error between Client and AutStarter
*/
private void initAutConnectionSocket() throws IOException,
- GDVersionException {
+ JBVersionException {
// create a communicator on any free port
setAutCommunicator(new Communicator(0, this.getClass()
@@ -806,7 +810,7 @@ public class AutStarter {
.remove(getAutCommunicator().getConnection());
try {
initAutConnectionSocket();
- } catch (GDVersionException e) {
+ } catch (JBVersionException e) {
message = new StartAUTServerStateMessage(
StartAUTServerStateMessage.COMMUNICATION,
"version exception while restart AUT"); //$NON-NLS-1$
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java
index 9b1d7bc8e..81e1c8233 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java
@@ -38,7 +38,7 @@ import org.eclipse.jubula.communication.message.PrepareForShutdownMessage;
import org.eclipse.jubula.communication.message.StartAUTServerMessage;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
-import org.eclipse.jubula.tools.exception.GDVersionException;
+import org.eclipse.jubula.tools.exception.JBVersionException;
import org.eclipse.jubula.tools.registration.AutIdentifier;
import org.eclipse.jubula.tools.utils.StringParsing;
import org.slf4j.Logger;
@@ -119,7 +119,7 @@ public class AutAgent {
LOG.error("Error occurred while establishing communication with AUT." , ioe); //$NON-NLS-1$
} catch (SecurityException se) {
LOG.error("Error occurred while establishing communication with AUT." , se); //$NON-NLS-1$
- } catch (GDVersionException gdve) {
+ } catch (JBVersionException gdve) {
LOG.error("Error occurred while establishing communication with AUT." , gdve); //$NON-NLS-1$
}
@@ -617,7 +617,7 @@ public class AutAgent {
}
/**
- * Sends a request to a Running AUT. The AUT should connect to a GUIdancer
+ * Sends a request to a Running AUT. The AUT should then connect to the
* Client using the provided connection information.
*
* @param autId The ID of the AUT to which the message should be sent.
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 517b77029..a38d31bc2 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
@@ -12,9 +12,13 @@ package org.eclipse.jubula.autagent.commands;
import java.io.File;
import java.io.FileNotFoundException;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -351,6 +355,7 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut {
return sb.toString();
}
+
/**
* Gets the absolute path of the org.eclipse.jubula.rc.common.agent.jar file.
* @return the absolute path
@@ -362,9 +367,35 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut {
String absPath = paths.toString();
return absPath.replace('\\', '/');
}
+
+ /**
+ * Searches for *.jar files in the server extension directory (ext).
+ * @return the extensions (jarfiles) as URL's
+ */
+ private URL[] getExtensions() {
+
+ final File extDir = new File(CommandConstants.EXT_JARS_PATH);
+ final File[] extJars = extDir.listFiles(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return name.endsWith(".jar"); //$NON-NLS-1$
+ }
+ });
+ URL[] urls = new URL[extJars.length];
+ if (extJars != null) {
+ for (int i = 0; i < extJars.length; i++) {
+ try {
+ urls[i] = extJars[i].toURI().toURL();
+ } catch (MalformedURLException e) {
+ LOG.error("URL is not Malformed", e);
+ }
+ }
+ }
+ return urls;
+ }
+
/**
* This method will load the class which implements the {@link IMonitoring}
- * interface, and will invoke the "getAgent" method.
+ * interface, and will invoke the "getAgent" method.
* @param parameters The AutConfigMap
* @return agentString The agent string
*/
@@ -381,9 +412,10 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut {
String agentString = null;
if (isRunnigWithMonitoring(parameters)) {
- try {
-
- Class<?> monitoringClass = Class.forName(monitoringAgentClass);
+ try {
+ ClassLoader loader = new URLClassLoader(getExtensions());
+ Class<?> monitoringClass =
+ loader.loadClass(monitoringAgentClass);
Constructor<?> constructor = monitoringClass.getConstructor();
IMonitoring agentInstance =
(IMonitoring)constructor.newInstance();
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 018ed79dc..9873924d0 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
@@ -21,13 +21,12 @@ import org.eclipse.jubula.communication.message.StartAUTServerMessage;
import org.eclipse.jubula.communication.message.StartAUTServerStateMessage;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
-
/**
* The class <code>StartAutServerCommand</code> and the associated
- * <code>StartAutServerMessage</code> are used as examples for the intended
- * use of the communications layer in GuiDancer. Since changes are expected, this
- * documentation is inlined in the source code. Please reevaluate the Java doc
- * frequently for changes in this templates.
+ * <code>StartAutServerMessage</code> are used as examples for the intended use
+ * of the communications layer in the application. Since changes are expected,
+ * this documentation is inlined in the source code. Please reevaluate the Java
+ * doc frequently for changes in this templates.
*
* The command object for starting the AUTServer. The method execute() returns a
* StartAUTServerStateMessage which contains a state. In case of not OK, the
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 90ca99793..2f46d9964 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
@@ -210,7 +210,7 @@ public class StartSwingAutServerCommand extends AbstractStartJavaAut {
}
}
serverClasspath.append(PATH_SEPARATOR);
- serverClasspath.append(getAbsExtImplClassesPath());
+ serverClasspath.append(getAbsExtImplClassesPath());
if (LOG.isDebugEnabled()) {
LOG.debug("classPath:" + classpath); //$NON-NLS-1$
LOG.debug("serverClasspath" + serverClasspath); //$NON-NLS-1$
@@ -379,6 +379,7 @@ public class StartSwingAutServerCommand extends AbstractStartJavaAut {
* @return the absolute path
*/
private String getAbsExtImplClassesPath() {
+
final File implDir = new File(CommandConstants.EXT_IMPLCLASSES_PATH);
final StringBuffer paths = new StringBuffer(implDir.getAbsolutePath());
final File[] jars = implDir.listFiles(new FilenameFilter() {
@@ -386,6 +387,7 @@ public class StartSwingAutServerCommand extends AbstractStartJavaAut {
return name.endsWith(".jar"); //$NON-NLS-1$
}
});
+
if (jars != null) {
final int maxIdx = jars.length;
for (int i = 0; i < maxIdx; i++) {
@@ -396,6 +398,32 @@ public class StartSwingAutServerCommand extends AbstractStartJavaAut {
}
return paths.toString();
}
+ /**
+ * Gets/loads external jars from the ext directory
+ * @return the absolute path
+ */
+ private String getExtJarPath() {
+
+ final File extDir = new File(CommandConstants.EXT_JARS_PATH);
+ final StringBuffer paths = new StringBuffer(extDir.getAbsolutePath());
+ final File[] extJars = extDir.listFiles(new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ return name.endsWith(".jar"); //$NON-NLS-1$
+ }
+ });
+
+ if (extJars != null) {
+ for (int i = 0; i < extJars.length; i++) {
+ File f = extJars[i];
+ paths.append(PATH_SEPARATOR);
+ paths.append(f.getAbsolutePath());
+ }
+ }
+ return paths.toString();
+
+ }
+
+
/**
* Gets the absolute path of the GDAgent.jar file.
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java
index 4d63662f7..0cf68f391 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java
@@ -120,7 +120,7 @@ public class DesktopIntegration implements PropertyChangeListener {
popup.addSeparator();
popup.add(defaultItem);
- m_trayIcon = new TrayIcon(image, "GUIdancer AUT Agent", popup); //$NON-NLS-1$
+ m_trayIcon = new TrayIcon(image, "AUT Agent", popup); //$NON-NLS-1$
m_trayIcon.setImageAutoSize(true);
@@ -145,7 +145,7 @@ public class DesktopIntegration implements PropertyChangeListener {
* @return info according to status fields
*/
private String buildToolTip() {
- StringBuilder tt = new StringBuilder("GUIdancer AUT Agent\n"); //$NON-NLS-1$
+ StringBuilder tt = new StringBuilder("AUT Agent\n"); //$NON-NLS-1$
tt.append(" Port used: "); //$NON-NLS-1$
tt.append(m_port);
if (!m_auts.isEmpty()) {
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java
index 4dc40442e..7b39de7ad 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java
@@ -24,13 +24,12 @@ public abstract class AbstractMonitoring implements IMonitoring {
/** the autId */
private String m_autId;
- /** MonitoringDataStore which contains the configmaps */
+ /** MonitoringDataStore which contains the configuration maps */
private MonitoringDataStore m_mds = MonitoringDataStore.getInstance();
/**
* {@inheritDoc}
*/
- public void autRestartOccurred() {
-
+ public void autRestartOccurred() {
//do nothing
}
@@ -61,8 +60,7 @@ public abstract class AbstractMonitoring implements IMonitoring {
/**
* {@inheritDoc}
*/
- public void resetMonitoringData() {
-
+ public void resetMonitoringData() {
//do nothing
}
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java
index 90df68e81..f5fc97171 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java
@@ -48,10 +48,9 @@ public class BuildMonitoringReportCommand implements ICommand {
try {
m.send(message);
} catch (CommunicationException e) {
- LOG.debug("Failed to send SendMonitoringReportMessage", e); ////$NON-NLS-1$
+ LOG.debug("Failed to send SendMonitoringReportMessage", e); //$NON-NLS-1$
- }
-
+ }
return null;
}
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/GetMonitoringDataCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/GetMonitoringDataCommand.java
index 56fcd7756..a52705d8d 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/GetMonitoringDataCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/GetMonitoringDataCommand.java
@@ -61,7 +61,7 @@ public class GetMonitoringDataCommand implements ICommand {
try {
m.send(message);
} catch (CommunicationException e) {
- LOG.debug("faild to send GetMonitoringDataResponseMessage", e); ////$NON-NLS-1$
+ LOG.debug("faild to send GetMonitoringDataResponseMessage", e); //$NON-NLS-1$
}
return null;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/IMonitoring.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/IMonitoring.java
index c241d084d..5e94591ff 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/IMonitoring.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/IMonitoring.java
@@ -15,30 +15,16 @@ import java.util.Map;
import org.eclipse.jubula.tools.objects.IMonitoringValue;
/**
- * This interface contains all methods which will be called during test execution.
- * The IMonitoring interface must be implemented by a class with the following
- * syntax: com.bredexsw.guidancer.autagent.cc."MONITORING_ID".commands.MonitoringImpl"
- * The "MONITORING_ID" will be set via the extension.
+ * This interface contains all methods which will be called during monitoring execution.
+ *
* @author BREDEX GmbH
* @created 20.08.2010
*/
public interface IMonitoring {
- /**
- * This values can be set as monitoring value types
- * @author BREDEX GmbH
- * @created 11.11.2010
- */
- public enum MonitoringValueTyp {
- /** double value */
- DOUBLE,
- /** percent value */
- PERCENT,
- /** integer value */
- INTEGER
- }
+
/**
* This method is creating the agent string for starting the AUT with
- * the monitoring agent. The AUT-Config map for the given AUT should be saved
+ * a monitoring agent. The AUT configuration map for the given AUT should be saved
* in the MonitoringDataManager. Any further data read or input should
* be done by using this manager. Note that this method will be called every
* time a monitored application will be restarted.
@@ -55,23 +41,24 @@ public interface IMonitoring {
* be called
*
* @return The value of the String will be displayed in the TestResultSummaryView in the
- * "Measured Value Coloumn"
+ * "Measured Value Column"
*/
+
public Map<String, IMonitoringValue> getMonitoringData();
/**
* this method for report generation. It will be called a last.
* @return If the profiling agent supports a report generation, use this method
* to implement this functionality. The byte[] will be stored in the database.
- * The byte[] must be a Zipfile otherwise it can not be imported into guidancer workspace
+ * The byte[] must be a ZIP file otherwise it can not be imported into client workspace
*/
+
public byte[] buildMonitoringReport();
/**
* This Method will be executed, when AUT restart is performed.
*/
public void autRestartOccurred();
/**
- * This method will be called if reset of monitoring checkbox is selected in the
- * AutConfigDialog.
+ * to provide a reset of monitoring data.
*/
public void resetMonitoringData();
/** sets the autId
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringDataStore.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringDataStore.java
index f1f5a49c1..4c93e9ada 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringDataStore.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringDataStore.java
@@ -15,9 +15,7 @@ import java.util.Map;
/**
* This MonitoringDataStore is a singelton and can be instantiated in the
* AutAgent. The AUTConfigMap for each AUT will be saved separately in this
- * DataManager. This class should be used as a data storage class. For example:
- * The Jacoco class uses this Manager to store the port for the communication with
- * the jacocoagent, which will be defined at runtime.
+ * DataManager.
*
* @author BREDEX GmbH
* @created 25.08.2010
diff --git a/org.eclipse.jubula.autlauncher/.classpath b/org.eclipse.jubula.autlauncher/.classpath
index 4bd704402..a16c18b30 100644
--- a/org.eclipse.jubula.autlauncher/.classpath
+++ b/org.eclipse.jubula.autlauncher/.classpath
@@ -6,5 +6,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.tools"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.rc.common"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.autagent"/>
+ <classpathentry kind="lib" path="/org.eclipse.jubula.rc.orbit/org.apache.commons.cli_1.2.0.v201011021000.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.autlauncher/resources/log4j.properties b/org.eclipse.jubula.autlauncher/resources/log4j.properties
index c300c82ef..3103c1e95 100644
--- a/org.eclipse.jubula.autlauncher/resources/log4j.properties
+++ b/org.eclipse.jubula.autlauncher/resources/log4j.properties
@@ -8,11 +8,6 @@
#logging for GDRun
-#[WindowsSyslog]
-# log4j.appender.all=org.apache.log4j.nt.NTEventLogAppender
-# log4j.appender.all.source=GUIdancer
-#[WindowsSyslog]
-
#[UnixEventlog]
# log4j.appender.all=org.apache.log4j.net.SyslogAppender
# log4j.appender.all.SyslogHost=localhost
diff --git a/org.eclipse.jubula.autlauncher/src/org/eclipse/jubula/autlauncher/GDRun.java b/org.eclipse.jubula.autlauncher/src/org/eclipse/jubula/autlauncher/GDRun.java
index b9caa4aaf..633fb3a9d 100644
--- a/org.eclipse.jubula.autlauncher/src/org/eclipse/jubula/autlauncher/GDRun.java
+++ b/org.eclipse.jubula.autlauncher/src/org/eclipse/jubula/autlauncher/GDRun.java
@@ -47,7 +47,6 @@ import org.slf4j.LoggerFactory;
* @created Dec 9, 2009
*/
public class GDRun {
-
/** the logger */
private static final Logger LOG = LoggerFactory.getLogger(GDRun.class);
diff --git a/org.eclipse.jubula.build/feature/client/.gitignore b/org.eclipse.jubula.build/feature/client/.gitignore
new file mode 100644
index 000000000..989213ce4
--- /dev/null
+++ b/org.eclipse.jubula.build/feature/client/.gitignore
@@ -0,0 +1,3 @@
+/buildDirectory
+/eclipse
+/artifacts
diff --git a/org.eclipse.jubula.build/feature/client/client.build.properties b/org.eclipse.jubula.build/feature/client/build.properties
index fd83a124a..a9fa75f5c 100644
--- a/org.eclipse.jubula.build/feature/client/client.build.properties
+++ b/org.eclipse.jubula.build/feature/client/build.properties
@@ -23,12 +23,13 @@ topLevelElementId = org.eclipse.jubula.feature.client
############# PRODUCT/PACKAGING CONTROL #############
#product=/plugin or feature id/path/to/.product
runPackager=true
+p2.gathering = true
#Set the name of the archive that will result from the product build.
#archiveNamePrefix=
# The prefix that will be used in the generated archive.
-archivePrefix=jubula.feature.client
+#archivePrefix=
# The location underwhich all of the build output will be collected.
collectingFolder=${archivePrefix}
@@ -37,24 +38,25 @@ collectingFolder=${archivePrefix}
# value is a '&' separated list of ',' separate triples. For example,
# configs=win32,win32,x86 & linux,motif,x86
# By default the value is *,*,*
-#configs = *, *, *
-configs=win32, win32, x86
+configs = *, *, *
+#configs=win32,win32,x86 & \
# win32,win32,x86_64 & \
-# win32,win32,wpf & \
-# linux, gtk, ppc & \
# linux, gtk, x86 & \
-# linux, gtk, x86_64 & \
-# linux, motif, x86 & \
-# solaris, motif, sparc & \
-# solaris, gtk, sparc & \
-# aix, motif, ppc & \
-# hpux, motif, ia64_32 & \
-# macosx, carbon, ppc & \
+# linux, gtk, x86_64
# macosx, carbon, x86 & \
-# macosx, cocoa, ppc & \
# macosx, cocoa, x86 & \
# macosx, cocoa, x86_64
+# win32,win32,wpf & \
+# linux, gtk, ppc & \
+# linux, motif, x86 & \
+# solaris, motif, sparc & \
+# solaris, gtk, sparc & \
+# aix, motif, ppc & \
+# hpux, motif, ia64_32 & \
+# macosx, carbon, ppc & \
+# macosx, cocoa, ppc & \
+
# By default PDE creates one archive (result) per entry listed in the configs property.
# Setting this value to true will cause PDE to only create one output containing all
# artifacts for all the platforms listed in the configs property.
@@ -124,7 +126,7 @@ tarargs=
buildType=I
# ID of the build. Used in naming the build output.
-buildId=TestBuild
+buildId=0.9.0
# Label for the build. Used in naming the build output
buildLabel=${buildType}.${buildId}
@@ -138,7 +140,7 @@ timestamp=007
#Enable / disable the generation of a suffix for the features that use .qualifier.
#The generated suffix is computed according to the content of the feature
-#generateFeatureVersionSuffix=true
+generateFeatureVersionSuffix=true
############# BASE CONTROL #############
# Settings for the base Eclipse components and Java class libraries
@@ -146,8 +148,6 @@ timestamp=007
# Base location for anything the build needs to compile against. For example,
# in most RCP app or a plug-in, the baseLocation should be the location of a previously
# installed Eclipse against which the application or plug-in code will be compiled and the RCP delta pack.
-
-base=/devapps/eclipse/eclipse361/
baseLocation=${base}/eclipse
#Folder containing repositories whose content is needed to compile against
@@ -156,8 +156,8 @@ baseLocation=${base}/eclipse
#transformedRepoLocation=${base}/transformedRepos
#Os/Ws/Arch/nl of the eclipse specified by baseLocation
-baseos=win32
-basews=win32
+baseos=linux
+basews=gtk
basearch=x86
#this property indicates whether you want the set of plug-ins and features to be considered during the build to be limited to the ones reachable from the features / plugins being built
@@ -172,18 +172,17 @@ resolution.devMode=false
#- a directory that contains a /plugins or /features subdirectory
#- the location of a feature.xml, or for 2.1 style plugins, the plugin.xml or fragment.xml
#pluginPath=
-
skipBase=true
-eclipseURL=<url for eclipse download site>
-eclipseBuildId=<Id of Eclipse build to get>
-eclipseBaseURL=${eclipseURL}/eclipse-platform-${eclipseBuildId}-win32.zip
+#eclipseURL=<url for eclipse download site>
+#eclipseBuildId=<Id of Eclipse build to get>
+#eclipseBaseURL=${eclipseURL}/eclipse-platform-${eclipseBuildId}-win32.zip
############# MAP FILE CONTROL ################
# This section defines CVS tags to use when fetching the map files from the repository.
# If you want to fetch the map file from repository / location, change the getMapFiles target in the customTargets.xml
-#skipMaps=true
+skipMaps=true
#mapsRepo=:pserver:anonymous@example.com/path/to/repo
#mapsRoot=path/to/maps
#mapsCheckoutTag=HEAD
@@ -202,8 +201,8 @@ eclipseBaseURL=${eclipseURL}/eclipse-platform-${eclipseBuildId}-win32.zip
# overriding value
# For example fetchTag=CVS=HEAD, SVN=v20050101
# fetchTag=HEAD
-# skipFetch=true
-
+skipFetch=true
+gitRepositoryURL=ssh://unixdev.bredex.de/projects/jubula/git/jubula
############# JAVA COMPILER OPTIONS ##############
# The location of the Java jars to compile against. Typically the rt.jar for your JDK/JRE
@@ -218,9 +217,9 @@ eclipseBaseURL=${eclipseURL}/eclipse-platform-${eclipseBuildId}-win32.zip
#JRE-1.1=
#J2SE-1.2=
#J2SE-1.3=
-#J2SE-1.4=
-J2SE-1.5=/devapps/java/java1.5/lib/rt.jar
-#JavaSE-1.6=
+J2SE-1.4=/devapps/java/java1.4/jre/lib/rt.jar;/devapps/java/java1.4/jre/lib/jsse.jar
+J2SE-1.5=/devapps/java/java1.5/jre/lib/rt.jar;/devapps/java/java1.5/jre/lib/jsse.jar
+JavaSE-1.6=/devapps/java/java1.6/jre/lib/rt.jar;/devapps/java/java1.6/jre/lib/jsse.jar
#PersonalJava-1.1=
#PersonalJava-1.2=
#CDC-1.0/PersonalBasis-1.0=
diff --git a/org.eclipse.jubula.build/feature/client/buildFeature.xml b/org.eclipse.jubula.build/feature/client/buildFeature.xml
index 6cf1245ca..9885a8656 100644
--- a/org.eclipse.jubula.build/feature/client/buildFeature.xml
+++ b/org.eclipse.jubula.build/feature/client/buildFeature.xml
@@ -6,9 +6,9 @@
http://www.eclipse.org/legal/epl-v10.html
-->
-<project default="build" basedir="../../../">
- <property file="client.build.properties" />
-
+<project default="build">
+ <property file="build.properties" />
+
<target name="build">
<property name="baseLocation" value="${eclipse.home}" />
@@ -16,17 +16,33 @@
<property name="buildDirectory" value="${basedir}/buildDirectory" />
<property name="pluginPath" value="${basedir}/.." />
<property name="buildTempFolder" value="${buildDirectory}" />
-
- <ant antfile="${eclipse.pdebuild.scripts}/productBuild/productBuild.xml" />
-
- <move todir="${basedir}">
+
+ <property name="buildArtifactsFolder" value="${basedir}/artifacts" />
+
+ <delete dir="${buildArtifactsFolder}" />
+
+ <!-- <ant antfile="${eclipse.pdebuild.scripts}/build.xml" />
+
+ <property name="eclipseInstallation" value="/devapps/eclipse/eclipse361be" />
+ <exec executable="java" dir="${basedir}">
+ <arg value="-jar"/>
+ <arg value="${eclipseInstallation}/plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar" />
+ <arg value="-clean"/>
+ <arg value="-application"/>
+ <arg value="org.eclipse.ant.core.antRunner"/>
+ <arg value="-buildfile"/>
+ <arg value="${eclipseInstallation}/plugins/org.eclipse.pde.build_3.6.1.R36x_v20100823/scripts/build.xml"/>
+ <arg value="-Dbase=${basedir}"/>
+ <arg value="-DbuildDirectory=${buildDirectory}"/>
+ <arg value="-Dbuilder=${basedir}"/>
+ </exec>
+
+ <mkdir dir="${buildArtifactsFolder}" />
+ <move todir="${buildArtifactsFolder}">
<fileset dir="${buildDirectory}/${buildLabel}" includes="*.zip" />
</move>
-
- <!-- refresh the workspace -->
- <eclipse.convertPath fileSystemPath="${basedir}"
- property="resourcePath" />
- <eclipse.refreshLocal resource="${resourcePath}"
- depth="infinite" />
+ -->
+ <delete dir="${buildTempFolder}" />
+ <delete dir="${basedir}/eclipse" />
</target>
</project>
diff --git a/org.eclipse.jubula.build/feature/client/customTargets.xml b/org.eclipse.jubula.build/feature/client/customTargets.xml
new file mode 100644
index 000000000..12b598d5c
--- /dev/null
+++ b/org.eclipse.jubula.build/feature/client/customTargets.xml
@@ -0,0 +1,206 @@
+<project name="Build specific targets and properties" default="noDefault">
+
+ <!-- ===================================================================== -->
+ <!-- Run a given ${target} on all elements being built -->
+ <!-- Add on <ant> task for each top level element being built. -->
+ <!-- ===================================================================== -->
+ <available property="allElementsFile" file="${builder}/allElements.xml" value="${builder}/allElements.xml"/>
+ <property name="allElementsFile" location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
+
+ <import file="${allElementsFile}" />
+ <target name="allElements">
+ <antcall target="allElementsDelegator" />
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- ===================================================================== -->
+ <target name="getBaseComponents" depends="checkLocalBase" unless="skipBase">
+ <get src="${eclipseBaseURL}" dest="${buildDirectory}/../temp-base.zip" />
+ <unzip dest="${base}" overwrite="true" src="${buildDirectory}/../temp-base.zip" />
+ </target>
+
+ <target name="checkLocalBase">
+ <available file="${base}" property="skipBase" />
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Check out map files from correct repository -->
+ <!-- Replace values for mapsCheckoutTag as desired. -->
+ <!-- ===================================================================== -->
+ <target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
+ <property name="mapsCheckoutTag" value="HEAD" />
+ <cvs cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
+ </target>
+
+ <target name="checkLocalMaps">
+ <available property="skipMaps" file="${buildDirectory}/maps" />
+ </target>
+
+ <target name="tagMapFiles" if="tagMaps">
+ <cvs dest="${buildDirectory}/maps/${mapsRoot}" command="tag ${mapsTagTag}" />
+ </target>
+
+ <!-- ===================================================================== -->
+
+ <target name="clean" unless="noclean">
+ <antcall target="allElements">
+ <param name="target" value="cleanElement" />
+ </antcall>
+ </target>
+
+ <target name="gatherLogs">
+ <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
+ <antcall target="allElements">
+ <param name="target" value="gatherLogs" />
+ </antcall>
+ <unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
+ <fileset dir="${buildDirectory}/features">
+ <include name="**/*.log.zip" />
+ </fileset>
+ </unzip>
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before setup -->
+ <!-- ===================================================================== -->
+ <target name="preSetup">
+ <antcall target="getBaseComponents" />
+ <property name="repCloneFolder" value="${buildDirectory}/plugins" />
+
+ <property name="pluginsFolder" value="${repCloneFolder}" />
+ <property name="featureFolder" value="${buildDirectory}/features" />
+
+ <!-- cleanup old build directory -->
+ <delete dir="${buildDirectory}" />
+ <mkdir dir="${buildDirectory}" />
+
+ <!-- manually retrieve the git resources -->
+ <exec executable="git" dir="${buildDirectory}">
+ <arg value="clone" />
+ <arg value="${gitRepositoryURL}" />
+ <arg value="${repCloneFolder}" />
+ </exec>
+
+ <!-- move features to the "features" directory -->
+ <move todir="${featureFolder}/org.eclipse.jubula.feature.client">
+ <fileset dir="${pluginsFolder}/org.eclipse.jubula.feature.client" />
+ </move>
+
+ <!-- cleanup old base location directory -->
+ <delete dir="${baseLocation}" />
+ <mkdir dir="${baseLocation}/plugins" />
+ <property name="targetPlatformLocation" value="${pluginsFolder}/org.eclipse.jubula.project.configuration/target/platform" />
+ <move todir="${baseLocation}/plugins">
+ <fileset dir="${targetPlatformLocation}/deltaPack/plugins" />
+ <fileset dir="${targetPlatformLocation}/eclipse/plugins" />
+ <fileset dir="${targetPlatformLocation}/mylyn/plugins" />
+ <fileset dir="${targetPlatformLocation}/persistence/plugins" />
+ </move>
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after setup but before starting the build proper -->
+ <!-- ===================================================================== -->
+ <target name="postSetup">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before fetching the build elements -->
+ <!-- ===================================================================== -->
+ <target name="preFetch">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after fetching the build elements -->
+ <!-- ===================================================================== -->
+ <target name="postFetch">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before the repositories are being processed -->
+ <!-- ===================================================================== -->
+ <target name="preProcessRepos">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the repositories have been processed -->
+ <!-- ===================================================================== -->
+ <target name="postProcessRepos">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before generating the build scripts. -->
+ <!-- ===================================================================== -->
+ <target name="preGenerate">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after generating the build scripts. -->
+ <!-- ===================================================================== -->
+ <target name="postGenerate">
+ <antcall target="clean" />
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before running the build.xmls for the elements being built. -->
+ <!-- ===================================================================== -->
+ <target name="preProcess">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after running the build.xmls for the elements being built. -->
+ <!-- ===================================================================== -->
+ <target name="postProcess">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before running assemble. -->
+ <!-- ===================================================================== -->
+ <target name="preAssemble">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after running assemble. -->
+ <!-- ===================================================================== -->
+ <target name="postAssemble">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before running package. -->
+ <!-- ===================================================================== -->
+ <target name="prePackage">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after running package. -->
+ <!-- ===================================================================== -->
+ <target name="postPackage">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after the build is done. -->
+ <!-- ===================================================================== -->
+ <target name="postBuild">
+ <antcall target="gatherLogs" />
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do to test the build results -->
+ <!-- ===================================================================== -->
+ <target name="test">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do to publish the build results -->
+ <!-- ===================================================================== -->
+ <target name="publish">
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Default target -->
+ <!-- ===================================================================== -->
+ <target name="noDefault">
+ <echo message="You must specify a target when invoking this file" />
+ </target>
+
+</project>
diff --git a/org.eclipse.jubula.build/lib/sablecc/parameter.sable b/org.eclipse.jubula.build/lib/sablecc/parameter.sable
index 71c316f81..438b93cd5 100644
--- a/org.eclipse.jubula.build/lib/sablecc/parameter.sable
+++ b/org.eclipse.jubula.build/lib/sablecc/parameter.sable
@@ -1,4 +1,4 @@
-/* Grammar for GUIdancer parameter values. */
+/* Grammar for Client parameter values. */
Package org.eclipse.jubula.client.core.parser.parameter;
Helpers
@@ -6,34 +6,36 @@ Helpers
alphanumeric = ['0'..'9'] | ['a'..'z'] | ['A'..'Z'] | '_';
any_char = [0 .. 0xffff];
not_literal_symbol = [any_char - literal_symbol];
- escapable = ''' | '\' | '?' | '=' | '$';
+ escapable = ''' | '\' | '=' | '$';
States
normal,
+ variable,
+ var_brace,
+ reference,
+ ref_brace,
literal;
Tokens
{normal->literal}
open_literal = ''';
- {normal}
+ {normal->reference}
reference_token = '=';
{normal}
escaped_symbol = '\' escapable;
- {normal}
+ {variable->var_brace,reference->ref_brace}
open_brace = '{';
- {normal}
+ {variable->normal,var_brace->normal,reference->normal,ref_brace->normal}
close_brace = '}';
- {normal}
- open_parens = '(';
- {normal}
- close_parens = ')';
- {normal}
- function_symbol = '?';
- {normal}
+ {normal->variable}
variable_token = '$';
{normal}
alphanumeric = alphanumeric+;
+ {variable->normal,var_brace->variable}
+ variable_body = alphanumeric+;
+ {reference->normal,ref_brace->reference}
+ reference_body = alphanumeric+;
{normal}
char = any_char;
@@ -48,14 +50,10 @@ Productions
parameter = param_token+;
param_token = {literal}P.literal |
{escape_sequence}escaped_symbol |
- {reference}reference |
- {variable}variable |
- {function}function |
+ {reference}P.reference |
+ {variable}P.variable |
{alphanumeric}alphanumeric |
{any_sequence}char;
literal = open_literal literal_body? close_literal;
- function = function_symbol [function_name]:alphanumeric open_parens [function_argument]:alphanumeric? close_parens;
- reference = {bracketed_ref}reference_token open_brace [reference_body]:alphanumeric close_brace | {simple_ref}reference_token [reference_body]:alphanumeric;
- variable = {simple_var}simple_variable | {bracketed_var}bracketed_variable;
- simple_variable = variable_token alphanumeric;
- bracketed_variable = variable_token open_brace alphanumeric close_brace;
+ reference = reference_token open_brace? reference_body? close_brace?;
+ variable = variable_token open_brace? variable_body? close_brace?;
diff --git a/org.eclipse.jubula.build/lib/sablecc/sablecc.jar b/org.eclipse.jubula.build/lib/sablecc/sablecc.jar
new file mode 100644
index 000000000..1580cd04b
--- /dev/null
+++ b/org.eclipse.jubula.build/lib/sablecc/sablecc.jar
Binary files differ
diff --git a/org.eclipse.jubula.client.archive/.classpath b/org.eclipse.jubula.client.archive/.classpath
index 4ba6ad30a..90a5d0f2e 100644
--- a/org.eclipse.jubula.client.archive/.classpath
+++ b/org.eclipse.jubula.client.archive/.classpath
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
+ <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="lib" path="lib/xbean.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="lib" path="lib/archiveModel.jar"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry exported="true" kind="lib" path="lib/archiveModel.jar"/>
<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 68a4f2c46..cbff6c386 100644
--- a/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Jubula Archive (Incubation)
Bundle-SymbolicName: org.eclipse.jubula.client.archive;singleton:=true
-Bundle-Version: 0.4.0
+Bundle-Version: 0.9.0.qualifier
Bundle-ClassPath: .,
org.eclipse.jubula.client.archive.jar,
lib/archiveModel.jar,
- lib/xbean.jar,
- lib/stax-api-1.0.1.jar
+ lib/org.apache.xmlbeans.jar,
+ lib/javax.xml.stream_1.0.1.v201004272200.jar
Bundle-Vendor: Eclipse Jubula
Export-Package: org.eclipse.jubula.client.archive;
uses:="org.eclipse.jubula.client.core.model,
@@ -16,8 +16,9 @@ Export-Package: org.eclipse.jubula.client.archive;
org.eclipse.jubula.client.archive.businessprocess,
org.eclipse.jubula.client.archive.errorhandling,
org.eclipse.jubula.client.archive.output
-Require-Bundle: org.eclipse.jubula.client.core,
- org.eclipse.core.runtime,
- org.apache.commons.beanutils;bundle-version="1.7.0"
+Require-Bundle: org.eclipse.jubula.client.core;bundle-version="[0.9.0,1.0.0)",
+ 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)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-BundleShape: jar
diff --git a/org.eclipse.jubula.client.archive/build.properties b/org.eclipse.jubula.client.archive/build.properties
index d625d67c9..7d1fd871d 100644
--- a/org.eclipse.jubula.client.archive/build.properties
+++ b/org.eclipse.jubula.client.archive/build.properties
@@ -9,7 +9,8 @@ bin.includes = org.eclipse.jubula.client.archive.jar,\
META-INF/,\
plugin.xml,\
lib/,\
- lib/xbean.jar
+ lib/javax.xml.stream_1.0.1.v201004272200.jar,\
+ lib/org.apache.xmlbeans.jar
jars.compile.order = org.eclipse.jubula.client.archive.jar
source.org.eclipse.jubula.client.archive.jar = src/
output.org.eclipse.jubula.client.archive.jar = bin/
diff --git a/org.eclipse.jubula.client.archive/customBuildCallbacks.xml b/org.eclipse.jubula.client.archive/customBuildCallbacks.xml
index 9f2beae92..7ef3d7ec7 100644
--- a/org.eclipse.jubula.client.archive/customBuildCallbacks.xml
+++ b/org.eclipse.jubula.client.archive/customBuildCallbacks.xml
@@ -70,10 +70,10 @@
classpathref="project.class.path" />
<mkdir dir="${classes}"/>
<mkdir dir="${jars}"/>
- <xmlbean
+ <xmlbean
schema="model/archiveModel.xsd"
destfile="${lib}/archiveModel.jar"
- javasource="1.5"
+ javasource="1.5"
classpathref="project.class.path" />
</target>
diff --git a/org.eclipse.jubula.client.archive/lib/javax.xml.stream_1.0.1.v201004272200.jar b/org.eclipse.jubula.client.archive/lib/javax.xml.stream_1.0.1.v201004272200.jar
new file mode 100644
index 000000000..6c929b76a
--- /dev/null
+++ b/org.eclipse.jubula.client.archive/lib/javax.xml.stream_1.0.1.v201004272200.jar
Binary files differ
diff --git a/org.eclipse.jubula.client.archive/lib/org.apache.xmlbeans.jar b/org.eclipse.jubula.client.archive/lib/org.apache.xmlbeans.jar
new file mode 100644
index 000000000..ccd816342
--- /dev/null
+++ b/org.eclipse.jubula.client.archive/lib/org.apache.xmlbeans.jar
Binary files differ
diff --git a/org.eclipse.jubula.client.archive/model/archiveModel.xsd b/org.eclipse.jubula.client.archive/model/archiveModel.xsd
index cd4b7e344..ede341fa3 100644
--- a/org.eclipse.jubula.client.archive/model/archiveModel.xsd
+++ b/org.eclipse.jubula.client.archive/model/archiveModel.xsd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema elementFormDefault="qualified" xml:lang="EN" targetNamespace="http://www.bredexsw.com/guidancer/client/importer/gdschema" xmlns:gd="http://www.bredexsw.com/guidancer/client/importer/gdschema" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:annotation>
- <xs:documentation xml:lang="en"> Schema for GUIdancer test projects. Used for
+ <xs:documentation xml:lang="en"> Schema for Jubula test projects. Used for
export/import and optional external generators. Copyright 2005 BREDEX GmbH.
All rights reserved.
</xs:documentation>
@@ -77,6 +77,8 @@
minOccurs="0" maxOccurs="1" />
<xs:element name="checkConfiguration" type="gd:checkConfiguration"
minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="teststyleEnabled" type="xs:boolean" minOccurs="0"
+ nillable="false" default="false" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
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 4e15e67d4..1b7434e3f 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
@@ -76,8 +76,8 @@ 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.StringConstants;
-import org.eclipse.jubula.tools.exception.GDException;
-import org.eclipse.jubula.tools.exception.GDProjectDeletedException;
+import org.eclipse.jubula.tools.exception.JBException;
+import org.eclipse.jubula.tools.exception.ProjectDeletedException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.objects.IMonitoringValue;
import org.eclipse.jubula.tools.objects.MonitoringValue;
@@ -355,14 +355,13 @@ class XmlExporter {
*/
public void fillProject(Project xml, IProjectPO po,
boolean includeTestResultSummaries)
- throws GDProjectDeletedException, PMException,
+ throws ProjectDeletedException, PMException,
OperationCanceledException {
fillNode(xml, po);
fillAttributes(xml, po, po.getProjectAttributeDescriptions());
checkForCancel();
fillCheckConfiguration(
xml, po.getProjectProperties().getCheckConfCont());
-
// used toolkits
fillUsedToolkits(xml, po);
// All project toolkit info finished
@@ -416,7 +415,6 @@ class XmlExporter {
// reused projects
handleReusedProjects(xml, po);
checkForCancel();
-
// testresult summaries
if (includeTestResultSummaries) {
fillTestResultSummary(xml, po);
@@ -427,6 +425,8 @@ class XmlExporter {
xml.setMinorProjectVersion(po.getMinorProjectVersion());
xml.setIsReusable(po.getIsReusable());
xml.setIsProtected(po.getIsProtected());
+ xml.setTeststyleEnabled(
+ po.getProjectProperties().getCheckConfCont().getEnabled());
xml.setTestResultDetailsCleanupInterval(
po.getTestResultCleanupInterval());
m_monitor.worked(1);
@@ -677,14 +677,14 @@ class XmlExporter {
* The XML element to which the toolkits will be added.
* @param po
* The project from which the toolkits will be read.
- * @throws GDProjectDeletedException
+ * @throws ProjectDeletedException
* if the project was deleted while toolkits were being read.
* @throws PMSaveException
* if a database error occurs while reading the project
* toolkits.
*/
private void fillUsedToolkits(Project xml, IProjectPO po)
- throws GDProjectDeletedException, PMSaveException {
+ throws ProjectDeletedException, PMSaveException {
UsedToolkitBP toolkitBP = UsedToolkitBP.getInstance();
try {
@@ -890,7 +890,7 @@ class XmlExporter {
try {
xml.setProjectGuid(ProjectPM.loadProjectById(
po.getSpecTestCase().getParentProjectId()).getGuid());
- } catch (GDException e) {
+ } catch (JBException e) {
// FIXME zeb Could not load project for spec testcase
}
}
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 5c744a74b..5d58923b0 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
@@ -34,6 +34,7 @@ import org.apache.commons.logging.LogFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jubula.client.archive.converter.AbstractXmlConverter;
import org.eclipse.jubula.client.archive.converter.AutIdGenerationConverter;
+import org.eclipse.jubula.client.archive.converter.HTMLTechnicalComponentIndexConverter;
import org.eclipse.jubula.client.archive.converter.IXmlConverter;
import org.eclipse.jubula.client.archive.converter.V4C001;
import org.eclipse.jubula.client.archive.i18n.Messages;
@@ -99,10 +100,10 @@ import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.Assert;
-import org.eclipse.jubula.tools.exception.GDVersionException;
import org.eclipse.jubula.tools.exception.InvalidDataException;
+import org.eclipse.jubula.tools.exception.JBVersionException;
import org.eclipse.jubula.tools.i18n.CompSystemI18n;
-import org.eclipse.jubula.tools.jarutils.IGdVersion;
+import org.eclipse.jubula.tools.jarutils.IVersion;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.objects.ComponentIdentifier;
import org.eclipse.jubula.tools.objects.IComponentIdentifier;
@@ -212,7 +213,7 @@ class XmlImporter {
try {
return convertToString(arg1);
} catch (Throwable e) {
- throw new ConversionException((Exception)e);
+ throw new ConversionException(e);
}
}
throw new ConversionException("Can convert only strings");
@@ -275,53 +276,71 @@ class XmlImporter {
}
/**
- * Creates the instance of the persistent object which is defined by the
- * XML element used as prameter. The method generates all dependend objects
- * as well.
- * @param xml Abstraction of the XML element (see Apache XML Beans)
- * @param paramNameMapper mapper to resolve param names
- * @param compNameCache cache to resolve component names
+ * Creates the instance of the persistent object which is defined by the XML
+ * element used as prameter. The method generates all dependend objects as
+ * well.
+ *
+ * @param xml
+ * Abstraction of the XML element (see Apache XML Beans)
+ * @param paramNameMapper
+ * mapper to resolve param names
+ * @param compNameCache
+ * cache to resolve component names
* @return a persistent object generated from the information in the XML
- * element
- * @throws InvalidDataException if some data is invalid when constructing
- * an object. This should not happen for exported project, but may happen
- * when someone generates XML project description outside of GUIdancer.
- * @throws GDVersionException in case of version conflict between used toolkits
- * of imported project and the installed Toolkit Plugins
- * @throws InterruptedException if the operation was canceled.
+ * element
+ * @throws InvalidDataException
+ * if some data is invalid when constructing an object. This
+ * should not happen for exported project, but may happen when
+ * someone generates XML project description outside of
+ * GUIdancer.
+ * @throws JBVersionException
+ * in case of version conflict between used toolkits of imported
+ * project and the installed Toolkit Plugins
+ * @throws InterruptedException
+ * if the operation was canceled.
*/
public IProjectPO createProject(Project xml,
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache)
- throws InvalidDataException, GDVersionException, InterruptedException {
+ throws InvalidDataException, JBVersionException, InterruptedException {
return createProject(xml, false, paramNameMapper, compNameCache);
}
/**
- * Creates the instance of the persistent object which is defined by the
- * XML element used as parameter. The method generates all dependend objects
- * as well. This method also assigns a new version number to the persistent
+ * Creates the instance of the persistent object which is defined by the XML
+ * element used as parameter. The method generates all dependend objects as
+ * well. This method also assigns a new version number to the persistent
* object.
- * @param xml Abstraction of the XML element (see Apache XML Beans)
- * @param majorVersion Major version number for the created object.
- * @param minorVersion Minor version number for the created object.
- * @param paramNameMapper mapper to resolve param names
- * @param compNameCache cache to resolve component names
+ *
+ * @param xml
+ * Abstraction of the XML element (see Apache XML Beans)
+ * @param majorVersion
+ * Major version number for the created object.
+ * @param minorVersion
+ * Minor version number for the created object.
+ * @param paramNameMapper
+ * mapper to resolve param names
+ * @param compNameCache
+ * cache to resolve component names
* @return a persistent object generated from the information in the XML
- * element
- * @throws InvalidDataException if some data is invalid when constructing
- * an object. This should not happen for exported project, but may happen
- * when someone generates XML project description outside of GUIdancer.
- * @throws GDVersionException in case of version conflict between used toolkits
- * of imported project and the installed Toolkit Plugins
- * @throws InterruptedException if the operation was canceled.
+ * element
+ * @throws InvalidDataException
+ * if some data is invalid when constructing an object. This
+ * should not happen for exported project, but may happen when
+ * someone generates XML project description outside of
+ * GUIdancer.
+ * @throws JBVersionException
+ * in case of version conflict between used toolkits of imported
+ * project and the installed Toolkit Plugins
+ * @throws InterruptedException
+ * if the operation was canceled.
*/
public IProjectPO createProject(Project xml,
Integer majorVersion, Integer minorVersion,
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache)
- throws InvalidDataException, GDVersionException, InterruptedException {
+ throws InvalidDataException, JBVersionException, InterruptedException {
xml.setMajorProjectVersion(majorVersion);
xml.setMinorProjectVersion(minorVersion);
@@ -329,29 +348,37 @@ class XmlImporter {
}
/**
- * Creates the instance of the persistent object which is defined by the
- * XML element used as prameter. The method generates all dependend objects
- * as well.
- * @param xml Abstraction of the XML element (see Apache XML Beans)
- * @param assignNewGuid <code>true</code> if the project and all subnodes
- * should be assigned new GUIDs. Otherwise
- * <code>false</code>.
- * @param paramNameMapper mapper to resolve param names
- * @param compNameCache cache to resolve component names
+ * Creates the instance of the persistent object which is defined by the XML
+ * element used as prameter. The method generates all dependend objects as
+ * well.
+ *
+ * @param xml
+ * Abstraction of the XML element (see Apache XML Beans)
+ * @param assignNewGuid
+ * <code>true</code> if the project and all subnodes should be
+ * assigned new GUIDs. Otherwise <code>false</code>.
+ * @param paramNameMapper
+ * mapper to resolve param names
+ * @param compNameCache
+ * cache to resolve component names
* @return a persistent object generated from the information in the XML
- * element
- * @throws InvalidDataException if some data is invalid when constructing
- * an object. This should not happen for exported project, but may happen
- * when someone generates XML project description outside of GUIdancer.
- * @throws InterruptedException if the operation was canceled
- * @throws GDVersionException in case of version conflict between used toolkits
- * of imported project and the installed Toolkit Plugins
+ * element
+ * @throws InvalidDataException
+ * if some data is invalid when constructing an object. This
+ * should not happen for exported project, but may happen when
+ * someone generates XML project description outside of
+ * GUIdancer.
+ * @throws InterruptedException
+ * if the operation was canceled
+ * @throws JBVersionException
+ * in case of version conflict between used toolkits of imported
+ * project and the installed Toolkit Plugins
*/
public IProjectPO createProject(Project xml, boolean assignNewGuid,
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache)
throws InvalidDataException,
- InterruptedException, GDVersionException {
+ InterruptedException, JBVersionException {
checkMinimumRequiredXMLVersion(xml);
documentRequiredProjects(xml);
@@ -363,6 +390,7 @@ class XmlImporter {
// ======= register converter here =======
listOfConverter.add(new AutIdGenerationConverter());
listOfConverter.add(new V4C001());
+ listOfConverter.add(new HTMLTechnicalComponentIndexConverter());
// =======================================
for (IXmlConverter c : listOfConverter) {
@@ -378,20 +406,20 @@ class XmlImporter {
/**
* @param xml
* the project xml
- * @throws GDVersionException
+ * @throws JBVersionException
* in case of version conflict between given xml and minimum xml
* version number; if these versions do not fit the current
* available converter are not able to convert the given project
* xml properly.
*/
private void checkMinimumRequiredXMLVersion(Project xml)
- throws GDVersionException {
+ throws JBVersionException {
if (!xml.isSetMetaDataVersion()
|| xml.getMetaDataVersion()
- < IGdVersion.GD_CLIENT_MIN_XML_METADATA_VERSION) {
+ < IVersion.JB_CLIENT_MIN_XML_METADATA_VERSION) {
List<String> errorMsgs = new ArrayList<String>();
errorMsgs.add(Messages.XmlImporterProjectXMLTooOld);
- throw new GDVersionException(
+ throw new JBVersionException(
Messages.XmlImporterProjectXMLTooOld,
MessageIDs.E_LOAD_PROJECT_XML_VERSION_ERROR,
errorMsgs);
@@ -399,11 +427,13 @@ class XmlImporter {
}
/**
- * @param xml the xml project
- * @throws GDVersionException in case of version conflict between used toolkits
- * of imported project and the installed Toolkit Plugins
+ * @param xml
+ * the xml project
+ * @throws JBVersionException
+ * in case of version conflict between used toolkits of imported
+ * project and the installed Toolkit Plugins
*/
- private void checkUsedToolkits(Project xml) throws GDVersionException {
+ private void checkUsedToolkits(Project xml) throws JBVersionException {
Set<IUsedToolkitPO> usedTK = new HashSet<IUsedToolkitPO>();
for (UsedToolkit usedToolkit : xml.getUsedToolkitList()) {
usedTK.add(PoMaker.createUsedToolkitsPO(usedToolkit.getName(),
@@ -413,7 +443,7 @@ class XmlImporter {
}
List<String> errorMsgs = new ArrayList<String>();
if (!validateToolkitVersion(usedTK, xml.getName(), errorMsgs)) {
- throw new GDVersionException(
+ throw new JBVersionException(
Messages.IncompatibleToolkitVersion,
MessageIDs.E_LOAD_PROJECT_TOOLKIT_MAJOR_VERSION_ERROR,
errorMsgs);
@@ -687,6 +717,8 @@ class XmlImporter {
proj.setToolkit(xml.getAutToolKit());
proj.setIsReusable(xml.getIsReusable());
proj.setIsProtected(xml.getIsProtected());
+ proj.getProjectProperties().getCheckConfCont().setEnabled(
+ xml.getTeststyleEnabled());
if (xml.isSetTestResultDetailsCleanupInterval()) {
proj.setTestResultCleanupInterval(xml
.getTestResultDetailsCleanupInterval());
@@ -789,13 +821,13 @@ class XmlImporter {
Integer minorProjVersion = xml.isSetMinorProjectVersion()
? xml.getMinorProjectVersion() : xml.getMinorNumber();
proj = NodeMaker.createProjectPO(
- IGdVersion.GD_CLIENT_METADATA_VERSION,
+ IVersion.JB_CLIENT_METADATA_VERSION,
majorProjVersion, minorProjVersion, xml.getGUID());
ProjectNameBP.getInstance().setName(xml.getGUID(), xml.getName(),
false);
} else {
- proj = NodeMaker.createProjectPO(xml.getName(), IGdVersion
- .GD_CLIENT_METADATA_VERSION);
+ proj = NodeMaker.createProjectPO(xml.getName(), IVersion
+ .JB_CLIENT_METADATA_VERSION);
if (assignNewGuid) {
m_oldToNewGuids.put(xml.getGUID(), proj.getGuid());
}
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 86001edba..af3d652c2 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
@@ -46,8 +46,8 @@ import org.eclipse.jubula.client.core.persistence.PMSaveException;
import org.eclipse.jubula.client.core.progress.IProgressConsole;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.ConverterException;
-import org.eclipse.jubula.tools.exception.GDProjectDeletedException;
-import org.eclipse.jubula.tools.exception.GDVersionException;
+import org.eclipse.jubula.tools.exception.ProjectDeletedException;
+import org.eclipse.jubula.tools.exception.JBVersionException;
import org.eclipse.jubula.tools.exception.InvalidDataException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
@@ -167,19 +167,23 @@ public class XmlStorage {
/**
* Generate an XML document representing the content of the project.
*
- * @param project the root of the data
- * @param includeTestResultSummaries
- * Whether to save the Test Result Summaries as well.
- * @param monitor The progress monitor for this potentially long-running
- * operation.
- * @return a String which contains the XML representation, or
+ * @param project
+ * the root of the data
+ * @param includeTestResultSummaries
+ * Whether to save the Test Result Summaries as well.
+ * @param monitor
+ * The progress monitor for this potentially long-running
+ * operation.
+ * @return a String which contains the XML representation, or
* <code>null</code> if the operation was cancelled.
- * @throws PMException of io or encoding errors
- * @throws GDProjectDeletedException in case of current project is already deleted
+ * @throws PMException
+ * of io or encoding errors
+ * @throws ProjectDeletedException
+ * in case of current project is already deleted
*/
private static String save(IProjectPO project,
boolean includeTestResultSummaries, IProgressMonitor monitor)
- throws GDProjectDeletedException, PMException {
+ throws ProjectDeletedException, PMException {
XmlOptions genOpts = new XmlOptions();
genOpts.setCharacterEncoding(RECOMMENDED_CHAR_ENCODING);
genOpts.setSaveInner();
@@ -235,26 +239,32 @@ public class XmlStorage {
*
* @param xmlString
* XML representation of a project
- * @param assignNewGuid <code>true</code> if the project and all subnodes
- * should be assigned new GUIDs. Otherwise
- * <code>false</code>.
- * @param paramNameMapper mapper to resolve param names
- * @param compNameCache cache to resolve component names
- * @param monitor The progress monitor for this potentially long-running
- * operation.
- * @param io the device to write the import output
+ * @param assignNewGuid
+ * <code>true</code> if the project and all subnodes should be
+ * assigned new GUIDs. Otherwise <code>false</code>.
+ * @param paramNameMapper
+ * mapper to resolve param names
+ * @param compNameCache
+ * cache to resolve component names
+ * @param monitor
+ * The progress monitor for this potentially long-running
+ * operation.
+ * @param io
+ * the device to write the import output
* @return an transient IProjectPO and its components
* @throws PMReadException
* in case of a malformed XML string
- * @throws GDVersionException in case of version conflict between used toolkits
- * of imported project and the installed Toolkit Plugins
- * @throws InterruptedException if the operation was canceled.
+ * @throws JBVersionException
+ * in case of version conflict between used toolkits of imported
+ * project and the installed Toolkit Plugins
+ * @throws InterruptedException
+ * if the operation was canceled.
*/
public static IProjectPO load(String xmlString, boolean assignNewGuid,
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, IProgressMonitor monitor,
IProgressConsole io)
- throws PMReadException, GDVersionException, InterruptedException,
+ throws PMReadException, JBVersionException, InterruptedException,
ConverterException {
return load(xmlString, assignNewGuid, null, null, paramNameMapper,
@@ -267,24 +277,29 @@ public class XmlStorage {
*
* @param xmlString
* XML representation of a project
- * @param assignNewGuid <code>true</code> if the project and all subnodes
- * should be assigned new GUIDs. Otherwise
- * <code>false</code>.
- * @param paramNameMapper mapper to resolve param names
- * @param compNameCache cache to resolve component names
- * @param monitor The progress monitor for this potentially long-running
- * operation.
+ * @param assignNewGuid
+ * <code>true</code> if the project and all subnodes should be
+ * assigned new GUIDs. Otherwise <code>false</code>.
+ * @param paramNameMapper
+ * mapper to resolve param names
+ * @param compNameCache
+ * cache to resolve component names
+ * @param monitor
+ * The progress monitor for this potentially long-running
+ * operation.
* @return an transient IProjectPO and its components
* @throws PMReadException
* in case of a malformed XML string
- * @throws GDVersionException in case of version conflict between used toolkits
- * of imported project and the installed Toolkit Plugins
- * @throws InterruptedException if the operation was canceled.
+ * @throws JBVersionException
+ * in case of version conflict between used toolkits of imported
+ * project and the installed Toolkit Plugins
+ * @throws InterruptedException
+ * if the operation was canceled.
*/
public static IProjectPO load(String xmlString, boolean assignNewGuid,
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, IProgressMonitor monitor)
- throws PMReadException, GDVersionException, InterruptedException,
+ throws PMReadException, JBVersionException, InterruptedException,
ConverterException {
return load(xmlString, assignNewGuid, null, null, paramNameMapper,
compNameCache, monitor, new NullImportOutput());
@@ -316,7 +331,7 @@ public class XmlStorage {
* @return an transient IProjectPO and its components
* @throws PMReadException
* in case of a malformed XML string
- * @throws GDVersionException
+ * @throws JBVersionException
* in case of version conflict between used toolkits of imported
* project and the installed Toolkit Plugins
* @throws InterruptedException
@@ -326,7 +341,7 @@ public class XmlStorage {
Integer majorVersion, Integer minorVersion,
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, IProgressMonitor monitor)
- throws PMReadException, GDVersionException, InterruptedException,
+ throws PMReadException, JBVersionException, InterruptedException,
ConverterException {
return load(xmlString, assignNewGuid, majorVersion, minorVersion,
paramNameMapper, compNameCache,
@@ -341,30 +356,38 @@ public class XmlStorage {
* XML representation of a project
* @param assignNewGuid
* Flag for assigning the project a new GUID and version
- * @param majorVersion Major version number for the created object, or
- * <code>null</code> if the version from the imported
- * XML should be used.
- * @param minorVersion Minor version number for the created object, or
- * <code>null</code> if the version from the imported
- * XML should be used.
- * @param paramNameMapper mapper to resolve param names
- * @param compNameCache cache to resolve component names
- * @param monitor The progress monitor for this potentially long-running
- * operation.
- * @param io the device to write the import output
+ * @param majorVersion
+ * Major version number for the created object, or
+ * <code>null</code> if the version from the imported XML should
+ * be used.
+ * @param minorVersion
+ * Minor version number for the created object, or
+ * <code>null</code> if the version from the imported XML should
+ * be used.
+ * @param paramNameMapper
+ * mapper to resolve param names
+ * @param compNameCache
+ * cache to resolve component names
+ * @param monitor
+ * The progress monitor for this potentially long-running
+ * operation.
+ * @param io
+ * the device to write the import output
* @return an transient IProjectPO and its components
* @throws PMReadException
* in case of a malformed XML string
- * @throws GDVersionException in case of version conflict between used toolkits
- * of imported project and the installed Toolkit Plugins
- * @throws InterruptedException if the operation was canceled.
+ * @throws JBVersionException
+ * in case of version conflict between used toolkits of imported
+ * project and the installed Toolkit Plugins
+ * @throws InterruptedException
+ * if the operation was canceled.
*/
public static IProjectPO load(String xmlString, boolean assignNewGuid,
Integer majorVersion, Integer minorVersion,
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, IProgressMonitor monitor,
IProgressConsole io)
- throws PMReadException, GDVersionException, InterruptedException,
+ throws PMReadException, JBVersionException, InterruptedException,
ConverterException {
ContentDocument contentDoc;
@@ -428,51 +451,72 @@ public class XmlStorage {
}
/**
- * Save a project as XML to a file or return the serialized project as string, if fileName == null!
+ * Save a project as XML to a file or return the serialized project as
+ * string, if fileName == null!
*
- * @param proj proj to be saved
- * @param fileName name for file to save or null, if wanting to get the project as serialized string
- * @param includeTestResultSummaries
- * Whether to save the Test Result Summaries as well.
- * @param monitor The progress monitor for this potentially long-running
- * operation.
- * @return the serialized project as string, if fileName == null<br>or<br><b>Returns:</b><br>null otherwise.
- * Always returns <code>null</code> if the save operation was canceled.
- * @throws PMException if save failed for any reason
- * @throws GDProjectDeletedException in case of current project is already deleted
+ * @param proj
+ * proj to be saved
+ * @param fileName
+ * name for file to save or null, if wanting to get the project
+ * as serialized string
+ * @param includeTestResultSummaries
+ * Whether to save the Test Result Summaries as well.
+ * @param monitor
+ * The progress monitor for this potentially long-running
+ * operation.
+ * @return the serialized project as string, if fileName == null<br>
+ * or<br>
+ * <b>Returns:</b><br>
+ * null otherwise. Always returns <code>null</code> if the save
+ * operation was canceled.
+ * @throws PMException
+ * if save failed for any reason
+ * @throws ProjectDeletedException
+ * in case of current project is already deleted
*/
public static String save(IProjectPO proj, String fileName,
boolean includeTestResultSummaries, IProgressMonitor monitor)
- throws GDProjectDeletedException, PMException {
+ throws ProjectDeletedException, PMException {
return save(proj, fileName, includeTestResultSummaries,
monitor, false, null);
}
/**
- * Save a project as XML to a file or return the serialized project as string, if fileName == null!
+ * Save a project as XML to a file or return the serialized project as
+ * string, if fileName == null!
*
- * @param proj proj to be saved
- * @param fileName name for file to save or null, if wanting to get the project as serialized string
- * @param includeTestResultSummaries
- * Whether to save the Test Result Summaries as well.
- * @param monitor The progress monitor for this potentially long-running
- * operation.
- * @param writeToSystemTempDir Indicates whether the project has to be
- * written to the system temp directory
- * @param listOfProjectFiles If a project is written into the temp dir
- * then the written file is added to the list,
- * if the list is not null.
- * @return the serialized project as string, if fileName == null<br>or<br><b>Returns:</b><br>null otherwise.
- * Always returns <code>null</code> if the save operation was canceled.
- * @throws PMException if save failed for any reason
- * @throws GDProjectDeletedException in case of current project is already deleted
+ * @param proj
+ * proj to be saved
+ * @param fileName
+ * name for file to save or null, if wanting to get the project
+ * as serialized string
+ * @param includeTestResultSummaries
+ * Whether to save the Test Result Summaries as well.
+ * @param monitor
+ * The progress monitor for this potentially long-running
+ * operation.
+ * @param writeToSystemTempDir
+ * Indicates whether the project has to be written to the system
+ * temp directory
+ * @param listOfProjectFiles
+ * If a project is written into the temp dir then the written
+ * file is added to the list, if the list is not null.
+ * @return the serialized project as string, if fileName == null<br>
+ * or<br>
+ * <b>Returns:</b><br>
+ * null otherwise. Always returns <code>null</code> if the save
+ * operation was canceled.
+ * @throws PMException
+ * if save failed for any reason
+ * @throws ProjectDeletedException
+ * in case of current project is already deleted
*/
public static String save(IProjectPO proj, String fileName,
boolean includeTestResultSummaries,
IProgressMonitor monitor, boolean writeToSystemTempDir,
List<File> listOfProjectFiles)
- throws GDProjectDeletedException, PMException {
+ throws ProjectDeletedException, PMException {
monitor.beginTask(Messages.XmlStorageSavingProject,
getWorkToSave(proj));
@@ -715,28 +759,37 @@ public class XmlStorage {
}
/**
- * read a <code> GeneralStorage </code> object from filename
- * <b> call getProjectAutToolKit(String filename) at first </b>
- * @param filename name of file to read
- * @param paramNameMapper mapper to resolve param names
- * @param compNameCache cache to resolve component names
- * @param assignNewGuids <code>true</code> if new GUIDs should be created
- * for each PO. <code>false</code> if old GUIDs
- * should be used.
- * @param monitor The progress monitor for this potentially long-running
- * operation.
- * @param io the device to write the import output
+ * read a <code> GeneralStorage </code> object from filename <b> call
+ * getProjectAutToolKit(String filename) at first </b>
+ *
+ * @param filename
+ * name of file to read
+ * @param paramNameMapper
+ * mapper to resolve param names
+ * @param compNameCache
+ * cache to resolve component names
+ * @param assignNewGuids
+ * <code>true</code> if new GUIDs should be created for each PO.
+ * <code>false</code> if old GUIDs should be used.
+ * @param monitor
+ * The progress monitor for this potentially long-running
+ * operation.
+ * @param io
+ * the device to write the import output
* @return the persisted object
- * @throws PMReadException in case of error
- * @throws GDVersionException in case of version conflict between used toolkits
- * of imported project and the installed Toolkit Plugins
- * @throws InterruptedException if the operation was canceled.
+ * @throws PMReadException
+ * in case of error
+ * @throws JBVersionException
+ * in case of version conflict between used toolkits of imported
+ * project and the installed Toolkit Plugins
+ * @throws InterruptedException
+ * if the operation was canceled.
*/
public IProjectPO readProject(String filename,
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, boolean assignNewGuids,
IProgressMonitor monitor, IProgressConsole io) throws PMReadException,
- GDVersionException,
+ JBVersionException,
InterruptedException, ConverterException {
return load(readProjectFile(filename), assignNewGuids, paramNameMapper,
@@ -744,27 +797,35 @@ public class XmlStorage {
}
/**
- * read a <code> GeneralStorage </code> object from filename
- * <b> call getProjectAutToolKit(String filename) at first </b>
- * @param filename name of file to read
- * @param paramNameMapper mapper to resolve param names
- * @param compNameCache cache to resolve component names
- * @param assignNewGuids <code>true</code> if new GUIDs should be created
- * for each PO. <code>false</code> if old GUIDs
- * should be used.
- * @param monitor The progress monitor for this potentially long-running
- * operation.
+ * read a <code> GeneralStorage </code> object from filename <b> call
+ * getProjectAutToolKit(String filename) at first </b>
+ *
+ * @param filename
+ * name of file to read
+ * @param paramNameMapper
+ * mapper to resolve param names
+ * @param compNameCache
+ * cache to resolve component names
+ * @param assignNewGuids
+ * <code>true</code> if new GUIDs should be created for each PO.
+ * <code>false</code> if old GUIDs should be used.
+ * @param monitor
+ * The progress monitor for this potentially long-running
+ * operation.
* @return the persisted object
- * @throws PMReadException in case of error
- * @throws GDVersionException in case of version conflict between used toolkits
- * of imported project and the installed Toolkit Plugins
- * @throws InterruptedException if the operation was canceled.
+ * @throws PMReadException
+ * in case of error
+ * @throws JBVersionException
+ * in case of version conflict between used toolkits of imported
+ * project and the installed Toolkit Plugins
+ * @throws InterruptedException
+ * if the operation was canceled.
*/
public IProjectPO readProject(String filename,
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, boolean assignNewGuids,
IProgressMonitor monitor) throws PMReadException,
- GDVersionException,
+ JBVersionException,
InterruptedException, ConverterException {
return load(readProjectFile(filename), assignNewGuids, paramNameMapper,
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java
index 89546c120..a4afc7d8f 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java
@@ -77,10 +77,10 @@ import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.ConverterException;
import org.eclipse.jubula.tools.exception.GDConfigXmlException;
-import org.eclipse.jubula.tools.exception.GDException;
-import org.eclipse.jubula.tools.exception.GDProjectDeletedException;
-import org.eclipse.jubula.tools.exception.GDVersionException;
-import org.eclipse.jubula.tools.jarutils.IGdVersion;
+import org.eclipse.jubula.tools.exception.JBException;
+import org.eclipse.jubula.tools.exception.ProjectDeletedException;
+import org.eclipse.jubula.tools.exception.JBVersionException;
+import org.eclipse.jubula.tools.jarutils.IVersion;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.xml.businessmodell.CompSystem;
import org.eclipse.jubula.tools.xml.businessmodell.ToolkitPluginDescriptor;
@@ -184,7 +184,7 @@ public class FileStorageBP {
compNameCache, proj));
m_projectToMapperMap.put(proj, mapperList);
m_projectToCompMapperMap.put(proj, compNameMapperList);
- } catch (GDVersionException e) {
+ } catch (JBVersionException e) {
for (Object msg : e.getErrorMsgs()) {
m_console.writeErrorLine((String)msg);
}
@@ -306,7 +306,7 @@ public class FileStorageBP {
showFinishedImport(m_console, projectName);
} catch (PMSaveException e) {
LOG.warn(Messages.ErrorWhileImportingProject, e);
- GDException gde = new GDException(
+ JBException gde = new JBException(
e + StringConstants.SPACE + StringConstants.COLON
+ Messages.SaveOf + proj.getName()
+ StringConstants.SPACE + Messages.Failed,
@@ -316,15 +316,15 @@ public class FileStorageBP {
gde, new String [] {proj.getName()}, null);
} catch (PMException pme) {
LOG.warn(Messages.ErrorWhileImportingProject, pme);
- GDException gde = new GDException(
+ JBException gde = new JBException(
pme + Messages.ImportOf + proj.getName()
+ StringConstants.SPACE + Messages.Failed,
MessageIDs.E_IMPORT_PROJECT_XML_FAILED);
showErrorDuringImport(m_console, projectName, gde);
ErrorMessagePresenter.getPresenter().showErrorMessage(
gde, new String [] {proj.getName()}, null);
- } catch (GDProjectDeletedException e) {
- GDException gde = new GDException(
+ } catch (ProjectDeletedException e) {
+ JBException gde = new JBException(
e + Messages.ImportOf + proj.getName()
+ StringConstants.SPACE + Messages.Failed,
MessageIDs.E_ALREADY_DELETED_PROJECT);
@@ -366,7 +366,7 @@ public class FileStorageBP {
}
} catch (PMException pme) {
ErrorMessagePresenter.getPresenter().showErrorMessage(
- new GDException(
+ new JBException(
pme + Messages.ImportFailed,
MessageIDs.E_DATABASE_GENERAL),
null, null);
@@ -419,7 +419,7 @@ public class FileStorageBP {
try {
reusedProject = ProjectPM.loadReusedProject(
reused, circularDependencyCheckSess);
- } catch (GDException e) {
+ } catch (JBException e) {
// We can't detect circular dependencies from a
// project if we can't load it from the db.
// Report to the user that the error will
@@ -470,18 +470,23 @@ public class FileStorageBP {
}
/**
- * @param proj The project to import.
- * @param monitor The progress monitor for this operation.
+ * @param proj
+ * The project to import.
+ * @param monitor
+ * The progress monitor for this operation.
* @return <code>true</code> if the project was successfully imported.
* Returns <code>false</code> if their were conflicts that
* prevented the project from being successfully imported.
- * @throws PMException in case of any db error
- * @throws GDProjectDeletedException if project is already deleted
- * @throws InterruptedException if the operation was canceled
+ * @throws PMException
+ * in case of any db error
+ * @throws ProjectDeletedException
+ * if project is already deleted
+ * @throws InterruptedException
+ * if the operation was canceled
*/
private boolean importProject(IProjectPO proj,
IProgressMonitor monitor)
- throws PMException, GDProjectDeletedException,
+ throws PMException, ProjectDeletedException,
InterruptedException {
// if (import.guid exists and guid->version == import.version)
@@ -502,7 +507,7 @@ public class FileStorageBP {
if (selectedProjectName != null) {
// Import project
proj.setClientMetaDataVersion(
- IGdVersion.GD_CLIENT_METADATA_VERSION);
+ IVersion.JB_CLIENT_METADATA_VERSION);
boolean willRequireRefresh = false;
IProjectPO currentProject =
GeneralStorage.getInstance().getProject();
@@ -1070,7 +1075,7 @@ public class FileStorageBP {
} catch (PMException e) {
showAbortImport(m_console, e);
throw new InvocationTargetException(e);
- } catch (GDProjectDeletedException e) {
+ } catch (ProjectDeletedException e) {
showAbortImport(m_console, e);
throw new InvocationTargetException(e);
} finally {
@@ -1082,31 +1087,41 @@ public class FileStorageBP {
/**
* Tries to perform the import, and displays an error message if not
- * successful. This method was created because of checkstyle's method
- * length restrictions. As such, there are a lot of arguments, and
- * none of them are well documented.
+ * successful. This method was created because of checkstyle's method
+ * length restrictions. As such, there are a lot of arguments, and none
+ * of them are well documented.
*
- * @param subMonitor The progress monitor.
- * @param mapperList This is responsible for mapping Parameter names
- * from the imported test cases into the given
- * project.
- * @param compMapperList Responsible for mapping Component Names
- * from the imported test cases into the given
- * project.
- * @param projectName The project name.
- * @param specObjList The specObjList.
- * @param project The project.
- * @param importedToolkit The imported toolkit.
- * @param importedLevel The imported level.
- * @param currentToolkit The current toolkit.
- * @param currentLevel The current level.
- * @throws PMException if a Hibernate exception occurs.
- * @throws GDProjectDeletedException if the the project was
- * already deleted.
- * @throws InterruptedException if the operation is canceled by the
- * user.
+ * @param subMonitor
+ * The progress monitor.
+ * @param mapperList
+ * This is responsible for mapping Parameter names from the
+ * imported test cases into the given project.
+ * @param compMapperList
+ * Responsible for mapping Component Names from the imported
+ * test cases into the given project.
+ * @param projectName
+ * The project name.
+ * @param specObjList
+ * The specObjList.
+ * @param project
+ * The project.
+ * @param importedToolkit
+ * The imported toolkit.
+ * @param importedLevel
+ * The imported level.
+ * @param currentToolkit
+ * The current toolkit.
+ * @param currentLevel
+ * The current level.
+ * @throws PMException
+ * if a Hibernate exception occurs.
+ * @throws ProjectDeletedException
+ * if the the project was already deleted.
+ * @throws InterruptedException
+ * if the operation is canceled by the user.
* @throws IncompatibleTypeException
- * @throws ToolkitPluginException If a toolkit error occurs.
+ * @throws ToolkitPluginException
+ * If a toolkit error occurs.
*/
private void tryImport(SubMonitor subMonitor,
List<INameMapper> mapperList,
@@ -1115,7 +1130,7 @@ public class FileStorageBP {
List<ISpecPersistable> specObjList, IProjectPO project,
String importedToolkit, String importedLevel,
String currentToolkit, String currentLevel) throws PMException,
- GDProjectDeletedException, InterruptedException,
+ ProjectDeletedException, InterruptedException,
IncompatibleTypeException, ToolkitPluginException {
// Perform the import if the project toolkits are
@@ -1191,28 +1206,31 @@ public class FileStorageBP {
/**
* Imports the given test cases into the given project.
*
- * @param mapperList This is responsible for mapping Parameter names
- * from the imported test cases into the given
- * project.
- * @param compMapperList Responsible for mapping Component Names
- * from the imported test cases into the given
- * project.
- * @param specObjList List of test cases to import.
- * @param project The project into which the test cases will be
- * imported.
- * @param monitor The progress monitor for this potentially long-running
- * operation.
- * @return <code>true</code> if the test cases were imported
+ * @param mapperList
+ * This is responsible for mapping Parameter names from the
+ * imported test cases into the given project.
+ * @param compMapperList
+ * Responsible for mapping Component Names from the imported
+ * test cases into the given project.
+ * @param specObjList
+ * List of test cases to import.
+ * @param project
+ * The project into which the test cases will be imported.
+ * @param monitor
+ * The progress monitor for this potentially long-running
+ * operation.
+ * @return <code>true</code> if the test cases were imported
* successfully. Otherwise, <code>false</code>.
- * @throws PMException if a database error occurs.
- * @throws GDProjectDeletedException if the current project has been
- * deleted.
+ * @throws PMException
+ * if a database error occurs.
+ * @throws ProjectDeletedException
+ * if the current project has been deleted.
*/
private boolean importTestCases(List<INameMapper> mapperList,
List<IWritableComponentNameMapper> compMapperList,
List<ISpecPersistable> specObjList, IProjectPO project,
IProgressMonitor monitor)
- throws PMException, GDProjectDeletedException,
+ throws PMException, ProjectDeletedException,
InterruptedException, IncompatibleTypeException {
String newName = createCategoryName(
@@ -1413,7 +1431,7 @@ public class FileStorageBP {
String exportDirName, EntityManager exportSession,
IProgressMonitor monitor, boolean writeToSystemTempDir,
List<File> listOfProjectFiles, IProgressConsole console)
- throws GDException, InterruptedException {
+ throws JBException, InterruptedException {
SubMonitor subMonitor = SubMonitor.convert(monitor,
Messages.ExportAllBPExporting,
@@ -1491,7 +1509,7 @@ public class FileStorageBP {
*/
public static void importFiles(String[] importFileNames,
IProgressMonitor monitor, IProgressConsole console,
- boolean openProject) throws PMException, GDProjectDeletedException {
+ boolean openProject) throws PMException, ProjectDeletedException {
// import all data from projects
try {
doImport(IMPORT_ALL, importFileNames,
@@ -1526,7 +1544,7 @@ public class FileStorageBP {
final String[] fileNames,
IProgressMonitor monitor, IProgressConsole console,
boolean openProject)
- throws InterruptedException, PMException, GDProjectDeletedException {
+ throws InterruptedException, PMException, ProjectDeletedException {
SubMonitor subMonitor = SubMonitor.convert(
monitor, Messages.ImportFileBPImporting,
@@ -1554,7 +1572,7 @@ public class FileStorageBP {
private static IProjectPO doImport(final int elements, String [] fileNames,
SubMonitor subMonitor, IProgressConsole console,
boolean openProject)
- throws InterruptedException, PMException, GDProjectDeletedException {
+ throws InterruptedException, PMException, ProjectDeletedException {
// Read project files
ReadFilesOperation readFilesOp =
@@ -1573,8 +1591,8 @@ public class FileStorageBP {
Throwable cause = ExceptionUtils.getRootCause(ite);
if (cause instanceof PMException) {
throw (PMException)cause;
- } else if (cause instanceof GDProjectDeletedException) {
- throw (GDProjectDeletedException)cause;
+ } else if (cause instanceof ProjectDeletedException) {
+ throw (ProjectDeletedException)cause;
} else {
throw new RuntimeException(ite);
}
@@ -1733,7 +1751,7 @@ public class FileStorageBP {
final String [] fileNames) {
ErrorMessagePresenter.getPresenter().showErrorMessage(
- new GDException(
+ new JBException(
e + Messages.Reading + fileNames + Messages.Failed,
MessageIDs.E_IMPORT_PROJECT_XML_FAILED),
null, MessageIDs.getMessageObject(e.getErrorId()).getDetails());
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/converter/HTMLTechnicalComponentIndexConverter.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/converter/HTMLTechnicalComponentIndexConverter.java
new file mode 100644
index 000000000..dee3ff63d
--- /dev/null
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/converter/HTMLTechnicalComponentIndexConverter.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2010 BREDEX GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * BREDEX GmbH - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.jubula.client.archive.converter;
+
+import java.util.List;
+
+import com.bredexsw.guidancer.client.importer.gdschema.Aut;
+import com.bredexsw.guidancer.client.importer.gdschema.OmCategory;
+import com.bredexsw.guidancer.client.importer.gdschema.OmEntry;
+import com.bredexsw.guidancer.client.importer.gdschema.Project;
+import com.bredexsw.guidancer.client.importer.gdschema.TechnicalName;
+
+/**
+ * Converter for ticket #3546
+ *
+ * This converter appends a [1] index to all hierarchy names of mapped technical
+ * components for an HTML object mapping
+ *
+ * @author BREDEX GmbH
+ * @created Jan 14, 2011
+ */
+public class HTMLTechnicalComponentIndexConverter extends AbstractXmlConverter {
+ /**
+ * <code>REQUIRED_METADATA_VERSION_NUMBER</code>
+ */
+ private static final int REQUIRED_METADATA_VERSION_NUMBER = 6;
+
+ /**
+ * <code>OLD_HTML_TOOLKIT_ID</code>
+ */
+ private static final String OLD_HTML_TOOLKIT_ID = "com.bredexsw.guidancer.HtmlToolkitPlugin"; //$NON-NLS-1$
+
+ /**
+ * {@inheritDoc}
+ */
+ protected boolean conversionIsNecessary(Project xml) {
+ if (xml.getMetaDataVersion() < REQUIRED_METADATA_VERSION_NUMBER) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void convertImpl(Project xml) {
+ for (Aut autXml : xml.getAutList()) {
+ if (autXml.getAutToolkit().equals(OLD_HTML_TOOLKIT_ID)) {
+ OmCategory mappedCat = autXml.getObjectMapping().getMapped();
+ convertCategory(mappedCat);
+ }
+ }
+ }
+
+ /**
+ * @param cat
+ * the category to convert recursivly
+ */
+ private void convertCategory(OmCategory cat) {
+ List<OmCategory> childCat = cat.getCategoryList();
+ for (OmCategory omCat : childCat) {
+ convertCategory(omCat);
+ }
+
+ List<OmEntry> listOfMappings = cat.getAssociationList();
+ for (OmEntry oe : listOfMappings) {
+ fixTechnicalName(oe.getTechnicalName());
+ }
+ }
+
+ /**
+ * @param technicalName
+ * the technical name to fix
+ */
+ private void fixTechnicalName(TechnicalName technicalName) {
+ List<String> hierarchyNames = technicalName.getHierarchyNameList();
+ String[] hNameArray = hierarchyNames.toArray(new String[hierarchyNames
+ .size()]);
+ // do not convert the last name as this is most likely the component
+ // name / given name itself
+ for (int i = 0; i < hNameArray.length - 1; i++) {
+ String chierarchyName = hNameArray[i];
+ if (!chierarchyName.matches("^.*\\[[0-9]+\\]$")) { //$NON-NLS-1$
+ hNameArray[i] = chierarchyName.concat("[1]"); //$NON-NLS-1$
+ }
+ }
+ technicalName.setHierarchyNameArray(hNameArray);
+ }
+}
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/Messages.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/Messages.java
index bfc7a758a..5e4ad79df 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/Messages.java
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/Messages.java
@@ -19,87 +19,91 @@ import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.jubula.client.archive.i18n.messages"; //$NON-NLS-1$
+ public static String Action;
+ public static String CantCloseOOS;
+ public static String ClassSerializedCouldntFound;
+ public static String Component;
+ public static String CouldNotExportProject;
+ public static String CouldNotInitializeProxy;
+ public static String DataBaseErrorUpdatingToolkits;
+ public static String ErrorMessageIMPORT_PROJECT_XML_FAILED;
+ public static String ErrorMessagePROJ_CIRC_DEPEND;
+ public static String ErrorWhileCloseOS;
+ public static String ErrorWhileImportingProject;
+ public static String ExportAllBPErrorExportFailedProject;
+ public static String ExportAllBPExporting;
+ public static String ExportAllBPInfoFinishedExportProject;
+ public static String ExportAllBPInfoStartingExportProject;
+ public static String ExportOperationCanceled;
+ public static String Failed;
+ public static String FailedReadingFile;
+ public static String File;
+ public static String GeneralIoExeption;
+ public static String ImportEmptyName;
+ public static String ImportFailed;
public static String ImportFileActionDoubleProjName;
- public static String ImportFileBPImporting;
- public static String ImportFileBPReading;
- public static String ImportFileBPWaitWhileImporting;
public static String ImportFileActionErrorImportFailed;
public static String ImportFileActionErrorImportFailedProject;
public static String ImportFileActionErrorIncompatibleToolkits;
public static String ImportFileActionErrorMissingDepProj;
- public static String ImportFileActionInfoFinishedReadingProjects;
public static String ImportFileActionInfoFinishedImport;
public static String ImportFileActionInfoFinishedImportProject;
- public static String ImportFileActionInfoStartingReadingProjects;
- public static String ImportFileActionInfoStartingReadingProject;
+ public static String ImportFileActionInfoFinishedReadingProjects;
public static String ImportFileActionInfoStartingImport;
public static String ImportFileActionInfoStartingImportProject;
+ public static String ImportFileActionInfoStartingReadingProject;
+ public static String ImportFileActionInfoStartingReadingProjects;
public static String ImportFileActionProjErr;
public static String ImportFileActionProjLabel;
public static String ImportFileActionProjMessage;
public static String ImportFileActionProjShell;
public static String ImportFileActionProjTitle;
+ public static String ImportFileBPImporting;
+ public static String ImportFileBPReading;
+ public static String ImportFileBPWaitWhileImporting;
public static String ImportFileComboActionProjMessage;
public static String ImportFileSingleActionProjMessage;
- public static String ErrorWhileImportingProject;
- public static String SaveOf;
- public static String Reading;
- public static String Failed;
public static String ImportOf;
- public static String ImportFailed;
- public static String ImportEmptyName;
public static String ImportWithoutName;
- public static String ErrorMessagePROJ_CIRC_DEPEND;
- public static String ToolkitSupportToolkitNotFound;
- public static String TreeOpsBPImportedCat;
- public static String ExportAllBPExporting;
- public static String ExportAllBPInfoStartingExportProject;
- public static String ExportAllBPInfoFinishedExportProject;
- public static String CouldNotExportProject;
- public static String ExportAllBPErrorExportFailedProject;
- public static String ErrorMessageIMPORT_PROJECT_XML_FAILED;
- public static String DataBaseErrorUpdatingToolkits;
- public static String OriginalException;
- public static String XmlImporterToolkitVersionConversion;
- public static String XmlImporterToolkitVersionConflict3a;
- public static String XmlImporterToolkitVersionConflict3b;
- public static String XmlImporterProjectDependency;
- public static String XmlImporterProjectXMLTooOld;
- public static String XmlImporterRequiredProject;
- public static String XmlImporterRequiredProjectWithoutName;
public static String IncompatibleToolkitVersion;
- public static String OpenProjectActionToolkitVersionConflict2;
- public static String OpenProjectActionToolkitVersionConflict5;
- public static String OpenProjectActionToolkitVersionConflict3;
+ public static String InvalidImportFile;
+ public static String MalformedXMLData;
+ public static String NoHeaderFound;
+ public static String NoSupportedFileEncoding;
+ public static String NotFound;
+ public static String OpenProjectActionToolkitVersionConflict2;
+ public static String OpenProjectActionToolkitVersionConflict3;
public static String OpenProjectActionToolkitVersionConflict4a;
public static String OpenProjectActionToolkitVersionConflict4b;
public static String OpenProjectActionToolkitVersionConflict4c;
- public static String UnknownErrorType;
- public static String Property;
- public static String NotFound;
- public static String Component;
- public static String Action;
+ public static String OpenProjectActionToolkitVersionConflict5;
+ public static String OriginalException;
public static String Parameter;
- public static String ErrorWhileCloseOS;
- public static String ExportOperationCanceled;
+ public static String Property;
+ public static String Reading;
+ public static String SaveOf;
+ public static String ToolkitSupportToolkitNotFound;
+ public static String TreeOpsBPImportedCat;
+ public static String UnknownErrorType;
public static String ValidateFailed;
- public static String InvalidImportFile;
+ public static String XmlImporterProjectDependency;
+ public static String XmlImporterProjectXMLTooOld;
+ public static String XmlImporterRequiredProject;
+ public static String XmlImporterRequiredProjectWithoutName;
+ public static String XmlImporterToolkitVersionConflict3a;
+ public static String XmlImporterToolkitVersionConflict3b;
+ public static String XmlImporterToolkitVersionConversion;
public static String XmlStorageSavingProject;
- public static String File;
- public static String GeneralIoExeption;
- public static String CouldNotInitializeProxy;
- public static String CantCloseOOS;
- public static String ClassSerializedCouldntFound;
- public static String FailedReadingFile;
- public static String MalformedXMLData;
- public static String NoSupportedFileEncoding;
- public static String NoHeaderFound;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
+ /**
+ * Constructor
+ */
private Messages() {
+ // hide
}
}
diff --git a/org.eclipse.jubula.client.cmd.controller/src/org/eclipse/jubula/client/cmd/controller/IClcServer.java b/org.eclipse.jubula.client.cmd.controller/src/org/eclipse/jubula/client/cmd/controller/IClcServer.java
index 7ed69f9a6..a962f8552 100644
--- a/org.eclipse.jubula.client.cmd.controller/src/org/eclipse/jubula/client/cmd/controller/IClcServer.java
+++ b/org.eclipse.jubula.client.cmd.controller/src/org/eclipse/jubula/client/cmd/controller/IClcServer.java
@@ -27,7 +27,7 @@ public interface IClcServer extends Remote {
* @param tsName Specify the name of the Test Suite which should be run
* by the service
* @param timeout the maximum allowed time for the test Suite in seconds
- * @param variables key/value data for GUIdancer variables
+ * @param variables key/value data for Jubula variables
* @return the result code of the test execution, 0 if everything is fine.
* @throws RemoteException
*/
diff --git a/org.eclipse.jubula.client.cmd/.classpath b/org.eclipse.jubula.client.cmd/.classpath
index c377d8af1..da5d5f6e3 100644
--- a/org.eclipse.jubula.client.cmd/.classpath
+++ b/org.eclipse.jubula.client.cmd/.classpath
@@ -1,11 +1,11 @@
<?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="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"/>
</classpath>
diff --git a/org.eclipse.jubula.client.cmd/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.client.cmd/.settings/org.eclipse.jdt.core.prefs
index 604f35113..6942f8995 100644
--- a/org.eclipse.jubula.client.cmd/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jubula.client.cmd/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Thu Mar 12 08:31:46 CET 2009
+#Thu Jan 06 12:33:29 CET 2011
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
diff --git a/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF
index b6e01fa9a..6f151e9c7 100644
--- a/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF
@@ -2,12 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Jubula Headless Client Core (Incubation)
Bundle-SymbolicName: org.eclipse.jubula.client.cmd;singleton:=true
-Bundle-Version: 0.4.0
+Bundle-Version: 0.9.0.qualifier
Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.jubula.client.core,
- org.eclipse.jubula.tools,
- org.eclipse.core.runtime
+Require-Bundle: org.eclipse.jubula.client.core;bundle-version="[0.9.0,1.0.0)",
+ org.eclipse.jubula.tools;bundle-version="[0.9.0,1.0.0)",
+ 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)"
Export-Package: org.eclipse.jubula.client.cmd,
org.eclipse.jubula.client.cmd.batch,
org.eclipse.jubula.client.cmd.i18n,
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 2198ae346..393473bbc 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
@@ -37,7 +37,7 @@ import org.eclipse.jubula.client.core.model.IAUTConfigPO;
import org.eclipse.jubula.client.core.persistence.locking.LockManager;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
-import org.eclipse.jubula.tools.exception.GDException;
+import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.messagehandling.Message;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.registration.AutIdentifier;
@@ -311,7 +311,7 @@ public abstract class AbstractCmdlineClient {
*/
public int run(String[] args) {
ErrorMessagePresenter.setPresenter(new IErrorMessagePresenter() {
- public void showErrorMessage(GDException ex, Object[] params,
+ public void showErrorMessage(JBException ex, Object[] params,
String[] details) {
log.error(ex + StringConstants.COLON + StringConstants.SPACE
diff --git a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/ClientStrings.java b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/ClientStrings.java
index eddb8ab8b..28d3df53e 100644
--- a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/ClientStrings.java
+++ b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/ClientStrings.java
@@ -24,8 +24,6 @@ package org.eclipse.jubula.client.cmd;
*
*/
public final class ClientStrings {
- /** String */
- public static final String CLIENT_CMD = "GUIdancerCmd"; //$NON-NLS-1$
/** Error message */
public static final String ERR_JOBFILE = "Client.JobFileError"; //$NON-NLS-1$
/** Error message */
diff --git a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/i18n/Messages.java b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/i18n/Messages.java
index 0ec4ca989..a0cc6b6db 100644
--- a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/i18n/Messages.java
+++ b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/i18n/Messages.java
@@ -19,68 +19,68 @@ import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.jubula.client.cmd.i18n.messages"; //$NON-NLS-1$
- public static String ExecutionControllerDatabase;
- public static String ExecutionControllerDataBaseEnd;
- public static String ExecutionControllerDatabaseStart;
- public static String NoArgumentFor;
- public static String UnrecognizedOption;
- public static String ConnectionToAutUnexpectedly;
- public static String ErrorWhileShuttingDownStopping;
- public static String ErrorWhileShuttingDownDisconnecting;
- public static String ClientName;
- public static String ClientJobFileError;
- public static String ClientExitCode;
- public static String ClientExitCodeTask;
- public static String ClientConfigFile;
- public static String ClientHelpOpt;
- public static String ClientNoRunOpt;
+ public static String AnErrorOcurred;
+ public static String ClientAutconfigOpt;
+ public static String ClientAutIdOpt;
public static String ClientAutoScreenshot;
- public static String ClientRelevantFlag;
- public static String ClientQuietOpt;
+ public static String ClientBuildingReport;
+ public static String ClientCalculating;
+ public static String ClientCmdArgs;
+ public static String ClientCollectingInformation;
+ public static String ClientConfigFile;
public static String ClientConfigOpt;
+ public static String ClientDataFile;
+ public static String ClientDbpwOpt;
public static String ClientDbschemeOpt;
- public static String ClientDbuserOpt;
public static String ClientDburlOpt;
- public static String ClientDbpwOpt;
- public static String ClientServerOpt;
- public static String ClientStartServerOpt;
+ public static String ClientDbuserOpt;
+ public static String ClientDisconnectFromServerMessage;
+ public static String ClientDisconnectFromServerTitle;
+ public static String ClientError;
+ public static String ClientestTestcase;
+ public static String ClientExitCode;
+ public static String ClientExitCodeTask;
+ public static String ClientHelpOpt;
+ public static String ClientInvalidLicenseError;
+ public static String ClientJobFileError;
+ public static String ClientLanguageOpt;
+ public static String ClientLicenseCommunicationError;
+ public static String ClientMissingArgs;
+ public static String ClientMonitoringInfoDialog;
+ public static String ClientName;
+ public static String ClientNoLicenseAvailable;
+ public static String ClientnoLicenseFileExistError;
+ public static String ClientNoRunOpt;
+ public static String ClientogViewerName;
public static String ClientPortOpt;
public static String ClientProjectOpt;
public static String ClientProjectVersionOpt;
- public static String ClientLanguageOpt;
- public static String ClientogViewerName;
- public static String ClientestTestcase;
+ public static String ClientQuietOpt;
+ public static String ClientRelevantFlag;
+ public static String ClientResultdirOpt;
+ public static String ClientServerOpt;
+ public static String ClientStartServerOpt;
+ public static String ClientSwtOpt;
public static String ClientTestJobOpt;
public static String ClientTestSuiteOpt;
public static String ClientTimeout;
public static String ClientWritingReport;
public static String ClientWritingReportToDB;
- public static String ClientBuildingReport;
- public static String ClientCalculating;
- public static String ClientCollectingInformation;
- public static String ClientMonitoringInfoDialog;
- public static String ClientSwtOpt;
- public static String ClientDataFile;
- public static String ClientAutconfigOpt;
- public static String ClientAutIdOpt;
- public static String ClientCmdArgs;
- public static String ClientLicenseCommunicationError;
- public static String ClientError;
- public static String ClientInvalidLicenseError;
- public static String ClientNoLicenseAvailable;
- public static String ClientnoLicenseFileExistError;
- public static String ClientMissingArgs;
- public static String ClientResultdirOpt;
- public static String ClientDisconnectFromServerTitle;
- public static String ClientDisconnectFromServerMessage;
- public static String AnErrorOcurred;
- public static String NoCorrespondingMessage;
+ public static String ConnectionToAutUnexpectedly;
+ public static String ErrorWhileShuttingDownDisconnecting;
+ public static String ErrorWhileShuttingDownStopping;
+ public static String ExecutionControllerDatabase;
+ public static String ExecutionControllerDataBaseEnd;
+ public static String ExecutionControllerDatabaseStart;
public static String I18nUtilsEventHandler;
public static String I18nUtilsRetryStep;
+ public static String I18nUtilsSeparator;
+ public static String I18nUtilsStep;
public static String I18nUtilsTestCase;
public static String I18nUtilsTestSuite;
- public static String I18nUtilsStep;
- public static String I18nUtilsSeparator;
+ public static String NoArgumentFor;
+ public static String NoCorrespondingMessage;
+ public static String UnrecognizedOption;
static {
// initialize resource bundle
diff --git a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/i18n/messages.properties b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/i18n/messages.properties
index a9d9fee03..ca59d38dc 100644
--- a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/i18n/messages.properties
+++ b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/i18n/messages.properties
@@ -46,7 +46,7 @@ ClientCollectingInformation=Collecting Monitoring Information
ClientMonitoringInfoDialog=These changes will only take affect, if the AUT {0} will be restarted.
ClientSwtOpt=Switch toolkit to SWT
ClientDataFile=Directory containing external test data and local scripts
-ClientName=GUIdancerCMD
+ClientName=CmdTestExecutor
ClientAutconfigOpt=AUTConfiguration to be used for test execution
ClientAutIdOpt=AUT ID to be used for test execution
ClientCmdArgs=Program arguments\:\n\t
@@ -55,7 +55,7 @@ ClientError=\!\!Error occurred \!\!
ClientMissingArgs=The following required arguments are missing\:\n
ClientResultdirOpt=Name of the directory to store the test results
ClientDisconnectFromServerTitle=Are you sure you want to disconnect from the AutAgent?
-ClientDisconnectFromServerMessage=GUIDancer is still collecting monitoring data.\nDisconnecting from AutAgent might corrupt the collected data!\nAre you sure you want to disconnect from the AutAgent?
+ClientDisconnectFromServerMessage=The application is still collecting monitoring data.\nDisconnecting from AutAgent might corrupt the collected data!\nAre you sure you want to disconnect from the AutAgent?
ClientName=Client.Name
AnErrorOcurred=An error ocurred
NoCorrespondingMessage=No corresponding message for error code
diff --git a/org.eclipse.jubula.client.core/.checkstyle b/org.eclipse.jubula.client.core/.checkstyle
index cb0fde42c..db0309880 100644
--- a/org.eclipse.jubula.client.core/.checkstyle
+++ b/org.eclipse.jubula.client.core/.checkstyle
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="false">
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
<fileset name="all" enabled="true" check-config-name="Jubula" local="false">
<file-match-pattern match-pattern=".java$" include-pattern="true"/>
<file-match-pattern match-pattern="gen-src/*" include-pattern="false"/>
</fileset>
<filter name="FilesFromPackage" enabled="true">
+ <filter-data value="src/org/eclipse/jubula/client/core/i18n"/>
<filter-data value="src/org/eclipse/jubula/client/core/test"/>
</filter>
</fileset-config>
diff --git a/org.eclipse.jubula.client.core/.classpath b/org.eclipse.jubula.client.core/.classpath
index c72a1ea2f..e73996c98 100644
--- a/org.eclipse.jubula.client.core/.classpath
+++ b/org.eclipse.jubula.client.core/.classpath
@@ -1,19 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/hibernate/dom4j-1.6.1.jar"/>
<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="**/*"/>
</accessrules>
</classpathentry>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate/ojdbc14.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate/jdbc2_0-stdext.jar"/>
- <classpathentry kind="lib" path="lib/jtopas.jar"/>
<classpathentry kind="lib" path="lib/poi-3.2-FINAL-20081019.jar"/>
- <classpathentry kind="lib" path="lib/hibernate/mysql-connector-java-5.1.10-bin.jar"/>
- <classpathentry kind="lib" path="lib/hibernate/postgresql-8.4-701.jdbc3.jar"/>
<classpathentry kind="lib" path="lib/param-parser.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar" exported="true"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.client.core/.externalToolBuilders/eclipselink-static-weaving.launch b/org.eclipse.jubula.client.core/.externalToolBuilders/eclipselink-static-weaving.launch
index bdaf0c932..440b8006b 100644
--- a/org.eclipse.jubula.client.core/.externalToolBuilders/eclipselink-static-weaving.launch
+++ b/org.eclipse.jubula.client.core/.externalToolBuilders/eclipselink-static-weaving.launch
@@ -10,7 +10,7 @@
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jubula.client.core"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.jubula.client.core/src/META-INF/persistence.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.jubula.client.core/customBuildCallbacks.xml}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
diff --git a/org.eclipse.jubula.client.core/.externalToolBuilders/gen-parser.launch b/org.eclipse.jubula.client.core/.externalToolBuilders/gen-parser.launch
index 9e788370c..5117c747e 100644
--- a/org.eclipse.jubula.client.core/.externalToolBuilders/gen-parser.launch
+++ b/org.eclipse.jubula.client.core/.externalToolBuilders/gen-parser.launch
@@ -4,9 +4,9 @@
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="gen-parser,"/>
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="gen-parser,"/>
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1286461547850_123&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.jubula.client.core/lib&quot; type=&quot;2&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.jubula.client.core/lib&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.jubula.client.core/buildScript.xml"/>
</listAttribute>
@@ -17,9 +17,9 @@
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jubula.client.core"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1286461393133_105&quot; label=&quot;workingSet&quot; name=&quot;workingSet&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.jubula.client.core/sablecc/parameter.sable&quot; type=&quot;1&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.jubula.build/lib/sablecc/parameter.sable&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.jubula.client.core/customBuildCallbacks.xml}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
diff --git a/org.eclipse.jubula.client.core/.project b/org.eclipse.jubula.client.core/.project
index f4180c53e..c7e710cb3 100644
--- a/org.eclipse.jubula.client.core/.project
+++ b/org.eclipse.jubula.client.core/.project
@@ -31,11 +31,6 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<triggers>auto,full,incremental,</triggers>
<arguments>
@@ -45,6 +40,11 @@
</dictionary>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
index 689c09d46..a05a62c06 100644
--- a/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
@@ -2,65 +2,20 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Jubula Core (Incubation)
Bundle-SymbolicName: org.eclipse.jubula.client.core;singleton:=true
-Bundle-Version: 0.4.0
+Bundle-Version: 0.9.0.qualifier
Eclipse-BuddyPolicy: registered
Bundle-ClassPath: .,
org.eclipse.jubula.client.core.jar,
resources/,
resources/html,
- lib/hibernate/postgresql-8.4-701.jdbc3.jar,
- lib/hibernate/mysql-connector-java-5.1.10-bin.jar,
- lib/hibernate/jdbc2_0-stdext.jar,
- lib/hibernate/ojdbc14.jar,
- lib/jtopas.jar,
+ lib/driver/postgresql-8.4-701.jdbc3.jar,
+ lib/driver/mysql-connector-java-5.1.10-bin.jar,
+ lib/driver/ojdbc14.jar,
+ lib/dom4j-1.6.1.jar,
lib/poi-3.2-FINAL-20081019.jar,
- lib/param-parser.jar,
- lib/hibernate/dom4j-1.6.1.jar
+ lib/param-parser.jar
Bundle-Vendor: Eclipse Jubula
-Export-Package: com.mysql.jdbc,
- com.mysql.jdbc.exceptions,
- com.mysql.jdbc.exceptions.jdbc4,
- com.mysql.jdbc.integration.c3p0,
- com.mysql.jdbc.integration.jboss,
- com.mysql.jdbc.interceptors,
- com.mysql.jdbc.jdbc2.optional,
- com.mysql.jdbc.log,
- com.mysql.jdbc.profiler,
- com.mysql.jdbc.util,
- de.susebox.java.io,
- de.susebox.java.lang,
- de.susebox.java.util,
- de.susebox.jtopas,
- de.susebox.jtopas.impl,
- de.susebox.jtopas.spi,
- javax.sql,
- oracle.core.lmx,
- oracle.core.lvf,
- oracle.jdbc,
- oracle.jdbc.connector,
- oracle.jdbc.driver,
- oracle.jdbc.internal,
- oracle.jdbc.oci,
- oracle.jdbc.oracore,
- oracle.jdbc.pool,
- oracle.jdbc.rowset,
- oracle.jdbc.util,
- oracle.jdbc.xa,
- oracle.jdbc.xa.client,
- oracle.jpub.runtime,
- oracle.net.TNSAddress,
- oracle.net.ano,
- oracle.net.aso,
- oracle.net.jndi,
- oracle.net.nl,
- oracle.net.nl.mesg,
- oracle.net.ns,
- oracle.net.nt,
- oracle.net.resolver,
- oracle.security.o3logon,
- oracle.sql,
- oracle.sql.converter,
- org.apache.poi,
+Export-Package: org.apache.poi,
org.apache.poi.ddf,
org.apache.poi.dev,
org.apache.poi.hpsf,
@@ -114,7 +69,6 @@ Export-Package: com.mysql.jdbc,
org.eclipse.jubula.client.core.businessprocess.importfilter.exceptions,
org.eclipse.jubula.client.core.businessprocess.progress,
org.eclipse.jubula.client.core.businessprocess.treeoperations,
- org.eclipse.jubula.client.core.classloader,
org.eclipse.jubula.client.core.commands,
org.eclipse.jubula.client.core.communication,
org.eclipse.jubula.client.core.datastructure,
@@ -126,38 +80,21 @@ Export-Package: com.mysql.jdbc,
org.eclipse.jubula.client.core.progress,
org.eclipse.jubula.client.core.serialization,
org.eclipse.jubula.client.core.test,
- org.eclipse.jubula.client.core.utils,
- org.gjt.mm.mysql,
- org.postgresql,
- org.postgresql.copy,
- org.postgresql.core,
- org.postgresql.core.types,
- org.postgresql.core.v2,
- org.postgresql.core.v3,
- org.postgresql.ds,
- org.postgresql.ds.common,
- org.postgresql.ds.jdbc23,
- org.postgresql.fastpath,
- org.postgresql.geometric,
- org.postgresql.gss,
- org.postgresql.jdbc2,
- org.postgresql.jdbc2.optional,
- org.postgresql.jdbc3,
- org.postgresql.largeobject,
- org.postgresql.ssl,
- org.postgresql.translation,
- org.postgresql.util,
- org.postgresql.xa
-Require-Bundle: org.eclipse.jubula.communication;visibility:=reexport,
- org.eclipse.jubula.toolkit.common;visibility:=reexport,
- org.eclipse.core.runtime;visibility:=reexport,
- org.junit4,
- javax.persistence;jpa="2.0";visibility:=reexport,
- org.eclipse.persistence.core,
- org.eclipse.persistence.jpa;visibility:=reexport,
- org.h2;bundle-version="1.1.117",
- org.apache.commons.collections;bundle-version="3.2.0",
- org.apache.commons.io;bundle-version="1.4.0"
+ org.eclipse.jubula.client.core.utils
+Require-Bundle: org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
+ org.apache.commons.logging;bundle-version="[1.0.4,2.0.0)",
+ org.eclipse.jubula.communication;bundle-version="[0.9.0,1.0.0)";visibility:=reexport,
+ org.eclipse.jubula.toolkit.common;bundle-version="[0.9.0,1.0.0)";visibility:=reexport,
+ org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+ org.junit4;bundle-version="[4.8.1,5.0.0)",
+ javax.persistence;bundle-version="[2.0.1,3.0.0)";jpa="2.0";visibility:=reexport,
+ org.eclipse.persistence.core;bundle-version="[2.1.1,3.0.0)",
+ org.eclipse.persistence.jpa;bundle-version="[2.1.1,3.0.0)";visibility:=reexport,
+ org.h2;bundle-version="[1.1.117,2.0.0)",
+ org.apache.commons.collections;bundle-version="[3.2.0,4.0.0)",
+ org.apache.commons.io;bundle-version="[1.4.0,2.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)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-BundleShape: jar
Bundle-Activator: org.eclipse.jubula.client.core.Activator
diff --git a/org.eclipse.jubula.client.core/META-INF/persistence.xml b/org.eclipse.jubula.client.core/META-INF/persistence.xml
index 42621c413..00d2d75ec 100644
--- a/org.eclipse.jubula.client.core/META-INF/persistence.xml
+++ b/org.eclipse.jubula.client.core/META-INF/persistence.xml
@@ -68,6 +68,7 @@
<properties>
<property name="eclipselink.weaving" value="static"/>
+ <property name="eclipselink.weaving.changetracking" value="false"/>
</properties>
</persistence-unit>
diff --git a/org.eclipse.jubula.client.core/build.properties b/org.eclipse.jubula.client.core/build.properties
index f74b8d2ba..9b5ad00c5 100644
--- a/org.eclipse.jubula.client.core/build.properties
+++ b/org.eclipse.jubula.client.core/build.properties
@@ -6,16 +6,14 @@
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
bin.includes = META-INF/,\
- resources/c3p0.properties,\
resources/default.properties,\
resources/databases.properties,\
resources/schema.properties,\
- resources/hibernate.properties,\
resources/html/,\
lib/,\
plugin.xml,\
lib/param-parser.jar,\
- lib/hibernate/dom4j-1.6.1.jar
+ lib/dom4j-1.6.1.jar
source.org.eclipse.jubula.client.core.jar = src/
jars.compile.order = org.eclipse.jubula.client.core.jar
output.org.eclipse.jubula.client.core.jar = bin/
diff --git a/org.eclipse.jubula.client.core/customBuildCallbacks.xml b/org.eclipse.jubula.client.core/customBuildCallbacks.xml
index 6ed125863..8c4be7cce 100644
--- a/org.eclipse.jubula.client.core/customBuildCallbacks.xml
+++ b/org.eclipse.jubula.client.core/customBuildCallbacks.xml
@@ -15,7 +15,7 @@
<!-- START - Old buildScript.xml -->
<!-- ===================================================================== -->
<path id="eclipselink.weaving.classpath">
- <fileset dir="${basedir}/../org.eclipse.jubula.project.configuration/target/platform/persistence/plugins">
+ <fileset dir="${basedir}/../../guidancer/com.bredexsw.guidancer.project.configuration/target/platform/persistence/plugins">
<include name="org.eclipse.persistence.*.jar" />
<include name="javax.persistence_*.jar"/>
</fileset>
@@ -230,7 +230,7 @@
<target name="pre.@dot">
</target>
- <target name="pre.org.eclipse.jubula.client.core.jar">
+ <target name="pre.org.eclipse.jubula.client.core.jar" depends="gen-parser">
</target>
<!-- ===================================================================== -->
diff --git a/org.eclipse.jubula.client.core/lib/.gitignore b/org.eclipse.jubula.client.core/lib/.gitignore
index d8da42599..3ff2106c1 100644
--- a/org.eclipse.jubula.client.core/lib/.gitignore
+++ b/org.eclipse.jubula.client.core/lib/.gitignore
@@ -1 +1,2 @@
/param-parser.jar
+/driver \ No newline at end of file
diff --git a/org.eclipse.jubula.client.core/lib/dom4j-1.6.1.jar b/org.eclipse.jubula.client.core/lib/dom4j-1.6.1.jar
new file mode 100644
index 000000000..c8c4dbb92
--- /dev/null
+++ b/org.eclipse.jubula.client.core/lib/dom4j-1.6.1.jar
Binary files differ
diff --git a/org.eclipse.jubula.client.core/lib/poi-3.2-FINAL-20081019.jar b/org.eclipse.jubula.client.core/lib/poi-3.2-FINAL-20081019.jar
new file mode 100644
index 000000000..e860545bb
--- /dev/null
+++ b/org.eclipse.jubula.client.core/lib/poi-3.2-FINAL-20081019.jar
Binary files differ
diff --git a/org.eclipse.jubula.client.core/resources/.gitignore b/org.eclipse.jubula.client.core/resources/.gitignore
index b3fc5159a..9ebb12aea 100644
--- a/org.eclipse.jubula.client.core/resources/.gitignore
+++ b/org.eclipse.jubula.client.core/resources/.gitignore
@@ -1,4 +1,3 @@
/databases.properties
/schema.properties
-/hibernate.properties
/default.properties
diff --git a/org.eclipse.jubula.client.core/resources/hibernate.properties.template b/org.eclipse.jubula.client.core/resources/hibernate.properties
index 0653c1b19..0653c1b19 100644
--- a/org.eclipse.jubula.client.core/resources/hibernate.properties.template
+++ b/org.eclipse.jubula.client.core/resources/hibernate.properties
diff --git a/org.eclipse.jubula.client.core/resources/schema.properties.template b/org.eclipse.jubula.client.core/resources/schema.properties.template
index 5869469e7..bd351b923 100644
--- a/org.eclipse.jubula.client.core/resources/schema.properties.template
+++ b/org.eclipse.jubula.client.core/resources/schema.properties.template
@@ -3,7 +3,7 @@
#Schema1
1_schemName = embedded
1_dbtype = 1_db
-1_url = jdbc:h2:jubula-db;MVCC=TRUE;AUTO_SERVER=TRUE
+1_url = jdbc:h2:~/jubula-db;MVCC=TRUE;AUTO_SERVER=TRUE
#Schema2
#2_schemName = oracle
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 a529a89fe..75c132fa1 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
@@ -58,9 +58,10 @@ import org.eclipse.jubula.client.core.commands.DisconnectFromAutAgentResponseCom
import org.eclipse.jubula.client.core.commands.GetAutConfigMapResponseCommand;
import org.eclipse.jubula.client.core.communication.AUTConnection;
import org.eclipse.jubula.client.core.communication.BaseConnection;
-import org.eclipse.jubula.client.core.communication.BaseConnection.GuiDancerNotConnectedException;
+import org.eclipse.jubula.client.core.communication.BaseConnection.NotConnectedException;
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.client.core.model.IAUTConfigPO;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.client.core.model.IRefTestSuitePO;
@@ -94,9 +95,8 @@ import org.eclipse.jubula.tools.constants.MonitoringConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.ToolkitConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
-import org.eclipse.jubula.tools.exception.GDException;
-import org.eclipse.jubula.tools.exception.GDVersionException;
-import org.eclipse.jubula.tools.i18n.I18n;
+import org.eclipse.jubula.tools.exception.JBException;
+import org.eclipse.jubula.tools.exception.JBVersionException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.objects.IMonitoringValue;
import org.eclipse.jubula.tools.objects.MonitoringValue;
@@ -219,7 +219,7 @@ public class ClientTest implements IClientTest {
AutStarterEvent.SERVER_CANNOT_CONNECTED));
return;
}
- } catch (GDVersionException e) {
+ } catch (JBVersionException e) {
fireAutStarterStateChanged(new AutStarterEvent(
AutStarterEvent.VERSION_ERROR));
}
@@ -235,14 +235,14 @@ public class ClientTest implements IClientTest {
Message message = new DisconnectFromAutAgentMessage();
try {
ServerConnection.getInstance().request(message, command, 10000);
- } catch (GuiDancerNotConnectedException e) {
+ } catch (NotConnectedException e) {
// Exceptions thrown from getInstance(): no connections are
// established, just log
- log.info("closing the connections failed", e); //$NON-NLS-1$
+ log.info(Messages.ClosingTheConnectionsFailed, e);
} catch (CommunicationException e) {
// Exceptions thrown from getInstance(): no connections are
// established, just log
- log.info("closing the connections failed", e); //$NON-NLS-1$
+ log.info(Messages.ClosingTheConnectionsFailed, e);
}
}
@@ -260,7 +260,7 @@ public class ClientTest implements IClientTest {
ToolkitSupportBP.getToolkitLevel(autToolkit))) {
throw new ToolkitPluginException(
- I18n.getString("ErrorMessage.AUT_TOOLKIT_NOT_AVAILABLE")); //$NON-NLS-1$
+ Messages.ErrorMessageAUT_TOOLKIT_NOT_AVAILABLE);
}
m_lastAutConfig = conf;
@@ -278,9 +278,9 @@ public class ClientTest implements IClientTest {
startAUTServerMessage.setLocale(locale);
ServerConnection.getInstance().send(startAUTServerMessage);
if (log.isDebugEnabled()) {
- log.debug("StartAUTServerMessage send"); //$NON-NLS-1$
+ log.debug(Messages.StartAUTServerMessageSend);
}
- } catch (GuiDancerNotConnectedException nce) {
+ } catch (NotConnectedException nce) {
// The ServerConnection was closed. This Exception occurs after
// initialising the server, so there must be a shutdown(). The
// listeners are already notified from the ConnectionListener of
@@ -295,7 +295,7 @@ public class ClientTest implements IClientTest {
try {
closeConnections();
} catch (ConnectionException ce) {
- log.fatal("closing the connections failed", ce); //$NON-NLS-1$
+ log.fatal(Messages.ClosingTheConnectionsFailed, ce);
}
} catch (UnknownHostException uhe) {
log.fatal(uhe);
@@ -306,7 +306,7 @@ public class ClientTest implements IClientTest {
AUTConnection.getInstance().close();
ServerConnection.getInstance().close();
} catch (ConnectionException ce) {
- log.fatal("closing the connections failed", ce); //$NON-NLS-1$
+ log.fatal(Messages.ClosingTheConnectionsFailed, ce);
}
}
}
@@ -334,8 +334,7 @@ public class ClientTest implements IClientTest {
mapToSend.put(AutConfigConstants.AUT_NAME,
mapToSend.get(AutConfigConstants.AUT_ID));
} catch (ConnectionException e) {
- log.error("Unable to append AUT Agent connection information to " //$NON-NLS-1$
- + "AUT Configuration. No connection to AUT Agent."); //$NON-NLS-1$
+ log.error(Messages.UnableToAppendAUTAgent);
}
return mapToSend;
}
@@ -354,7 +353,7 @@ public class ClientTest implements IClientTest {
*/
public void stopAut(AutIdentifier autId) {
if (log.isInfoEnabled()) {
- log.info("stopping test"); //$NON-NLS-1$
+ log.info(Messages.StoppingTest);
}
try {
ServerConnection.getInstance().getCommunicator().send(
@@ -363,10 +362,10 @@ public class ClientTest implements IClientTest {
// Exceptions thrown from getInstance(): no connections are
// established, just log
if (log.isInfoEnabled()) {
- log.info("closing the connections failed", ce); //$NON-NLS-1$
+ log.info(Messages.ClosingTheConnectionsFailed, ce);
}
} catch (CommunicationException e) {
- log.error("Error occurred while trying to stop AUT.", e); //$NON-NLS-1$
+ log.error(Messages.ErrorOccurredWhileTryingToStopAUT, e);
}
TestExecution te = TestExecution.getInstance();
ITestSuitePO startedTestSuite = te.getStartedTestSuite();
@@ -386,9 +385,9 @@ public class ClientTest implements IClientTest {
*/
public void startObjectMapping(AutIdentifier autId, int mod,
int inputCode, int inputType) throws ConnectionException,
- GuiDancerNotConnectedException, CommunicationException {
+ NotConnectedException, CommunicationException {
- log.info("starting object mapping"); //$NON-NLS-1$
+ log.info(Messages.StartingObjectMapping);
// put the AUTServer into the mode OBJECT_MAPPING via sending a
// ChangeAUTModeMessage(OBJECT_MAPPING).
@@ -428,7 +427,7 @@ public class ClientTest implements IClientTest {
boolean dialogOpen,
SortedSet<String> singleLineTrigger,
SortedSet<String> multiLineTrigger, Locale locale) {
- log.info("starting record modus"); //$NON-NLS-1$
+ log.info(Messages.StartingRecordModus);
// put the AUTServer into the mode RECORD_MODE via sending a
// ChangeAUTModeMessage(RECORD_MODE).
try {
@@ -455,7 +454,7 @@ public class ClientTest implements IClientTest {
CAPRecordedCommand.setRecordLocale(locale);
} catch (UnknownMessageException ume) {
fireAUTServerStateChanged(new AUTServerEvent(ume.getErrorId()));
- } catch (GuiDancerNotConnectedException nce) {
+ } catch (NotConnectedException nce) {
log.error(nce);
// HERE: notify the listeners about unsuccessfull mode change
} catch (CommunicationException ce) {
@@ -480,7 +479,7 @@ public class ClientTest implements IClientTest {
AUTConnection.getInstance().send(message);
} catch (UnknownMessageException ume) {
fireAUTServerStateChanged(new AUTServerEvent(ume.getErrorId()));
- } catch (GuiDancerNotConnectedException nce) {
+ } catch (NotConnectedException nce) {
log.error(nce);
// HERE: notify the listeners about unsuccessfull mode change
} catch (CommunicationException ce) {
@@ -538,8 +537,8 @@ public class ClientTest implements IClientTest {
testExecutionState.set(event.getState());
if (event.getState()
== TestExecutionEvent.TEST_EXEC_FAILED) {
- if (event.getException() instanceof GDException) {
- GDException e = (GDException)
+ if (event.getException() instanceof JBException) {
+ JBException e = (JBException)
event.getException();
testExecutionMessageId.set(e.getErrorId());
}
@@ -629,10 +628,10 @@ public class ClientTest implements IClientTest {
public void getAllComponentsFromAUT(IAUTInfoListener listener,
int timeout) {
- log.info("getting all components from AUT"); //$NON-NLS-1$
+ log.info(Messages.GettingAllComponentsFromAUT);
if (listener == null) {
- log.warn("listener is null"); //$NON-NLS-1$
+ log.warn(Messages.ListenerIsNull);
return;
}
@@ -676,13 +675,12 @@ public class ClientTest implements IClientTest {
// FIXME zeb Logging as error assumes that every AUT Server has
// default mappings to contribute. So far this is true,
// but might not be true for future toolkits.
- log.warn("No default Object Mappings could be found for the AUT."); //$NON-NLS-1$
+ log.warn(Messages.NoDefaultObjectMappingsCouldBeFoundForTheAUT);
}
} catch (UnknownMessageException ume) {
fireAUTServerStateChanged(new AUTServerEvent(ume.getErrorId()));
} catch (CommunicationException bce) {
- log.error("could not request components from AUT", //$NON-NLS-1$
- bce);
+ log.error(Messages.CouldNotRequestComponentsFromAUT, bce);
listener.error(IAUTInfoListener.ERROR_COMMUNICATION);
}
}
@@ -693,8 +691,8 @@ public class ClientTest implements IClientTest {
*/
public void addTestEventListener(IAUTEventListener listener) {
if (log.isInfoEnabled()) {
- log.info("adding IAUTEventListener " //$NON-NLS-1$
- + listener.getClass().getName() + ":" //$NON-NLS-1$
+ log.info(Messages.AddingIAUTEventListener + StringConstants.SPACE
+ + listener.getClass().getName() + StringConstants.COLON
+ listener.toString());
}
eventListenerList.add(IAUTEventListener.class, listener);
@@ -706,8 +704,8 @@ public class ClientTest implements IClientTest {
*/
public void removeTestEventListener(IAUTEventListener listener) {
if (log.isInfoEnabled()) {
- log.info("removing IAUTEventListener " //$NON-NLS-1$
- + listener.getClass().getName() + ":" //$NON-NLS-1$
+ log.info(Messages.RemovingIAUTEventListener + StringConstants.SPACE
+ + listener.getClass().getName() + StringConstants.COLON
+ listener.toString());
}
eventListenerList.remove(IAUTEventListener.class, listener);
@@ -794,7 +792,7 @@ public class ClientTest implements IClientTest {
*/
public void fireAUTStateChanged(AUTEvent event) {
if (log.isInfoEnabled()) {
- log.info("firing AUTStateChanged:" //$NON-NLS-1$
+ log.info(Messages.FiringAUTStateChanged + StringConstants.COLON
+ String.valueOf(event.getState()));
}
// Guaranteed to return a non-null array
@@ -815,7 +813,7 @@ public class ClientTest implements IClientTest {
*/
public void fireAutStarterStateChanged(AutStarterEvent event) {
if (log.isInfoEnabled()) {
- log.info("firing AutStarterStateChanged:" //$NON-NLS-1$
+ log.info(Messages.FiringAUTStateChanged + StringConstants.COLON
+ String.valueOf(event.getState()));
}
// Guaranteed to return a non-null array
@@ -835,7 +833,7 @@ public class ClientTest implements IClientTest {
*/
public void fireAUTServerStateChanged(AUTServerEvent event) {
if (log.isInfoEnabled()) {
- log.info("firing AUTServerStateChanged:" //$NON-NLS-1$
+ log.info(Messages.FiringAUTStateChanged + StringConstants.COLON
+ String.valueOf(event.getState()));
}
// Guaranteed to return a non-null array
@@ -874,7 +872,7 @@ public class ClientTest implements IClientTest {
this.getLastConnectedAutId());
try {
ServerConnection.getInstance().send(message);
- } catch (GuiDancerNotConnectedException nce) {
+ } catch (NotConnectedException nce) {
log.error(nce);
} catch (CommunicationException ce) {
log.error(ce);
@@ -892,7 +890,7 @@ public class ClientTest implements IClientTest {
try {
ServerConnection.getInstance().send(message);
- } catch (GuiDancerNotConnectedException nce) {
+ } catch (NotConnectedException nce) {
log.error(nce);
} catch (CommunicationException ce) {
log.error(ce);
@@ -922,10 +920,10 @@ public class ClientTest implements IClientTest {
}, REQUEST_CONFIG_MAP_TIMEOUT);
while (m_autConfigMap == null && timeoutFlag.get()) {
TimeUtil.delay(200);
- log.info("Waiting for AutConfigMap from Agent"); ////$NON-NLS-1$
+ log.info(Messages.WaitingForAutConfigMapFromAgent);
}
- } catch (GuiDancerNotConnectedException nce) {
+ } catch (NotConnectedException nce) {
log.error(nce);
} catch (CommunicationException ce) {
log.error(ce);
@@ -957,21 +955,20 @@ public class ClientTest implements IClientTest {
private void createReportJob(TestResult results) {
final TestResult result = results;
final AtomicBoolean ab = new AtomicBoolean(false);
- final Job job = new Job (
- I18n.getString("Client.CollectingInformation")) { ////$NON-NLS-1$
+ final Job job = new Job (Messages.ClientCollectingInformation) {
private String m_jobFamily = this.getName();
public boolean belongsTo(Object family) {
return m_jobFamily.equals(family);
}
protected IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(I18n.getString("Client.WritingReport"), //$NON-NLS-1$
+ monitor.beginTask(Messages.ClientWritingReport,
IProgressMonitor.UNKNOWN);
writeReport();
- monitor.beginTask(I18n.getString("Client.WritingReportToDB"), //$NON-NLS-1$
+ monitor.beginTask(Messages.ClientWritingReportToDB,
IProgressMonitor.UNKNOWN);
writeTestresultToDB();
if (isRunningWithMonitoring()) {
- monitor.setTaskName(I18n.getString("Client.Calculating")); ////$NON-NLS-1$
+ monitor.setTaskName(Messages.ClientCalculating);
getMonitoringData();
while (result.getMonitoringValues() == null
|| result.getMonitoringValues().isEmpty()) {
@@ -984,8 +981,7 @@ public class ClientTest implements IClientTest {
return Status.CANCEL_STATUS;
}
}
- monitor.setTaskName(
- I18n.getString("Client.BuildingReport")); ////$NON-NLS-1$
+ monitor.setTaskName(Messages.ClientBuildingReport);
buildMonitoringReport();
while (result.getReportData() == null) {
TimeUtil.delay(500);
@@ -1135,7 +1131,7 @@ public class ClientTest implements IClientTest {
AbstractXMLReportGenerator generator = null;
// Use the appropriate report generator
// Default is currently Complete
- if (I18n.getString("TestResultViewPreferencePage.StyleErrorsOnly") //$NON-NLS-1$
+ if (Messages.TestResultViewPreferencePageStyleErrorsOnly
.equalsIgnoreCase(m_logStyle)) {
generator = new ErrorsOnlyXMLReportGenerator(TestResultBP.
@@ -1169,12 +1165,14 @@ public class ClientTest implements IClientTest {
*/
private String createFilename(TestResult result) {
StringBuilder sb = new StringBuilder(m_logPath);
- sb.append("/executionLog-"); //$NON-NLS-1$
+ sb.append(StringConstants.SLASH);
+ sb.append(Messages.ExecutionLog);
+ sb.append(StringConstants.MINUS);
sb.append(result.getProjectName());
- sb.append("-"); //$NON-NLS-1$
+ sb.append(StringConstants.MINUS);
TestResultNode testSuiteNode = result.getRootResultNode();
sb.append(testSuiteNode.getName());
- sb.append("-"); //$NON-NLS-1$
+ sb.append(StringConstants.MINUS);
// Add result of test
if (testSuiteNode.getStatus() == TestResultNode.SUCCESS) {
@@ -1185,7 +1183,7 @@ public class ClientTest implements IClientTest {
if (new File(sb.toString() + XML_FILE_EXT).exists()) {
int postfix = 1;
- sb.append("-"); //$NON-NLS-1$
+ sb.append(StringConstants.MINUS);
while (new File(sb.toString() + postfix + XML_FILE_EXT).exists()) {
postfix++;
}
@@ -1200,23 +1198,23 @@ public class ClientTest implements IClientTest {
* error, the listeners are notified with appopriate ServerEvent.
* @param serverName The name of the server.
* @param port The port number.
- * @throws GDVersionException in case of a version error between Client
+ * @throws JBVersionException in case of a version error between Client
* and AutStarter
* @return false if an error occurs, true otherwise
*/
private boolean initServerConnection(String serverName, String port)
- throws GDVersionException {
+ throws JBVersionException {
try {
ServerConnection.createInstance(serverName, port);
ServerConnection.getInstance().run();
if (log.isDebugEnabled()) {
- log.debug("connected to the GuiDancerServer"); //$NON-NLS-1$
+ log.debug(Messages.ConnectedToTheServer);
}
} catch (ConnectionException ce) {
log.error(ce.getLocalizedMessage(), ce);
return false;
- } catch (BaseConnection.GuiDancerAlreadyConnectedException ae) {
+ } catch (BaseConnection.AlreadyConnectedException ae) {
// The connection is already established.
if (log.isDebugEnabled()) {
log.debug(ae);
@@ -1235,7 +1233,7 @@ public class ClientTest implements IClientTest {
private boolean initAutServerConnection() {
try {
if (log.isDebugEnabled()) {
- log.debug("AUTConnection starting"); //$NON-NLS-1$
+ log.debug(Messages.AUTConnectionStarting);
}
AUTConnection.getInstance().run();
} catch (ConnectionException ce) {
@@ -1243,11 +1241,11 @@ public class ClientTest implements IClientTest {
fireAUTServerStateChanged(new AUTServerEvent(
AUTServerEvent.COULD_NOT_ACCEPTING));
return false;
- } catch (BaseConnection.GuiDancerAlreadyConnectedException ae) {
+ } catch (BaseConnection.AlreadyConnectedException ae) {
// The connection is already established.
log.error(ae);
return false;
- } catch (GDVersionException e) {
+ } catch (JBVersionException e) {
log.error(e);
fireAUTServerStateChanged(new AUTServerEvent(
AUTServerEvent.COULD_NOT_ACCEPTING));
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/IClientTest.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/IClientTest.java
index 1bcae89f7..fc61a14a3 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/IClientTest.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/IClientTest.java
@@ -20,7 +20,7 @@ import org.eclipse.jubula.client.core.businessprocess.ITestExecutionEventListene
import org.eclipse.jubula.client.core.businessprocess.ITestresultSummaryEventListener;
import org.eclipse.jubula.client.core.businessprocess.IWritableComponentNameMapper;
import org.eclipse.jubula.client.core.businessprocess.TestExecutionEvent;
-import org.eclipse.jubula.client.core.communication.BaseConnection.GuiDancerNotConnectedException;
+import org.eclipse.jubula.client.core.communication.BaseConnection.NotConnectedException;
import org.eclipse.jubula.client.core.communication.ConnectionException;
import org.eclipse.jubula.client.core.model.IAUTConfigPO;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
@@ -78,12 +78,12 @@ public interface IClientTest {
* @param autId The ID of the AUT for which to start the Object Mapping.
*
* @throws ConnectionException
- * @throws GuiDancerNotConnectedException
+ * @throws NotConnectedException
* @throws CommunicationException
*/
public abstract void startObjectMapping(AutIdentifier autId, int mod,
int inputCode, int inputType) throws ConnectionException,
- GuiDancerNotConnectedException, CommunicationException;
+ NotConnectedException, CommunicationException;
/**
* Starts the record mode. <br>
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 e3b65f4f5..b4d18c9fc 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
@@ -18,6 +18,7 @@ import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.communication.AUTConnection;
import org.eclipse.jubula.client.core.communication.ConnectionException;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.communication.message.ActivateApplicationMessage;
import org.eclipse.jubula.communication.message.CAPTestMessage;
@@ -85,7 +86,6 @@ public class MessageFactory {
*/
public static ActivateApplicationMessage getActivateApplicationMessage()
throws UnknownMessageException {
-
final String autToolKit = getAutToolkit();
String messageClassName = StringConstants.EMPTY;
try {
@@ -98,11 +98,10 @@ public class MessageFactory {
messageClass)) {
throw new UnknownMessageException(messageClass.getName()
- + "is not assignable to " //$NON-NLS-1$
+ + Messages.IsNotAssignableTo + StringConstants.SPACE
+ ActivateApplicationMessage.class.getName(),
MessageIDs.E_MESSAGE_NOT_ASSIGNABLE);
}
-
// create a sharedInstance and set the message
ActivateApplicationMessage result =
(ActivateApplicationMessage)messageClass.newInstance();
@@ -110,43 +109,54 @@ public class MessageFactory {
}
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- "No AUT Activation Message class found for toolkit " + autToolKit, //$NON-NLS-1$
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE
+ + Messages.NoAUTActivationMessageClassFoundForToolkit
+ + StringConstants.SPACE + autToolKit,
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (ExceptionInInitializerError eiie) {
LOG.error(eiie);
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- eiie.getMessage(),
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE + eiie.getMessage(),
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (LinkageError le) {
LOG.error(le);
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- le.getMessage(), MessageIDs.E_MESSAGE_NOT_CREATED);
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE + le.getMessage(),
+ MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (ClassNotFoundException cnfe) {
LOG.error(cnfe);
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- cnfe.getMessage(),
- MessageIDs.E_MESSAGE_NOT_CREATED);
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE + cnfe.getMessage(),
+ MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (InstantiationException ie) {
LOG.error(ie);
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- ie.getMessage(), MessageIDs.E_MESSAGE_NOT_CREATED);
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE + ie.getMessage(),
+ MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (IllegalAccessException iae) {
LOG.error(iae);
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- iae.getMessage(), MessageIDs.E_MESSAGE_NOT_CREATED);
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE + iae.getMessage(),
+ MessageIDs.E_MESSAGE_NOT_CREATED);
}
}
@@ -175,12 +185,12 @@ public class MessageFactory {
if (StringConstants.EMPTY.equals(autToolKit)
&& !AUTConnection.getInstance().isConnected()) {
throw new UnknownMessageException(
- "creating a Message sharedInstance failed: No connection to AUT.", //$NON-NLS-1$);
+ Messages.CreatingMessageSharedInstanceFailed,
MessageIDs.E_MESSAGE_NOT_CREATED);
}
} catch (ConnectionException e) {
throw new UnknownMessageException(
- "creating a Message sharedInstance failed: No connection to AUT.", //$NON-NLS-1$);
+ Messages.CreatingMessageSharedInstanceFailed,
MessageIDs.E_MESSAGE_NOT_CREATED);
}
String messageClassName = "null"; //$NON-NLS-1$
@@ -193,7 +203,7 @@ public class MessageFactory {
messageClass)) {
throw new UnknownMessageException(messageClass.getName()
- + "is not assignable to " //$NON-NLS-1$
+ + Messages.IsNotAssignableTo + StringConstants.SPACE
+ CAPTestMessage.class.getName(),
MessageIDs.E_MESSAGE_NOT_ASSIGNABLE);
}
@@ -205,47 +215,47 @@ public class MessageFactory {
return result;
}
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- "No Test Message class found for toolkit " + autToolKit, //$NON-NLS-1$
- MessageIDs.E_MESSAGE_NOT_CREATED);
-
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE
+ + Messages.NoAUTActivationMessageClassFoundForToolkit
+ + autToolKit, MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (ExceptionInInitializerError eiie) {
- LOG.error(eiie);
- throw new UnknownMessageException(
- "creating a Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- eiie.getMessage(),
- MessageIDs.E_MESSAGE_NOT_CREATED);
+ throwUnknownMessageException(messageClassName, eiie);
} catch (LinkageError le) {
- LOG.error(le);
- throw new UnknownMessageException(
- "creating a Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- le.getMessage(), MessageIDs.E_MESSAGE_NOT_CREATED);
+ throwUnknownMessageException(messageClassName, le);
} catch (ClassNotFoundException cnfe) {
- LOG.error(cnfe);
- throw new UnknownMessageException(
- "creating a Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- cnfe.getMessage(),
- MessageIDs.E_MESSAGE_NOT_CREATED);
+ throwUnknownMessageException(messageClassName, cnfe);
} catch (InstantiationException ie) {
- LOG.error(ie);
- throw new UnknownMessageException(
- "creating a Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- ie.getMessage(), MessageIDs.E_MESSAGE_NOT_CREATED);
+ throwUnknownMessageException(messageClassName, ie);
} catch (IllegalAccessException iae) {
- LOG.error(iae);
- throw new UnknownMessageException(
- "creating a Message sharedInstance for " //$NON-NLS-1$
- + messageClassName + "failed: " + //$NON-NLS-1$);
- iae.getMessage(), MessageIDs.E_MESSAGE_NOT_CREATED);
+ throwUnknownMessageException(messageClassName, iae);
}
+ return null;
}
/**
+ * @param messageClassName
+ * the message class name
+ * @param nestedException
+ * the nested exception
+ * @throws UnknownMessageException
+ * when called
+ */
+ private static void throwUnknownMessageException(String messageClassName,
+ Throwable nestedException)
+ throws UnknownMessageException {
+ LOG.error(nestedException);
+ throw new UnknownMessageException(
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE + nestedException.getMessage(),
+ MessageIDs.E_MESSAGE_NOT_CREATED);
+ }
+
+ /**
* @throws UnknownMessageException the exception thrown if the instantiation of message failed.
* @return the created Message
*/
@@ -274,7 +284,7 @@ public class MessageFactory {
messageClass)) {
throw new UnknownMessageException(messageClass.getName()
- + "is not assignable to " //$NON-NLS-1$
+ + Messages.IsNotAssignableTo + StringConstants.SPACE
+ SendAUTListOfSupportedComponentsMessage.class
.getName(), MessageIDs.E_MESSAGE_NOT_ASSIGNABLE);
}
@@ -287,35 +297,43 @@ public class MessageFactory {
} catch (ExceptionInInitializerError eiie) {
LOG.error(eiie);
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + String.valueOf(messageClassName) + "failed:" + //$NON-NLS-1$);
- eiie.getMessage(),
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE + eiie.getMessage(),
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (LinkageError le) {
LOG.error(le);
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + String.valueOf(messageClassName) + "failed:" + //$NON-NLS-1$);
- le.getMessage(), MessageIDs.E_MESSAGE_NOT_CREATED);
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE + le.getMessage(),
+ MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (ClassNotFoundException cnfe) {
LOG.error(cnfe);
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + String.valueOf(messageClassName) + "failed:" + //$NON-NLS-1$);
- cnfe.getMessage(),
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE + cnfe.getMessage(),
MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (InstantiationException ie) {
LOG.error(ie);
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + String.valueOf(messageClassName) + "failed:" + //$NON-NLS-1$);
- ie.getMessage(), MessageIDs.E_MESSAGE_NOT_CREATED);
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE + ie.getMessage(),
+ MessageIDs.E_MESSAGE_NOT_CREATED);
} catch (IllegalAccessException iae) {
LOG.error(iae);
throw new UnknownMessageException(
- "creating an Message sharedInstance for " //$NON-NLS-1$
- + String.valueOf(messageClassName) + "failed:" + //$NON-NLS-1$);
- iae.getMessage(), MessageIDs.E_MESSAGE_NOT_CREATED);
+ Messages.CreatingAnMessageSharedInstanceFor
+ + StringConstants.SPACE + messageClassName
+ + Messages.Failed + StringConstants.COLON
+ + StringConstants.SPACE + iae.getMessage(),
+ MessageIDs.E_MESSAGE_NOT_CREATED);
}
}
} \ No newline at end of file
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutAgentRegistration.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutAgentRegistration.java
index c9c97af77..9012e8c7e 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutAgentRegistration.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutAgentRegistration.java
@@ -27,11 +27,13 @@ import org.eclipse.jubula.client.core.ServerEvent;
import org.eclipse.jubula.client.core.agent.AutRegistrationEvent.RegistrationStatus;
import org.eclipse.jubula.client.core.commands.RegisteredAutListCommand;
import org.eclipse.jubula.client.core.communication.ServerConnection;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IAUTConfigPO;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.client.core.model.IProjectPO;
import org.eclipse.jubula.communication.message.GetRegisteredAutListMessage;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
import org.eclipse.jubula.tools.registration.AutIdentifier;
import org.slf4j.Logger;
@@ -123,7 +125,8 @@ public class AutAgentRegistration
try {
l.handleAutRegistration(event);
} catch (Throwable t) {
- LOG.error("Error occurred while notifying listeners.", t); //$NON-NLS-1$
+ LOG.error(Messages.ErrorWhileNotifyingListeners
+ + StringConstants.DOT, t);
}
}
}
@@ -150,7 +153,8 @@ public class AutAgentRegistration
new GetRegisteredAutListMessage(),
new RegisteredAutListCommand(this), 5000);
} catch (CommunicationException ce) {
- LOG.error("Error occurred while getting list of registered AUTs from AUT Agent", ce); //$NON-NLS-1$
+ LOG.error(Messages.ErrorWhileGettingListOfRegisteredAUTs,
+ ce);
}
break;
default:
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractComponentNameMapper.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractComponentNameMapper.java
index ceba114a7..adac0bce0 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractComponentNameMapper.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractComponentNameMapper.java
@@ -13,12 +13,14 @@ package org.eclipse.jubula.client.core.businessprocess;
import java.util.List;
import java.util.Set;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IComponentNamePO;
import org.eclipse.jubula.client.core.model.IComponentNameReuser;
import org.eclipse.jubula.client.core.persistence.GeneralStorage;
import org.eclipse.jubula.client.core.persistence.IncompatibleTypeException;
import org.eclipse.jubula.client.core.persistence.PMException;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.i18n.CompSystemI18n;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.xml.businessmodell.CompSystem;
@@ -121,9 +123,22 @@ public abstract class AbstractComponentNameMapper implements
// Component types are incompatible.
// Throw an exception with information about
// the incompatibility.
- String msg = "Error saving changed ComponentName-Type.\n" //$NON-NLS-1$
- + "Incompatible Type '" + currType + "' -> '" //$NON-NLS-1$ //$NON-NLS-2$
- + userType + "'!"; //$NON-NLS-1$
+ StringBuilder msgBuid = new StringBuilder();
+ msgBuid.append(Messages.ErrorSavingChangedComponentName);
+ msgBuid.append(StringConstants.DOT);
+ msgBuid.append(StringConstants.NEWLINE);
+ msgBuid.append(StringConstants.APOSTROPHE);
+ msgBuid.append(currType);
+ msgBuid.append(StringConstants.APOSTROPHE);
+ msgBuid.append(StringConstants.SPACE);
+ msgBuid.append(StringConstants.MINUS);
+ msgBuid.append(StringConstants.RIGHT_INEQUALITY_SING);
+ msgBuid.append(StringConstants.SPACE);
+ msgBuid.append(StringConstants.APOSTROPHE);
+ msgBuid.append(userType);
+ msgBuid.append(StringConstants.APOSTROPHE);
+ msgBuid.append(StringConstants.EXCLAMATION_MARK);
+ String msg = msgBuid.toString();
throw new IncompatibleTypeException(
compNamePo, msg,
MessageIDs.E_COMP_TYPE_INCOMPATIBLE, new String[]{
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractParamInterfaceBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractParamInterfaceBP.java
index 690be530c..369fd42cb 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractParamInterfaceBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractParamInterfaceBP.java
@@ -75,7 +75,7 @@ public abstract class AbstractParamInterfaceBP<T> {
paramNode, locale, desc, AbstractParamInterfaceBP
.createParamValueValidator(
desc.getType(), false));
- startParameterUpdate(conv, null, row, mapper);
+ startParameterUpdate(conv, locale, row, mapper);
}
}
paramNode.getDataManager().removeDataSet(row);
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 516ec58ba..c7d391c84 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
@@ -301,7 +301,7 @@ public abstract class AbstractXMLReportGenerator {
*/
private void getTimestampFromResultNode(TestResultNode resultNode,
Element insertInto) {
- Element timestampEL = insertInto.addElement("timestamp");
+ Element timestampEL = insertInto.addElement("timestamp"); //$NON-NLS-1$
Date time = resultNode.getTimeStamp();
if (time != null) {
String timestamp = time.toString();
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompletenessGuard.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompletenessGuard.java
index 1c83b7431..5749769d9 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompletenessGuard.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompletenessGuard.java
@@ -15,7 +15,7 @@ import java.util.List;
import java.util.Locale;
import org.apache.commons.lang.StringUtils;
-import org.eclipse.jubula.client.core.model.GuiDancerLogicComponentNotManagedException;
+import org.eclipse.jubula.client.core.model.LogicComponentNotManagedException;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.client.core.model.ICapPO;
import org.eclipse.jubula.client.core.model.IComponentNamePO;
@@ -147,7 +147,7 @@ public final class CompletenessGuard {
ComponentNamesBP.getInstance());
try {
id = objMap.getTechnicalName(result.getCompName());
- } catch (GuiDancerLogicComponentNotManagedException e) { // NOPMD by al on 3/19/07 1:21 PM
+ } catch (LogicComponentNotManagedException e) { // NOPMD by al on 3/19/07 1:21 PM
// ok
}
if (id == null) {
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 b62a06187..ec4f284bf 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
@@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jubula.client.core.businessprocess.treeoperations.CheckIfComponentNameIsReusedOp;
import org.eclipse.jubula.client.core.businessprocess.treeoperations.FindNodesForComponentNameOp;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.client.core.model.ICapPO;
import org.eclipse.jubula.client.core.model.IComponentNameData;
@@ -55,13 +56,13 @@ import org.eclipse.jubula.client.core.utils.TreeTraverser;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.Assert;
-import org.eclipse.jubula.tools.exception.GDException;
-import org.eclipse.jubula.tools.exception.GDFatalException;
-import org.eclipse.jubula.tools.i18n.I18n;
+import org.eclipse.jubula.tools.exception.JBException;
+import org.eclipse.jubula.tools.exception.JBFatalException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.xml.businessmodell.CompSystem;
import org.eclipse.jubula.tools.xml.businessmodell.Component;
import org.eclipse.jubula.tools.xml.businessmodell.ConcreteComponent;
+import org.eclipse.osgi.util.NLS;
/**
@@ -224,8 +225,8 @@ public class ComponentNamesBP
currProj.getMajorProjectVersion(),
currProj.getMinorProjectVersion());
addComponentNamePO(namePO);
- } catch (GDException e) {
- throw new GDFatalException(e, MessageIDs.E_DATABASE_GENERAL);
+ } catch (JBException e) {
+ throw new JBFatalException(e, MessageIDs.E_DATABASE_GENERAL);
}
}
if (namePO != null) {
@@ -237,7 +238,8 @@ public class ComponentNamesBP
// This can happen legally if there is an unused overridden
// Component Name which was formerly propagated.
if (log.isDebugEnabled()) {
- log.debug("Empty Component name. Parent ProjectId = " //$NON-NLS-1$
+ log.debug(Messages.EmptyComponentName + StringConstants.SPACE
+ + StringConstants.EQUALS_SIGN + StringConstants.SPACE
+ rootProjId + " uniqueId = " + guid); //$NON-NLS-1$
}
}
@@ -284,7 +286,7 @@ public class ComponentNamesBP
&& loadedProjectIds.add(usedProjPo.getId())) {
init(usedProjPo, loadedProjectIds);
}
- } catch (GDException e) {
+ } catch (JBException e) {
// Continue! Maybe the Project is not present in DB.
}
}
@@ -389,10 +391,10 @@ public class ComponentNamesBP
* @param compNameParentProjGuid The ParentProjectGUID of the
* IComponentNamePO which is to load.
* @return an IComponentNamePO or null if not found
- * @throws GDException in case of any db problem.
+ * @throws JBException in case of any db problem.
*/
public final IComponentNamePO getCompNamePo(String compNameGuid,
- String compNameParentProjGuid) throws GDException {
+ String compNameParentProjGuid) throws JBException {
final IProjectPO currProject = GeneralStorage.getInstance()
.getProject();
@@ -426,11 +428,11 @@ public class ComponentNamesBP
* @param projMinVers the Minor Version of the ParentProject of the wanted
* IComponentNamePO.
* @return an IComponentNamePO or null if not found.
- * @throws GDException in case of any db problem.
+ * @throws JBException in case of any db problem.
*/
private IComponentNamePO getCompNamePoImpl(String projToSearchGuid,
String compNameGuid, String compNameParentProjGuid,
- Integer projMajVers, Integer projMinVers) throws GDException {
+ Integer projMajVers, Integer projMinVers) throws JBException {
if (compNameParentProjGuid != null) {
IComponentNamePO compNamePo = loadCompNamePoImpl(compNameGuid,
@@ -473,11 +475,11 @@ public class ComponentNamesBP
* @param projMinVers the Minor Version of the ParentProject of the wanted
* IComponentNamePO.
* @return an IComponentNamePO or null if not found.
- * @throws GDException in case of any db problem.
+ * @throws JBException in case of any db problem.
*/
private IComponentNamePO loadCompNamePoImpl(String compNameGuid,
String compNameParentProjGuid, Integer projMajVers, Integer projMinVers)
- throws GDException {
+ throws JBException {
IComponentNamePO compNamePO = null;
final Long projId = ProjectPM.findProjectId(compNameParentProjGuid,
@@ -707,18 +709,18 @@ public class ComponentNamesBP
if (UNKNOWN_COMPONENT_TYPE.equals(computedType)) {
// Computed component type is "unknown"
- return I18n.getString("CompName.UnknownTypeDetail", //$NON-NLS-1$
+ return NLS.bind(Messages.CompNameUnknownTypeDetail,
new Object[]{
namePO != null ? namePO.getName() : checkableName});
}
- return I18n.getString("CompName.IncompatibleTypeDetail", //$NON-NLS-1$
- new Object[]{namePO != null ? namePO.getName() : checkableName,
- StringHelper.getInstance().get(checkableComponent.getType(),
- true),
- StringHelper.getInstance().get(originalComponent.getType(),
- true)});
-
+ return NLS.bind(Messages.CompNameIncompatibleTypeDetail,
+ new Object[]{namePO != null ? namePO.getName() : checkableName,
+ StringHelper.getInstance()
+ .get(checkableComponent.getType(), true),
+ StringHelper.getInstance()
+ .get(originalComponent.getType(), true)});
+
}
/**
@@ -930,7 +932,7 @@ public class ComponentNamesBP
Set<INodePO> reuse = new HashSet<INodePO>();
monitor.beginTask(
- I18n.getString("ShowWhereUsed.Searching"), //$NON-NLS-1$
+ Messages.ShowWhereUsedSearching,
specsToSearch.size() + suitesToSearch.size());
for (ISpecPersistable node : specsToSearch) {
@@ -1005,7 +1007,7 @@ public class ComponentNamesBP
* if the TC was modified outside this instance of the
* application.
* @throws PMObjectDeletedException
- * if the po as deleted by another instance of GUIdancer
+ * if the po as deleted by another concurrently working user
*/
public static void handleFirstReference(EntityManager sess,
IComponentNamePO refCompName, boolean isReferencedByThisAction)
@@ -1033,13 +1035,15 @@ public class ComponentNamesBP
name.getClass(), name.getId());
} catch (PersistenceException he) {
// Continue since we are just refreshing the cache
- log.error("Stray hibernate exception on evict/load, continuing..", //$NON-NLS-1$
+ log.error(Messages.StrayHibernateException
+ + StringConstants.DOT + StringConstants.DOT,
he);
}
if (!LockManager.instance()
.lockPO(lockSession, name, false)) {
throw new PMAlreadyLockedException(name,
- "Original Component Name already locked in db.", //$NON-NLS-1$
+ Messages.OrginalTestcaseLocked
+ + StringConstants.DOT,
MessageIDs.E_OBJECT_IN_USE);
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java
index 5e381382c..c57ced2c3 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java
@@ -24,6 +24,7 @@ import javax.persistence.PersistenceException;
import javax.persistence.Query;
import org.eclipse.jubula.client.core.businessprocess.ComponentNamesBP.CompNameCreationContext;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IComponentNameData;
import org.eclipse.jubula.client.core.model.IComponentNamePO;
import org.eclipse.jubula.client.core.model.IProjectPO;
@@ -33,7 +34,8 @@ import org.eclipse.jubula.client.core.persistence.HibernateUtil;
import org.eclipse.jubula.client.core.persistence.PMDirtyVersionException;
import org.eclipse.jubula.client.core.persistence.PMException;
import org.eclipse.jubula.client.core.persistence.PersistenceManager;
-import org.eclipse.jubula.tools.exception.GDFatalException;
+import org.eclipse.jubula.tools.constants.StringConstants;
+import org.eclipse.jubula.tools.exception.JBFatalException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.utils.ValueListIterator;
@@ -121,8 +123,9 @@ public class ComponentNamesDecorator implements IWritableComponentNameCache {
updateStandardMapper(projectId);
clear();
} catch (PMException e) {
- throw new GDFatalException("Reading Component Names from DB failed!" //$NON-NLS-1$
- , e, MessageIDs.E_DATABASE_GENERAL);
+ throw new JBFatalException(Messages.ReadingComponentNamesFailed
+ + StringConstants.EXCLAMATION_MARK, e,
+ MessageIDs.E_DATABASE_GENERAL);
}
}
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 cbb4cde32..8e7752f26 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
@@ -27,6 +27,7 @@ import org.eclipse.jubula.client.core.businessprocess.importfilter.ExcelImportFi
import org.eclipse.jubula.client.core.businessprocess.importfilter.IDataImportFilter;
import org.eclipse.jubula.client.core.businessprocess.importfilter.exceptions.DataReadException;
import org.eclipse.jubula.client.core.businessprocess.importfilter.exceptions.NoSupportForLocaleException;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.II18NStringPO;
import org.eclipse.jubula.client.core.model.IParamDescriptionPO;
import org.eclipse.jubula.client.core.model.IParamNodePO;
@@ -35,10 +36,11 @@ import org.eclipse.jubula.client.core.model.ITDManagerPO;
import org.eclipse.jubula.client.core.model.ITestDataPO;
import org.eclipse.jubula.client.core.model.PoMaker;
import org.eclipse.jubula.client.core.persistence.GeneralStorage;
-import org.eclipse.jubula.tools.exception.GDException;
+import org.eclipse.jubula.tools.constants.StringConstants;
+import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.exception.IncompleteDataException;
-import org.eclipse.jubula.tools.i18n.I18n;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
+import org.eclipse.osgi.util.NLS;
/**
@@ -53,7 +55,7 @@ public class ExternalTestDataBP {
private static final Log LOG = LogFactory.getLog(ExternalTestDataBP.class);
/** this is where the datafile are stored */
- private static File globalDataDir = new File("."); //$NON-NLS-1$
+ private static File globalDataDir = new File(StringConstants.DOT);
/** import fiter*/
private List <IDataImportFilter> m_filter;
@@ -90,12 +92,12 @@ public class ExternalTestDataBP {
* directory for data files
* @param file data source File
* @param node ParamNode
- * @throws GDException error occured while reading data source
+ * @throws JBException error occured while reading data source
* @return filled TestDataManager
*/
private ITDManagerPO createFilledTDManager(File dataDir, String file,
IParamNodePO node)
- throws GDException {
+ throws JBException {
ITDManagerPO tdManager = m_tdManagerCache.get(node);
if (tdManager != null) {
@@ -146,10 +148,10 @@ public class ExternalTestDataBP {
* @param fileName the name of the data source
* @param locale the local of the data
* @return a DataTable
- * @throws GDException id data source is not supported
+ * @throws JBException id data source is not supported
*/
public DataTable createDataTable(File dataDir, String fileName,
- Locale locale) throws GDException {
+ Locale locale) throws JBException {
File dataFile = new File(dataDir, fileName);
DataTable dataTable = m_dataTableCache.get(dataFile);
@@ -164,31 +166,42 @@ public class ExternalTestDataBP {
m_dataTableCache.put(dataFile, dataTable);
return dataTable;
}
- LOG.error("DataSource: '" + dataFileName + "' not supported"); //$NON-NLS-1$//$NON-NLS-2$
- throw new GDException(I18n.getString(
- "ErrorMessage.NOT_SUPP_DATASOURCE", //$NON-NLS-1$
+ LOG.error(Messages.DataSource + StringConstants.COLON
+ + StringConstants.SPACE + StringConstants.APOSTROPHE
+ + dataFileName + StringConstants.APOSTROPHE
+ + StringConstants.SPACE + Messages.NotSupported);
+ throw new JBException(
+ NLS.bind(Messages.ErrorMessageNOT_SUPP_DATASOURCE,
new Object[] { dataFileName }),
MessageIDs.E_NOT_SUPP_DATASOURCE);
} catch (IOException e) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Error reading file: " + dataFileName, e); //$NON-NLS-1$
+ LOG.debug(Messages.ErrorReadingFile + StringConstants.COLON
+ + StringConstants.SPACE + dataFileName, e);
}
- throw new GDException(I18n.getString("ErrorMessage.DATASOURCE_FILE_IO", //$NON-NLS-1$
+ throw new JBException(NLS.bind(
+ Messages.ErrorMessageNOT_SUPP_DATASOURCE,
new Object[] {dataFileName}),
MessageIDs.E_DATASOURCE_FILE_IO);
} catch (DataReadException e) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Error reading file: " + dataFileName, e); //$NON-NLS-1$
+ LOG.debug(Messages.ErrorReadingFile + StringConstants.COLON
+ + StringConstants.SPACE + dataFileName, e);
}
- throw new GDException(I18n.getString("ErrorMessage.DATASOURCE_READ_ERROR", //$NON-NLS-1$
+ throw new JBException(NLS.bind(
+ Messages.ErrorMessageDATASOURCE_READ_ERROR,
new Object[] {dataFileName}),
MessageIDs.E_DATASOURCE_READ_ERROR);
} catch (NoSupportForLocaleException e) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Locale not supported: " + String.valueOf(locale) //$NON-NLS-1$
- + " in data source: " + dataFileName); //$NON-NLS-1$
+ LOG.debug(Messages.LocaleNotSupported + StringConstants.COLON
+ + StringConstants.SPACE + String.valueOf(locale)
+ + StringConstants.SPACE + Messages.InDataSource
+ + StringConstants.COLON + StringConstants.SPACE
+ + dataFileName);
}
- throw new GDException(I18n.getString("ErrorMessage.DATASOURCE_LOCALE_NOTSUPPORTED", //$NON-NLS-1$
+ throw new JBException(NLS.bind(
+ Messages.ErrorMessageDATASOURCE_LOCALE_NOTSUPPORTED,
new Object[] {locale.toString(), locale.getDisplayLanguage()}),
MessageIDs.E_DATASOURCE_LOCALE_NOTSUPPORTED);
}
@@ -224,11 +237,11 @@ public class ExternalTestDataBP {
* What Locale the TestData should be
* @return
* filled TestDataManager with new data
- * @throws GDException
+ * @throws JBException
* error occured while reading data source
*/
private ITDManagerPO parseTable(DataTable filledTable,
- IParameterInterfacePO paramPo, Locale locale) throws GDException {
+ IParameterInterfacePO paramPo, Locale locale) throws JBException {
return parseTable(filledTable, paramPo, locale, false);
}
@@ -245,12 +258,12 @@ public class ExternalTestDataBP {
* whether the
* @return
* filled TestDataManager with new data
- * @throws GDException
+ * @throws JBException
* error occured while reading data source
*/
public ITDManagerPO parseTable(DataTable filledTable,
IParameterInterfacePO paramPo, Locale locale,
- boolean updateCellValues) throws GDException {
+ boolean updateCellValues) throws JBException {
// iterate over rows
List<String> paramNamesExcel =
@@ -295,8 +308,8 @@ public class ExternalTestDataBP {
for (IParamDescriptionPO desc : paramNamesNode) {
if (!paramNamesExcel.contains(desc.getName())) {
- throw new GDException(I18n.getString(
- "ErrorMessage.DATASOURCE_MISSING_PARAMETER", //$NON-NLS-1$
+ throw new JBException(NLS.bind(
+ Messages.ErrorMessageDATASOURCE_MISSING_PARAMETER,
new Object[] { desc.getName(),
paramPo.getName(),
paramPo.getDataFile()}),
@@ -304,7 +317,8 @@ public class ExternalTestDataBP {
}
}
if (rowCount == 1) {
- throw new GDException(I18n.getString("ErrorMessage.DATASOURCE_MISSING_VALUES"), //$NON-NLS-1$
+ throw new JBException(
+ Messages.ErrorMessageDATASOURCE_MISSING_VALUES,
MessageIDs.E_DATASOURCE_MISSING_VALUES);
}
return paramPo.getDataManager();
@@ -312,7 +326,7 @@ public class ExternalTestDataBP {
/**
* Gets the value for the TestDataManager from the given DataTable.
- * Any internal GUIdancer-Symbols (References, Variables, etc.) will be
+ * Any internal Jubula-Symbols (References, Variables, etc.) will be
* converted into the right format.
* @param filledTable The DataTable of the Excel-file
* @param row the row number
@@ -330,8 +344,10 @@ public class ExternalTestDataBP {
MessageIDs.E_DATASOURCE_CONTAIN_EMPTY_DATA).setDetails(
new String[] {});
throw new IncompleteDataException(MessageIDs.getMessage(
- MessageIDs.E_DATASOURCE_CONTAIN_EMPTY_DATA) + "\n" //$NON-NLS-1$
- + I18n.getString("ErrorDetail.DATASOURCE_CONTAIN_EMPTY_DATA", //$NON-NLS-1$
+ MessageIDs.E_DATASOURCE_CONTAIN_EMPTY_DATA)
+ + StringConstants.NEWLINE
+ + NLS.bind(Messages
+ .ErrorDetailDATASOURCE_CONTAIN_EMPTY_DATA,
new Object[] {row + 1, column + 1}),
MessageIDs.E_DATASOURCE_CONTAIN_EMPTY_DATA);
}
@@ -345,11 +361,11 @@ public class ExternalTestDataBP {
* will be returned.
* @param paramNode ParamNode
* @return the usable TDManager
- * @throws GDException
+ * @throws JBException
* occuring Exception while creating TDManager
*/
public ITDManagerPO getExternalCheckedTDManager(IParamNodePO paramNode)
- throws GDException {
+ throws JBException {
boolean isTestRunning =
TestExecution.getInstance().getStartedTestSuite() != null
@@ -385,12 +401,12 @@ public class ExternalTestDataBP {
* returned.
*
* @return the retrieved or generated Test Data Manager.
- * @throws GDException
+ * @throws JBException
* if an error occurs while reading an external data source.
*/
public ITDManagerPO getExternalCheckedTDManager(
IParamNodePO paramNode, Locale locale,
- boolean retrieveExternalData) throws GDException {
+ boolean retrieveExternalData) throws JBException {
Validate.notNull(paramNode);
Validate.notNull(locale);
@@ -417,7 +433,8 @@ public class ExternalTestDataBP {
paramNode.getReferencedDataCube(), paramNode);
}
- LOG.error("Unknown data source type for: " + paramNode.getName()); //$NON-NLS-1$
+ LOG.error(Messages.UnknownSourceType + StringConstants.COLON
+ + StringConstants.SPACE + paramNode.getName());
return null;
}
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 7a1f35ea7..3f0def5b4 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
@@ -32,6 +32,8 @@ import org.dom4j.io.DocumentResult;
import org.dom4j.io.DocumentSource;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
+import org.eclipse.jubula.client.core.i18n.Messages;
+import org.eclipse.jubula.tools.constants.StringConstants;
/**
* Writes an XML document to a file. Also writes an HTML document based on the
@@ -100,9 +102,9 @@ public class FileXMLReportWriter implements IXMLReportWriter {
fileWriter.write(document);
fileWriter.close();
} catch (UnsupportedEncodingException e) {
- LOG.error("Error file writing.", e); //$NON-NLS-1$
+ LOG.error(Messages.ErrorFileWriting + StringConstants.DOT, e);
} catch (IOException e) {
- LOG.error("Error file writing.", e); //$NON-NLS-1$
+ LOG.error(Messages.ErrorFileWriting + StringConstants.DOT, e);
}
if (m_xsl == null) {
return;
@@ -141,11 +143,11 @@ public class FileXMLReportWriter implements IXMLReportWriter {
}
}
} catch (TransformerConfigurationException e1) {
- LOG.error("Error file writing.", e1); //$NON-NLS-1$
+ LOG.error(Messages.ErrorFileWriting + StringConstants.DOT, e1);
} catch (TransformerException e) {
- LOG.error("Error file writing.", e); //$NON-NLS-1$
+ LOG.error(Messages.ErrorFileWriting + StringConstants.DOT, e);
} catch (IOException e) {
- LOG.error("UError file writing.", e); //$NON-NLS-1$
+ LOG.error(Messages.ErrorFileWriting + StringConstants.DOT, e);
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/INameMapper.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/INameMapper.java
index 5d20666f7..ff81fdcdb 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/INameMapper.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/INameMapper.java
@@ -14,7 +14,7 @@ import javax.persistence.EntityManager;
import org.eclipse.jubula.client.core.persistence.IncompatibleTypeException;
import org.eclipse.jubula.client.core.persistence.PMException;
-import org.eclipse.jubula.tools.exception.GDProjectDeletedException;
+import org.eclipse.jubula.tools.exception.ProjectDeletedException;
/**
@@ -33,13 +33,13 @@ public interface INameMapper {
* @param s session to use
* @param projectId id of rootProject
* @throws PMException in case of any db problem
- * @throws GDProjectDeletedException if current project is already deleted
+ * @throws ProjectDeletedException if current project is already deleted
* @throws IncompatibleTypeException if the type of any persisted name is
* incompatible with the type of the
* already existing name in the database
*/
public void persist(EntityManager s, Long projectId)
- throws PMException, GDProjectDeletedException,
+ throws PMException, ProjectDeletedException,
IncompatibleTypeException;
/**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/JobConfiguration.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/JobConfiguration.java
index 0fa391d05..453e6d2eb 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/JobConfiguration.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/JobConfiguration.java
@@ -23,17 +23,18 @@ import java.util.Locale;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IAUTConfigPO;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.client.core.model.IProjectPO;
import org.eclipse.jubula.client.core.model.ITestJobPO;
import org.eclipse.jubula.client.core.model.ITestSuitePO;
import org.eclipse.jubula.client.core.utils.LocaleUtil;
-import org.eclipse.jubula.tools.i18n.I18n;
import org.eclipse.jubula.tools.registration.AutIdentifier;
import org.eclipse.jubula.tools.utils.StringParsing;
import org.eclipse.jubula.tools.xml.businessmodell.Profile;
import org.eclipse.jubula.tools.xml.businessprocess.ProfileBuilder;
+import org.eclipse.osgi.util.NLS;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.converters.Converter;
@@ -256,7 +257,8 @@ public class JobConfiguration {
*/
public void initAndValidate() {
// all needed properties set correctly?
- Validate.notNull(m_project, I18n.getString("JobConfiguration.ValidateProjectExist", //$NON-NLS-1$
+ Validate.notNull(m_project, NLS.bind(
+ Messages.JobConfigurationValidateProjectExist,
new Object[] {String.valueOf(m_projectName),
String.valueOf(m_projectMajor),
String.valueOf(m_projectMinor)}));
@@ -271,7 +273,7 @@ public class JobConfiguration {
}
}
Validate.isTrue((m_testSuiteNames.size() == m_testSuites.size()),
- I18n.getString("JobConfiguration.ValidateTestSuiteExist")); //$NON-NLS-1$
+ Messages.JobConfigurationValidateTestSuiteExist);
for (ITestJobPO tj : getProject().getTestJobCont().getTestJobList()) {
if (tj.getName().equals(m_testJobName)) {
@@ -288,7 +290,8 @@ public class JobConfiguration {
if (!m_testSuites.isEmpty()) {
// checking that all Test Suites are assigned to an AUT
for (ITestSuitePO ts : m_testSuites) {
- Validate.notNull(ts.getAut(), I18n.getString("JobConfiguration.ValidateAnyAut")); //$NON-NLS-1$
+ Validate.notNull(ts.getAut(),
+ Messages.JobConfigurationValidateAnyAut);
}
// checking if specified AUT Config exists
@@ -299,13 +302,14 @@ public class JobConfiguration {
m_autConfig = config;
}
}
- Validate.notNull(m_autConfig, I18n.getString("JobConfiguration.ValidateAutConf")); //$NON-NLS-1$
+ Validate.notNull(m_autConfig,
+ Messages.JobConfigurationValidateAutConf);
}
// LanguageCheck
List <Locale> autLocales = aut.getLangHelper().getLanguageList();
Validate.isTrue(autLocales.size() != 0,
- "There is no language configured in choosen AUT"); //$NON-NLS-1$
+ Messages.NoLanguageConfiguredInChoosenAUT);
if (getLanguage() == null) {
if (autLocales.size() == 1) {
setLanguage(autLocales.get(0));
@@ -314,7 +318,7 @@ public class JobConfiguration {
}
}
Validate.isTrue(autLocales.contains(getLanguage()),
- "Specified language is not supported by AUT"); //$NON-NLS-1$
+ Messages.SpecifiedLanguageNotSupported);
}
}
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 e96a40a63..38aca97a6 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
@@ -16,6 +16,7 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IParamDescriptionPO;
import org.eclipse.jubula.client.core.model.IParamNamePO;
import org.eclipse.jubula.client.core.model.IProjectPO;
@@ -23,7 +24,8 @@ import org.eclipse.jubula.client.core.model.IReusedProjectPO;
import org.eclipse.jubula.client.core.persistence.GeneralStorage;
import org.eclipse.jubula.client.core.persistence.PMException;
import org.eclipse.jubula.client.core.persistence.ParamNamePM;
-import org.eclipse.jubula.tools.exception.GDFatalException;
+import org.eclipse.jubula.tools.constants.StringConstants;
+import org.eclipse.jubula.tools.exception.JBFatalException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
@@ -137,7 +139,7 @@ public class ParamNameBP extends AbstractNameBP<IParamNamePO>
try {
namePO = ParamNamePM.readParamNamePO(uniqueId, rootProjId);
} catch (PMException e) {
- throw new GDFatalException(e, MessageIDs.E_DATABASE_GENERAL);
+ throw new JBFatalException(e, MessageIDs.E_DATABASE_GENERAL);
}
}
if (namePO != null) {
@@ -145,8 +147,23 @@ public class ParamNameBP extends AbstractNameBP<IParamNamePO>
addNamePO(namePO);
} else {
if (log.isDebugEnabled()) {
- log.debug("Empty Parameter name. Parent ProjectId = " + rootProjId //$NON-NLS-1$
- + " uniqueId = " + uniqueId); //$NON-NLS-1$
+ StringBuilder msg = new StringBuilder();
+ msg.append(Messages.EmptyParameterName);
+ msg.append(StringConstants.DOT);
+ msg.append(StringConstants.SPACE);
+ msg.append(Messages.ParentProjectId);
+ msg.append(StringConstants.SPACE);
+ msg.append(StringConstants.EQUALS_SIGN);
+ msg.append(StringConstants.SPACE);
+ msg.append(rootProjId);
+ msg.append(StringConstants.SPACE);
+ msg.append(Messages.uniqueId);
+ msg.append(StringConstants.SPACE);
+ msg.append(StringConstants.EQUALS_SIGN);
+ msg.append(StringConstants.SPACE);
+ msg.append(uniqueId);
+
+ log.debug(msg.toString());
}
}
return name;
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 b8c329b26..0fd82413b 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
@@ -19,6 +19,7 @@ import javax.persistence.Query;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IParamDescriptionPO;
import org.eclipse.jubula.client.core.model.IParamNamePO;
import org.eclipse.jubula.client.core.model.IPersistentObject;
@@ -174,9 +175,16 @@ public class ParamNameBPDecorator extends GuidNameCache<IParamNamePO>
try {
s.persist(paramName);
} catch (PersistenceException e) {
- String msg = "Could not save Parameter with name " //$NON-NLS-1$
- + paramName.getName() + " and GUID " + paramName.getGuid() //$NON-NLS-1$
- + "."; //$NON-NLS-1$
+ StringBuilder msgbuid = new StringBuilder();
+ msgbuid.append(Messages.CouldNotSaveParameter);
+ msgbuid.append(StringConstants.SPACE);
+ msgbuid.append(paramName.getName());
+ msgbuid.append(StringConstants.SPACE);
+ msgbuid.append(Messages.AndGUID);
+ msgbuid.append(StringConstants.SPACE);
+ msgbuid.append(paramName.getGuid());
+ msgbuid.append(StringConstants.DOT);
+ String msg = msgbuid.toString();
log.error(msg, e);
throw new PMSaveException(msg, MessageIDs.E_DB_SAVE);
}
@@ -207,7 +215,8 @@ public class ParamNameBPDecorator extends GuidNameCache<IParamNamePO>
}
} catch (PersistenceException e) {
- String msg = "Could not delete all parameters."; //$NON-NLS-1$
+ String msg = Messages.CouldNotDeleteAllParameters
+ + StringConstants.DOT;
log.error(msg, e);
throw new PMSaveException(msg, MessageIDs.E_DB_SAVE);
}
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 81cb93c84..5a431a3d8 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
@@ -22,14 +22,16 @@ import javax.persistence.Query;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IProjectNamePO;
import org.eclipse.jubula.client.core.model.PoMaker;
import org.eclipse.jubula.client.core.persistence.Hibernator;
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.exception.GDFatalException;
-import org.eclipse.jubula.tools.exception.GDProjectDeletedException;
+import org.eclipse.jubula.tools.constants.StringConstants;
+import org.eclipse.jubula.tools.exception.JBFatalException;
+import org.eclipse.jubula.tools.exception.ProjectDeletedException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import javax.persistence.PersistenceException;
@@ -162,7 +164,7 @@ public class ProjectNameBP {
* @param guid id of the project name
*/
public void checkAndDeleteName(String guid)
- throws PMException, GDProjectDeletedException {
+ throws PMException, ProjectDeletedException {
EntityManager session = null;
try {
@@ -177,8 +179,15 @@ public class ProjectNameBP {
m_names.remove(guid);
m_transientNames.remove(guid);
} catch (PersistenceException he) {
- log.error("Could not delete Project Name (for guid " //$NON-NLS-1$
- + guid + ") from the database.", he); //$NON-NLS-1$
+ StringBuilder msgbuid = new StringBuilder();
+ msgbuid.append(Messages.CouldNotDeleteProjectName);
+ msgbuid.append(StringConstants.LEFT_PARENTHESES);
+ msgbuid.append(Messages.ForGuid);
+ msgbuid.append(guid);
+ msgbuid.append(StringConstants.RIGHT_PARENTHESES);
+ msgbuid.append(Messages.FromTheDatabase);
+ msgbuid.append(StringConstants.DOT);
+ log.error(msgbuid.toString(), he);
} finally {
Hibernator.instance().dropSession(session);
}
@@ -233,10 +242,12 @@ public class ProjectNameBP {
setName(session, guid, newProjectName);
Hibernator.instance().commitTransaction(session, tx);
} catch (PMException e) {
- throw new GDFatalException("saving of project name failed.", e, //$NON-NLS-1$
+ throw new JBFatalException(Messages.SavingProjectFailed
+ + StringConstants.DOT, e,
MessageIDs.E_DATABASE_GENERAL);
- } catch (GDProjectDeletedException e) {
- throw new GDFatalException("saving of project name failed.", e, //$NON-NLS-1$
+ } catch (ProjectDeletedException e) {
+ throw new JBFatalException(Messages.SavingProjectFailed
+ + StringConstants.DOT, e,
MessageIDs.E_PROJECT_NOT_FOUND);
} finally {
Hibernator.instance().dropSession(session);
@@ -253,7 +264,8 @@ public class ProjectNameBP {
private void setTransientName(String guid, String newProjectName) {
if (m_names.containsKey(guid)) {
// there is a persistent key for the guid, so just uopate the name
- log.debug("setTransientName() called for persistant object."); //$NON-NLS-1$
+ log.debug("setTransientName() " + Messages.CalledForPersistantObject //$NON-NLS-1$
+ + StringConstants.DOT);
m_names.put(guid, newProjectName);
} else {
m_transientNames.put(guid, newProjectName);
@@ -337,10 +349,10 @@ public class ProjectNameBP {
*/
public static boolean isValidProjectName(String name, boolean checkSpaces) {
if (checkSpaces) {
- if (name.startsWith(" ")) { //$NON-NLS-1$
+ if (name.startsWith(StringConstants.SPACE)) {
return false; // no leading spaces
}
- if (name.endsWith(" ")) { //$NON-NLS-1$
+ if (name.endsWith(StringConstants.SPACE)) {
return false; // no trailing spaces
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TDVariableStore.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TDVariableStore.java
index 0ec2f26de..3f72fda5e 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TDVariableStore.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TDVariableStore.java
@@ -14,6 +14,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.Assert;
@@ -22,7 +23,7 @@ import org.eclipse.jubula.tools.exception.Assert;
* @created 18.07.2006
*/
public class TDVariableStore {
-
+ //FIXME tobi NLS ??
/** Prefix for a user defined variable of the system environment */
public static final String USERDEF_ENV_VAR_PREFIX = "GDUDV_"; //$NON-NLS-1$
@@ -56,7 +57,7 @@ public class TDVariableStore {
public static final String VAR_AUTCONFIG =
PREDEF_VAR_PREFIX + "AUTCONFIG"; //$NON-NLS-1$
- /** id for the predefined GUIdancer client version variable */
+ /** id for the predefined Jubula client version variable */
public static final String VAR_CLIENTVERSION =
PREDEF_VAR_PREFIX + "CLIENTVERSION"; //$NON-NLS-1$
@@ -137,6 +138,7 @@ public class TDVariableStore {
* {@inheritDoc}
*/
public String toString() {
- return super.toString() + " " + m_variables.toString(); //$NON-NLS-1$
+ return super.toString() + StringConstants.SPACE
+ + m_variables.toString();
}
}
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 89c26a3f3..83090a98c 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
@@ -20,6 +20,7 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IExecTestCasePO;
import org.eclipse.jubula.client.core.model.INodePO;
import org.eclipse.jubula.client.core.model.IParamDescriptionPO;
@@ -33,10 +34,11 @@ 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.StringConstants;
-import org.eclipse.jubula.tools.exception.GDException;
+import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.exception.TestCaseParamCheckException;
import org.eclipse.jubula.tools.i18n.I18n;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
+import org.eclipse.osgi.util.NLS;
/**
@@ -187,9 +189,10 @@ public class TestCaseParamCheckBP {
if (!refsForTD.isEmpty()
&& !hasMoreThanOneChildrenWithRef(parent, ref, locale)) {
- errors.add(I18n.getString("TestCaseParamCheckBP.TestCaseDefinesRefs", //$NON-NLS-1$
- new String[] { parent.getName(), ref }),
- null);
+ errors.add(NLS.bind(
+ Messages.TestCaseParamCheckBPTestCaseDefinesRefs,
+ new String[] { parent.getName(), ref }),
+ null);
}
} catch (IndexOutOfBoundsException e) { // NOPMD by al on 3/19/07 1:24 PM
// Nothing to be done
@@ -248,7 +251,7 @@ public class TestCaseParamCheckBP {
try {
execTestCases = NodePM.getAllExecTestCases(
parent.getGuid(), parent.getParentProjectId());
- } catch (GDException e) {
+ } catch (JBException e) {
LOG.error(e);
}
List <String> paramNames = parent.getParamNames();
@@ -261,7 +264,8 @@ public class TestCaseParamCheckBP {
? execTc.getParentNode().getName()
: execTc.getName();
if (!checkList.contains(name)) {
- errors.add("TestCaseParamCheckBP.TestExecHasOwnTestData", //$NON-NLS-1$
+ errors.add(Messages
+ .TestCaseParamCheckBPTestExecHasOwnTestData,
new String[] { name });
checkList.add(name);
}
@@ -359,13 +363,14 @@ public class TestCaseParamCheckBP {
}
String name = execTc.getParentNode() != null ? execTc
.getParentNode().getName() : execTc.getName();
- errors.add(I18n.getString("TestCaseParamCheckBP.TestCaseIsUsed1") //$NON-NLS-1$
- + specNode.getName() + I18n.getString("TestCaseParamCheckBP.TestCaseIsUsed2"), //$NON-NLS-1$
+ errors.add(Messages.TestCaseParamCheckBPTestCaseIsUsed1
+ + specNode.getName()
+ + Messages.TestCaseParamCheckBPTestCaseIsUsed2,
new String[] { name });
editorShouldBeDirty = false;
}
- } catch (GDException e) {
- errors.add("ErrorMessage.DATABASE_GENERAL", null); //$NON-NLS-1$
+ } catch (JBException e) {
+ errors.add(Messages.ErrorMessageDATABASE_GENERAL, null);
}
}
@@ -414,7 +419,7 @@ public class TestCaseParamCheckBP {
if (Hibernator.isPoClassSubclass(
parentPoClass, ITestSuitePO.class)) {
errors.add(
- "TestCaseParamCheckBP.TestExecHasTestSuiteParent", //$NON-NLS-1$
+ Messages.TestCaseParamCheckBPTestExecHasTestSuiteParent,
new String[] { execNode.getName() });
}
} else {
@@ -451,13 +456,15 @@ public class TestCaseParamCheckBP {
break;
}
}
- errors.add("TestCaseParamCheckBP.InvalidRefInTestData", //$NON-NLS-1$
+ errors.add(Messages
+ .TestCaseParamCheckBPInvalidRefInTestData,
new String[] { notAllowedRef });
}
}
if (!node.getParamReferencesIterator(0, locale).hasNext()) {
for (String refInput : ref) {
- errors.add("TestCaseParamCheckBP.InvalidRefInTestData", //$NON-NLS-1$
+ errors.add(Messages
+ .TestCaseParamCheckBPInvalidRefInTestData,
new String[] { refInput });
}
}
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 3c874101d..1e621a822 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
@@ -40,10 +40,11 @@ import org.eclipse.jubula.client.core.commands.DisplayManualTestStepResponseComm
import org.eclipse.jubula.client.core.commands.EndTestExecutionResponseCommand;
import org.eclipse.jubula.client.core.commands.TakeScreenshotResponseCommand;
import org.eclipse.jubula.client.core.communication.AUTConnection;
-import org.eclipse.jubula.client.core.communication.BaseConnection.GuiDancerNotConnectedException;
+import org.eclipse.jubula.client.core.communication.BaseConnection.NotConnectedException;
import org.eclipse.jubula.client.core.communication.ConnectionException;
import org.eclipse.jubula.client.core.communication.ServerConnection;
-import org.eclipse.jubula.client.core.model.GuiDancerLogicComponentNotManagedException;
+import org.eclipse.jubula.client.core.i18n.Messages;
+import org.eclipse.jubula.client.core.model.LogicComponentNotManagedException;
import org.eclipse.jubula.client.core.model.IAUTConfigPO;
import org.eclipse.jubula.client.core.model.IAUTConfigPO.ActivationMethod;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
@@ -87,9 +88,8 @@ import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.TimeoutConstants;
import org.eclipse.jubula.tools.constants.TimingConstantsClient;
import org.eclipse.jubula.tools.exception.CommunicationException;
-import org.eclipse.jubula.tools.exception.GDException;
+import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.exception.InvalidDataException;
-import org.eclipse.jubula.tools.i18n.I18n;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.objects.IComponentIdentifier;
import org.eclipse.jubula.tools.objects.event.EventFactory;
@@ -103,6 +103,7 @@ import org.eclipse.jubula.tools.xml.businessmodell.Action;
import org.eclipse.jubula.tools.xml.businessmodell.CompSystem;
import org.eclipse.jubula.tools.xml.businessmodell.Component;
import org.eclipse.jubula.tools.xml.businessmodell.Param;
+import org.eclipse.osgi.util.NLS;
import org.osgi.framework.Constants;
@@ -117,7 +118,7 @@ import org.osgi.framework.Constants;
*/
public class TestExecution {
/**
- * <code>COM_BREDEXSW_GUIDANCER_CLIENT_TEST</code>
+ * <code>CLIENT_TEST_PLUGIN_ID</code>
*/
private static final String CLIENT_TEST_PLUGIN_ID =
"org.eclipse.jubula.client.core"; //$NON-NLS-1$
@@ -309,7 +310,7 @@ public class TestExecution {
m_autConfig = ClientTestFactory.getClientTest().getLastAutConfig();
m_autoScreenshot = autoScreenshot;
setPaused(false);
- Validate.notNull(testSuite, "Testsuite must not be null"); //$NON-NLS-1$
+ Validate.notNull(testSuite, Messages.TestsuiteMustNotBeNull);
m_executionLanguage = locale;
m_varStore.storeEnvironmentVariables();
storePredefinedVariables(m_varStore, testSuite);
@@ -328,7 +329,7 @@ public class TestExecution {
handleNoConnectionToAUT(testSuite, autId);
}
} catch (ConnectionException e) {
- LOG.error("Unable to connect to AUT.", e); //$NON-NLS-1$
+ LOG.error(Messages.UnableToConnectToAUT + StringConstants.DOT, e);
}
}
@@ -359,13 +360,15 @@ public class TestExecution {
String autName = autId.getExecutableName();
if (isAutNameSet(autName)) {
// no AUTid for test suite has been set
- autName = I18n.getString("ErrorDetail.NO_AUT_ID_FOR_REF_TS_FOUND", //$NON-NLS-1$
+ autName = NLS.bind(Messages.ErrorDetailNO_AUT_ID_FOR_REF_TS_FOUND,
new String[] { testSuite.getName() });
}
ClientTestFactory.getClientTest().fireTestExecutionChanged(
new TestExecutionEvent(TestExecutionEvent.TEST_EXEC_FAILED,
- new GDException("Could not connect to AUT: " + autName, //$NON-NLS-1$
- MessageIDs.E_NO_AUT_CONNECTION_ERROR)));
+ new JBException(Messages.CouldNotConnectToAUT
+ + StringConstants.COLON + StringConstants.SPACE
+ + autName,
+ MessageIDs.E_NO_AUT_CONNECTION_ERROR)));
}
/**
@@ -444,6 +447,7 @@ public class TestExecution {
* @param locale language valid for testexecution
*/
private void startTestSuite(ITestSuitePO testSuite, Locale locale) {
+ //FIXME tobi NLS ??
Validate.notNull(testSuite, "No testsuite available"); //$NON-NLS-1$
ICapPO firstCap = null;
m_expectedNumberOfSteps = 0;
@@ -452,13 +456,6 @@ public class TestExecution {
IClientTest clientTest = ClientTestFactory.getClientTest();
clientTest.setLastConnectedAutId(
getConnectedAutId().getExecutableName());
-// Map m = clientTest.getLastConnectedAutConfigMap();
-// boolean resetMonitoringData = Boolean.valueOf(
-// (String)m.get(MonitoringConstants.RESET_MONITORING_DATA));
-// boolean monitoring = clientTest.isRunningWithMonitoring();
-// if (resetMonitoringData && monitoring) {
-// resetMonitoringData();
-// }
try {
// build and show result Tree
Traverser copier = new Traverser(testSuite, locale);
@@ -475,7 +472,8 @@ public class TestExecution {
resultTreeBuilder.getRootNode()));
initTestExecutionMessage();
if (LOG.isInfoEnabled()) {
- LOG.info("Start TestSuite: " + testSuite.getName()); //$NON-NLS-1$
+ LOG.info(Messages.StartTestSuite + StringConstants.COLON
+ + StringConstants.SPACE + testSuite.getName());
}
m_resultTreeTracker = new ResultTreeTracker(resultTreeBuilder.
@@ -488,8 +486,8 @@ public class TestExecution {
fireTestExecutionChanged(new TestExecutionEvent(
TestExecutionEvent.TEST_EXEC_RESULT_TREE_READY));
firstCap = m_trav.next();
- } catch (GDException e) {
- LOG.error("Incomplete testdata", e); //$NON-NLS-1$
+ } catch (JBException e) {
+ LOG.error(Messages.IncompleteTestdata, e);
fireError(e);
}
if (firstCap != null) {
@@ -512,17 +510,23 @@ public class TestExecution {
* @param cap the cap to check
* @return <code>null</code> if everything is OK, a thrown Exception otherwise.
*/
- private GDException isCapExecutable(ICapPO cap) {
+ private JBException isCapExecutable(ICapPO cap) {
try {
buildMessageCap(cap, true);
- } catch (GuiDancerLogicComponentNotManagedException e) {
- return new GDException("Incomplete TS-run: missing Object Mapping", //$NON-NLS-1$
+ } catch (LogicComponentNotManagedException e) {
+ return new JBException(Messages.IncompleteTSRun
+ + StringConstants.COLON + StringConstants.SPACE
+ + Messages.MissingObjectMapping,
TestExecutionEvent.TEST_RUN_INCOMPLETE_OBJECTMAPPING_ERROR);
} catch (InvalidDataException ide) {
- return new GDException("Incomplete TS-run: missing Test Data", //$NON-NLS-1$
+ return new JBException(Messages.IncompleteTSRun
+ + StringConstants.COLON + StringConstants.SPACE
+ + Messages.MissingTestData,
TestExecutionEvent.TEST_RUN_INCOMPLETE_TESTDATA_ERROR);
} catch (IndexOutOfBoundsException iobe) {
- return new GDException("Incomplete TS-run: missing Test Data", //$NON-NLS-1$
+ return new JBException(Messages.IncompleteTSRun
+ + StringConstants.COLON + StringConstants.SPACE
+ + Messages.MissingTestData,
TestExecutionEvent.TEST_RUN_INCOMPLETE_TESTDATA_ERROR);
}
return null;
@@ -543,8 +547,10 @@ public class TestExecution {
}
try {
if (LOG.isDebugEnabled()) {
- LOG.debug("TestStep: " + currCap.getName()); //$NON-NLS-1$
- LOG.debug("Component: " + currCap.getComponentName()); //$NON-NLS-1$
+ LOG.debug(Messages.TestStep + StringConstants.COLON
+ + StringConstants.SPACE + currCap.getName());
+ LOG.debug(Messages.Component + StringConstants.COLON
+ + StringConstants.SPACE + currCap.getComponentName());
}
messageCap = buildMessageCap(currCap, false);
if (!m_stopped) {
@@ -583,12 +589,12 @@ public class TestExecution {
endTestExecution();
}
}
- } catch (GuiDancerNotConnectedException bnce) {
- LOG.error("AUTConnection fails", bnce); //$NON-NLS-1$
+ } catch (NotConnectedException bnce) {
+ LOG.error(Messages.AUTConnectionFails, bnce);
} catch (CommunicationException bce) {
- LOG.error("Communication with AUT fails", bce); //$NON-NLS-1$
+ LOG.error(Messages.CommunicationWithAUTFails, bce);
fireError(bce);
- } catch (GuiDancerLogicComponentNotManagedException blcnme) {
+ } catch (LogicComponentNotManagedException blcnme) {
LOG.error(blcnme.getMessage(), blcnme);
fireComponentError();
} catch (InvalidDataException ide) { // NOPMD by al on 3/19/07 1:24 PM
@@ -649,8 +655,8 @@ public class TestExecution {
return null;
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Executing ClientAction: " //$NON-NLS-1$
- + action.getPostExecutionCommand());
+ LOG.debug(Messages.ExecutingClientAction + StringConstants.COLON
+ + StringConstants.SPACE + action.getPostExecutionCommand());
}
final String postExecCommandClass = action.getPostExecutionCommand();
final IPostExecutionCommand command = m_postExecCmdFactory
@@ -664,7 +670,7 @@ public class TestExecution {
response.setMessageCap(capTestMessage.getMessageCap());
return response;
}
- } catch (GDException e) { // NOPMD by al on 3/19/07 1:24 PM
+ } catch (JBException e) { // NOPMD by al on 3/19/07 1:24 PM
// nothing
}
return null;
@@ -686,8 +692,9 @@ public class TestExecution {
return Integer.parseInt(timePerWordParam.getValue())
* numWords;
} catch (NumberFormatException e) {
- LOG.warn("Error while parsing timeout parameter. " //$NON-NLS-1$
- + "Using default value.", e); //$NON-NLS-1$
+ LOG.warn(Messages.ErrorParsingTimeoutParameter + StringConstants.DOT
+ + StringConstants.SPACE + Messages.UsingDefaultValue
+ + StringConstants.DOT, e);
}
return -1;
}
@@ -699,7 +706,7 @@ public class TestExecution {
* @param runIncomplete sets this method in "run incomplete"-mode.
* It throws InvalidDataException if missing test data.
* @return MessageCap
- * @throws GuiDancerLogicComponentNotManagedException
+ * @throws LogicComponentNotManagedException
* if component not found in objectMap.
* if building compSystem fails.
* if component cannot be found.
@@ -708,7 +715,7 @@ public class TestExecution {
*/
private MessageCap buildMessageCap(ICapPO cap, boolean runIncomplete)
throws InvalidDataException,
- GuiDancerLogicComponentNotManagedException {
+ LogicComponentNotManagedException {
MessageCap messageCap;
String logicalName = null;
@@ -733,11 +740,11 @@ public class TestExecution {
try {
technicalName = transientOm.getTechnicalName(logicalName);
- } catch (GuiDancerLogicComponentNotManagedException e) {
+ } catch (LogicComponentNotManagedException e) {
technicalName = om.getTechnicalName(logicalName);
}
if (technicalName == null) {
- throw new GuiDancerLogicComponentNotManagedException(
+ throw new LogicComponentNotManagedException(
StringConstants.EMPTY,
MessageIDs.E_COMPONENT_NOT_MANAGED);
}
@@ -752,11 +759,23 @@ public class TestExecution {
runIncomplete);
}
return messageCap;
- } catch (GuiDancerLogicComponentNotManagedException blcnme) {
- LOG.error("No entry for " + cap.getComponentName() //$NON-NLS-1$
- + "(=professional name) / " + logicalName //$NON-NLS-1$
- + "(=technical name)", //$NON-NLS-1$
- blcnme);
+ } catch (LogicComponentNotManagedException blcnme) {
+ StringBuilder msg = new StringBuilder();
+ msg.append(Messages.NoEntryFor);
+ msg.append(StringConstants.SPACE);
+ msg.append(cap.getComponentName());
+ msg.append(StringConstants.LEFT_PARENTHESES);
+ msg.append(StringConstants.EQUALS_SIGN);
+ msg.append(Messages.ProfessionalName);
+ msg.append(StringConstants.RIGHT_PARENTHESES);
+ msg.append(StringConstants.SPACE);
+ msg.append(StringConstants.SLASH);
+ msg.append(StringConstants.SPACE);
+ msg.append(StringConstants.LEFT_PARENTHESES);
+ msg.append(StringConstants.EQUALS_SIGN);
+ msg.append(Messages.TechnicalName);
+ msg.append(StringConstants.RIGHT_PARENTHESES);
+ LOG.error(msg.toString(), blcnme);
throw blcnme;
} catch (InvalidDataException e) {
if (runIncomplete) {
@@ -785,7 +804,7 @@ public class TestExecution {
ITDManagerPO tdManager = null;
try {
tdManager = m_externalTestDataBP.getExternalCheckedTDManager(cap);
- } catch (GDException gde) {
+ } catch (JBException gde) {
fireError(gde);
}
if (tdManager != null) {
@@ -799,9 +818,21 @@ public class TestExecution {
messageCap.addMessageParam(messageParam);
ITestDataPO date =
tdManager.getCell(0, desc);
- Validate.notNull(date, "No testdata available for CAP: " + //$NON-NLS-1$
- cap.getName() + ", parameter: " + //$NON-NLS-1$
- desc.getName() + ", and dataset number 0"); //$NON-NLS-1$
+ StringBuilder msg = new StringBuilder();
+ msg.append(Messages.NoTestdataAvailableForCAP);
+ msg.append(StringConstants.COLON);
+ msg.append(StringConstants.SPACE);
+ msg.append(cap.getName());
+ msg.append(StringConstants.COMMA);
+ msg.append(StringConstants.SPACE);
+ msg.append(Messages.Parameter);
+ msg.append(StringConstants.COLON);
+ msg.append(StringConstants.SPACE);
+ msg.append(desc.getName());
+ msg.append(StringConstants.COMMA);
+ msg.append(StringConstants.SPACE);
+ msg.append(Messages.AndDatasetNumberZero);
+ Validate.notNull(date, msg.toString());
String value = null;
try {
final int dsNumber = m_trav.getDataSetNumber();
@@ -815,9 +846,18 @@ public class TestExecution {
value = conv.getExecutionString(stackList, getLocale());
} catch (InvalidDataException e) {
if (!runIncomplete) {
- LOG.error("No value available for parameter: " //$NON-NLS-1$
- + desc.getName()
- + " in node: " + cap.getName(), e); //$NON-NLS-1$)
+ StringBuilder msgbuild = new StringBuilder();
+ msgbuild.append(Messages.NoValueAvailableForParameter);
+ msgbuild.append(StringConstants.COLON);
+ msgbuild.append(StringConstants.SPACE);
+ msgbuild.append(desc.getName());
+ msgbuild.append(StringConstants.SPACE);
+ msgbuild.append(Messages.InNode);
+ msgbuild.append(StringConstants.COLON);
+ msgbuild.append(StringConstants.SPACE);
+ msgbuild.append(cap.getName());
+
+ LOG.error(msgbuild.toString(), e);
fireError(e);
} else {
throw e;
@@ -842,7 +882,8 @@ public class TestExecution {
Param xmlParam = action.findParam(desc.getUniqueId());
if (LOG.isDebugEnabled()) {
- LOG.debug("Param: " + xmlParam.getName()); //$NON-NLS-1$
+ LOG.debug(Messages.Param + StringConstants.COLON
+ + StringConstants.SPACE + xmlParam.getName());
}
MessageParam messageParam = new MessageParam();
messageParam.setType(xmlParam.getType());
@@ -854,6 +895,7 @@ public class TestExecution {
* verifies the response of server for execution of a cap
* @param msg The response message.
*/
+ //FIXME tobi NLS ?? (execute)
public void processServerResponse(final CAPTestResponseMessage msg) {
Thread t = new Thread("Execute Test Step") { //$NON-NLS-1$
public void run() {
@@ -874,8 +916,8 @@ public class TestExecution {
if (!m_stopped) {
nextCap = m_trav.next();
}
- } catch (GDException e) {
- LOG.error("Incomplete testdata", e); //$NON-NLS-1$
+ } catch (JBException e) {
+ LOG.error(Messages.IncompleteTestdata, e);
fireError(e);
}
} else {
@@ -901,8 +943,8 @@ public class TestExecution {
if (!m_stopped) {
nextCap = m_trav.next(eventType);
}
- } catch (GDException e) {
- LOG.error("Incomplete testdata", e); //$NON-NLS-1$
+ } catch (JBException e) {
+ LOG.error(Messages.IncompleteTestdata, e);
fireError(e);
}
}
@@ -913,7 +955,7 @@ public class TestExecution {
Thread.sleep(100);
} catch (InterruptedException e) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Thread interrupted.", e); //$NON-NLS-1$
+ LOG.debug(Messages.ThreadInterrupted, e);
}
return;
}
@@ -921,7 +963,7 @@ public class TestExecution {
processCap(nextCap);
} else {
if (LOG.isInfoEnabled()) {
- LOG.info("Testsuite finished."); //$NON-NLS-1$
+ LOG.info(Messages.TestsuiteFinished);
}
endTestExecution();
}
@@ -941,7 +983,7 @@ public class TestExecution {
AUTConnection.getInstance().request(
message, command,
TimeoutConstants.CLIENT_SERVER_TIMEOUT_TAKE_SCREENSHOT);
- } catch (GuiDancerNotConnectedException nce) {
+ } catch (NotConnectedException nce) {
if (LOG.isErrorEnabled()) {
LOG.error(nce);
}
@@ -984,9 +1026,20 @@ public class TestExecution {
.createCommand(cmdClassName);
try {
return cmd.execute();
- } catch (GDException e) {
- LOG.error("Error executing command: " + cmdClassName //$NON-NLS-1$
- + " . Exception: " + String.valueOf(e)); //$NON-NLS-1$
+ } catch (JBException e) {
+ StringBuilder msg = new StringBuilder();
+ msg.append(Messages.ErrorExecutingCommand);
+ msg.append(StringConstants.COLON);
+ msg.append(StringConstants.SPACE);
+ msg.append(cmdClassName);
+ msg.append(StringConstants.SPACE);
+ msg.append(StringConstants.DOT);
+ msg.append(StringConstants.SPACE);
+ msg.append(Messages.Exception);
+ msg.append(StringConstants.COLON);
+ msg.append(StringConstants.SPACE);
+ msg.append(String.valueOf(e));
+ LOG.error(msg.toString());
fireError(e);
return null;
}
@@ -1001,7 +1054,7 @@ public class TestExecution {
try {
AUTConnection.getInstance().send(new NullMessage());
} catch (CommunicationException e) {
- fireError(new GDException(MessageIDs.getMessage(
+ fireError(new JBException(MessageIDs.getMessage(
MessageIDs.E_INTERRUPTED_CONNECTION),
MessageIDs.E_INTERRUPTED_CONNECTION));
}
@@ -1046,7 +1099,7 @@ public class TestExecution {
/**
* Fires an event if test fails
- * @param e GDException
+ * @param e JBException
*/
private void fireError(Exception e) {
ClientTestFactory.getClientTest().
@@ -1097,7 +1150,7 @@ public class TestExecution {
fireError(e);
}
if (LOG.isInfoEnabled()) {
- LOG.info("Testsuite is stopped"); //$NON-NLS-1$
+ LOG.info(Messages.TestsuiteIsStopped);
}
ClientTestFactory.getClientTest().fireEndTestExecution();
@@ -1123,7 +1176,7 @@ public class TestExecution {
.getConnectedAutId().getExecutableName());
ServerConnection.getInstance().send(message);
- } catch (GuiDancerNotConnectedException nce) {
+ } catch (NotConnectedException nce) {
LOG.error(nce);
} catch (CommunicationException ce) {
@@ -1142,7 +1195,7 @@ public class TestExecution {
try {
AUTConnection.getInstance().request(message, command,
EndTestExecutionMessage.TIMEOUT);
- } catch (GuiDancerNotConnectedException nce) {
+ } catch (NotConnectedException nce) {
if (LOG.isWarnEnabled()) {
LOG.warn(nce);
}
@@ -1162,13 +1215,13 @@ public class TestExecution {
setPaused(!isPaused());
if (isPaused()) {
if (LOG.isInfoEnabled()) {
- LOG.info("Testsuite is paused"); //$NON-NLS-1$
+ LOG.info(Messages.TestsuiteIsPaused);
}
ClientTestFactory.getClientTest().fireTestExecutionChanged(
new TestExecutionEvent(TestExecutionEvent.TEST_EXEC_PAUSED));
} else {
if (LOG.isInfoEnabled()) {
- LOG.info("Testexecution has resumed"); //$NON-NLS-1$
+ LOG.info(Messages.TestexecutionHasResumed);
}
// FIXME key "ACTIVATE_APPLICATION" should NOT be fix!
if (m_autConfig != null) {
@@ -1199,7 +1252,7 @@ public class TestExecution {
*/
public void timeout() {
m_resultTreeTracker.getEndNode().setResult(TestResultNode.ABORT, null);
- fireError(new GDException(MessageIDs.getMessage(MessageIDs.
+ fireError(new JBException(MessageIDs.getMessage(MessageIDs.
E_TIMEOUT_CONNECTION), MessageIDs.E_TIMEOUT_CONNECTION));
}
@@ -1420,7 +1473,7 @@ public class TestExecution {
/**
* {@inheritDoc}
*/
- public TestErrorEvent execute() throws GDException {
+ public TestErrorEvent execute() throws JBException {
// FIXME zeb Simply retrieving the first parameter has worked so
// far because all Store/Read actions list Variable Name
// as the first parameter. The first action that does not
@@ -1445,10 +1498,10 @@ public class TestExecution {
LAST_ACTION_RETURN));
return null;
} catch (IllegalArgumentException e) {
- throw new GDException("IllegalArgumentException", e, // //$NON-NLS-1$
+ throw new JBException("IllegalArgumentException", e, // //$NON-NLS-1$
MessageIDs.E_STEP_EXEC);
} catch (InvalidDataException e) {
- throw new GDException("InvalidDataException", e, // //$NON-NLS-1$
+ throw new JBException("InvalidDataException", e, // //$NON-NLS-1$
MessageIDs.E_STEP_EXEC);
}
}
@@ -1464,7 +1517,7 @@ public class TestExecution {
extends AbstractPostExecutionCommand {
/** @return the timer name */
- protected String getTimerName() throws GDException {
+ protected String getTimerName() throws JBException {
return getValueForParam("CompSystem.TimerName"); //$NON-NLS-1$
}
}
@@ -1480,7 +1533,7 @@ public class TestExecution {
/**
* {@inheritDoc}
*/
- public TestErrorEvent execute() throws GDException {
+ public TestErrorEvent execute() throws JBException {
try {
String timerName = getTimerName();
String variableName = getValueForParam(
@@ -1492,10 +1545,10 @@ public class TestExecution {
getTimerStore().put(timerName, curTimeInMillisecs);
m_varStore.store(variableName, curTimeInMillisecs.toString());
} catch (IllegalArgumentException e) {
- throw new GDException("IllegalArgumentException", e, //$NON-NLS-1$
+ throw new JBException("IllegalArgumentException", e, //$NON-NLS-1$
MessageIDs.E_STEP_EXEC);
} catch (InvalidDataException e) {
- throw new GDException("InvalidDataException", e, // //$NON-NLS-1$
+ throw new JBException("InvalidDataException", e, // //$NON-NLS-1$
MessageIDs.E_STEP_EXEC);
}
return null;
@@ -1513,7 +1566,7 @@ public class TestExecution {
/**
* {@inheritDoc}
*/
- public TestErrorEvent execute() throws GDException {
+ public TestErrorEvent execute() throws JBException {
try {
String timerName = getTimerName();
String variableName = getValueForParam(
@@ -1527,10 +1580,10 @@ public class TestExecution {
Long timeDelta = curTimeInMillisecs - timerTimeInMillisecs;
m_varStore.store(variableName, timeDelta.toString());
} catch (IllegalArgumentException e) {
- throw new GDException("IllegalArgumentException", e, //$NON-NLS-1$
+ throw new JBException("IllegalArgumentException", e, //$NON-NLS-1$
MessageIDs.E_STEP_EXEC);
} catch (InvalidDataException e) {
- throw new GDException("InvalidDataException", e, // //$NON-NLS-1$
+ throw new JBException("InvalidDataException", e, // //$NON-NLS-1$
MessageIDs.E_STEP_EXEC);
}
return null;
@@ -1557,7 +1610,7 @@ public class TestExecution {
/**
* {@inheritDoc}
*/
- public TestErrorEvent execute() throws GDException {
+ public TestErrorEvent execute() throws JBException {
try {
String actionToPerform =
getValueForParam("CompSystem.ActionToPerfom"); //$NON-NLS-1$
@@ -1594,10 +1647,10 @@ public class TestExecution {
}
return null;
} catch (IllegalArgumentException e) {
- throw new GDException("IllegalArgumentException", e, // //$NON-NLS-1$
+ throw new JBException("IllegalArgumentException", e, // //$NON-NLS-1$
MessageIDs.E_STEP_EXEC);
} catch (InvalidDataException e) {
- throw new GDException("InvalidDataException", e, // //$NON-NLS-1$
+ throw new JBException("InvalidDataException", e, // //$NON-NLS-1$
MessageIDs.E_STEP_EXEC);
}
}
@@ -1641,7 +1694,7 @@ public class TestExecution {
/**
* {@inheritDoc}
*/
- public TestErrorEvent execute() throws GDException {
+ public TestErrorEvent execute() throws JBException {
final AutIdentifier autId = getConnectedAutId();
final AtomicBoolean isAutRestarted = new AtomicBoolean(false);
IAutRegistrationListener registrationListener =
@@ -1668,7 +1721,7 @@ public class TestExecution {
// nothing
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Requesting AUT Agent to close AUTConnection..."); //$NON-NLS-1$
+ LOG.debug(Messages.RequestingAUTAgentToCloseAUTConnection);
}
AUTConnection.getInstance().getCommunicator().
getConnectionManager().remove(
@@ -1702,7 +1755,7 @@ public class TestExecution {
AutAgentRegistration.getInstance().removeListener(
registrationListener);
if (LOG.isDebugEnabled()) {
- LOG.debug("Continue test execution..."); //$NON-NLS-1$
+ LOG.debug(Messages.ContinueTestExecution);
}
if (!m_stopped) { // the AUT/TS may be stopped by a project
// load
@@ -1711,7 +1764,7 @@ public class TestExecution {
TestExecutionEvent.TEST_EXEC_RESTART));
} else {
if (LOG.isDebugEnabled()) {
- LOG.debug("Can't continue, TS is stopped..."); //$NON-NLS-1$
+ LOG.debug(Messages.CantContinueTSIsStopped);
}
}
}
@@ -1880,7 +1933,7 @@ public class TestExecution {
/**
* {@inheritDoc}
*/
- public TestErrorEvent execute() throws GDException {
+ public TestErrorEvent execute() throws JBException {
IParamDescriptionPO desc =
m_currentCap.getParameterForUniqueId("CompSystem.RunLocal"); //$NON-NLS-1$
try {
@@ -1942,10 +1995,10 @@ public class TestExecution {
}
} catch (IllegalArgumentException e) {
- throw new GDException("IllegalArgumentException", e, //$NON-NLS-1$
+ throw new JBException("IllegalArgumentException", e, //$NON-NLS-1$
MessageIDs.E_STEP_EXEC);
} catch (InvalidDataException e) {
- throw new GDException("InvalidDataException", e, // //$NON-NLS-1$
+ throw new JBException("InvalidDataException", e, // //$NON-NLS-1$
MessageIDs.E_STEP_EXEC);
}
@@ -1956,7 +2009,7 @@ public class TestExecution {
/**
* Interface for commands to execute after the execution of the dependent
* CAP. The implementing class of this interface must be inscribed
- * with the full qualified name in the guidancerContext.xml
+ * with the full qualified name in the componentConfiguration.xml
* in the "postExecutionCommand"-tag in the dependent Action.
*
* @author BREDEX GmbH
@@ -1966,11 +2019,11 @@ public class TestExecution {
/**
* Implementation of this IPostExecutionCommand
- * @throws GDException in case of error while execution
+ * @throws JBException in case of error while execution
* @return a TestErrorEvent representing an error that occurred during
* execution, or <code>null</code> if no such error occurs.
*/
- public TestErrorEvent execute() throws GDException;
+ public TestErrorEvent execute() throws JBException;
}
@@ -2009,7 +2062,9 @@ public class TestExecution {
new ArrayList<ExecObject>(m_trav.getExecStackAsList());
value = conv.getExecutionString(stackList, getLocale());
} catch (InvalidDataException e) {
- throw new InvalidDataException("Neither value nor reference for Node: " //$NON-NLS-1$
+ throw new InvalidDataException(
+ Messages.NeitherValueNorReferenceForNode
+ + StringConstants.COLON + StringConstants.SPACE
+ cap.getName(), MessageIDs.E_NO_REFERENCE);
}
return value;
@@ -2018,7 +2073,7 @@ public class TestExecution {
/**
* @param paramID the parameter id
* @return the value of the current paramID parameter */
- protected String getValueForParam(String paramID) throws GDException {
+ protected String getValueForParam(String paramID) throws JBException {
IParamDescriptionPO desc = m_currentCap
.getParameterForUniqueId(paramID);
ITDManagerPO tdManager =
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java
index fdd4c7cc2..7f74beccc 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java
@@ -112,8 +112,8 @@ public class TestresultSummaryBP {
sum.setInternalProjectGuid(result.getProjectGuid());
sum.setInternalProjectID(result.getProjectId());
- sum.setProjectName(result.getProjectName() + " " //$NON-NLS-1$
- + result.getProjectMajorVersion() + "." //$NON-NLS-1$
+ sum.setProjectName(result.getProjectName() + StringConstants.SPACE
+ + result.getProjectMajorVersion() + StringConstants.DOT
+ result.getProjectMinorVersion());
sum.setProjectMajorVersion(result.getProjectMajorVersion());
sum.setProjectMinorVersion(result.getProjectMinorVersion());
@@ -140,13 +140,11 @@ public class TestresultSummaryBP {
.getTestjobStartTime());
}
sum.setTestsuiteStatus(result.getRootResultNode().getStatus());
- //FIXME: Marc if these values aren't set, MySQL will throw a NaN exception
- //sum.setMonitoringValues(MonitoringConstants.EMPTY_MONITORING_VALUES);
+ //set default monitoring values.
sum.setInternalMonitoringId(MonitoringConstants.EMPTY_MONITORING_ID);
sum.setReport(MonitoringConstants.EMPTY_REPORT);
sum.setReportWritten(false);
sum.setMonitoringValueType(MonitoringConstants.EMPTY_TYPE);
- //FIX end
return sum;
}
@@ -382,6 +380,7 @@ public class TestresultSummaryBP {
String secondsString = (seconds < 10) ? "0" + seconds : String.valueOf(seconds); //$NON-NLS-1$
String minutesString = (minutes < 10) ? "0" + minutes : String.valueOf(minutes); //$NON-NLS-1$
String hoursString = (hours < 10) ? "0" + hours : String.valueOf(hours); //$NON-NLS-1$
- return hoursString + ":" + minutesString + ":" + secondsString; //$NON-NLS-1$//$NON-NLS-2$
+ return hoursString + StringConstants.COLON + minutesString
+ + StringConstants.COLON + secondsString;
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TreeOpsBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TreeOpsBP.java
index 0e38f2773..0851045dc 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TreeOpsBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TreeOpsBP.java
@@ -18,6 +18,7 @@ import java.util.Map;
import javax.persistence.EntityManager;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.ICompNamesPairPO;
import org.eclipse.jubula.client.core.model.IExecTestCasePO;
import org.eclipse.jubula.client.core.model.INodePO;
@@ -36,7 +37,7 @@ import org.eclipse.jubula.client.core.utils.ModelParamValueConverter;
import org.eclipse.jubula.client.core.utils.RefToken;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.TestDataConstants;
-import org.eclipse.jubula.tools.exception.GDException;
+import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
@@ -54,7 +55,7 @@ public class TreeOpsBP {
* @author BREDEX GmbH
* @created 09.09.2005
*/
- public static class TreeOpFailedException extends GDException {
+ public static class TreeOpFailedException extends JBException {
/**
* @param message message
@@ -112,7 +113,7 @@ public class TreeOpsBP {
for (IParamNodePO selectecNode : modNodes) {
INodePO moveNode = findNode(ownerNode, selectecNode);
if (moveNode == null) {
- throw new TreeOpFailedException("Node mismatch", //$NON-NLS-1$
+ throw new TreeOpFailedException(Messages.NodeMismatch,
MessageIDs.E_PO_NOT_FOUND);
}
if (isOwnerSpecTestCase) {
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 a9ad8c1d7..1cff99242 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
@@ -24,6 +24,7 @@ import javax.persistence.Query;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.client.core.model.ICapPO;
import org.eclipse.jubula.client.core.model.ICategoryPO;
@@ -46,9 +47,10 @@ import org.eclipse.jubula.client.core.utils.SpecTreeTraverser;
import org.eclipse.jubula.client.core.utils.TreeTraverser;
import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.ToolkitConstants;
-import org.eclipse.jubula.tools.exception.GDException;
-import org.eclipse.jubula.tools.exception.GDProjectDeletedException;
+import org.eclipse.jubula.tools.exception.JBException;
+import org.eclipse.jubula.tools.exception.ProjectDeletedException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.xml.businessmodell.CompSystem;
import org.eclipse.jubula.tools.xml.businessmodell.Component;
@@ -92,12 +94,12 @@ public class UsedToolkitBP {
* @param specTC The {@link ISpecTestCasePO} whose toolkits are to add.
* @param project the project of the {@link ISpecTestCasePO}
* @throws PMException in case of DB error.
- * @throws GDProjectDeletedException if the project was deleted in another
+ * @throws ProjectDeletedException if the project was deleted in another
* session.
*/
@SuppressWarnings("unchecked")
public void addToolkit(ISpecTestCasePO specTC, IProjectPO project)
- throws PMException, GDProjectDeletedException {
+ throws PMException, ProjectDeletedException {
final Iterator<INodePO> childs = specTC.getNodeListIterator();
final Set<IUsedToolkitPO> addedToolkits =
@@ -147,15 +149,18 @@ public class UsedToolkitBP {
}
- /**
- * Inserts the given List of used toolkits into the DB.
- * @param usedToolkits the used toolkits to insert into DB.
- * @throws PMException in case of DB error.
- * @throws GDProjectDeletedException if the project was deleted in another
- * session.
- */
+ /**
+ * Inserts the given List of used toolkits into the DB.
+ *
+ * @param usedToolkits
+ * the used toolkits to insert into DB.
+ * @throws PMException
+ * in case of DB error.
+ * @throws ProjectDeletedException
+ * if the project was deleted in another session.
+ */
private void insertIntoDB(Set<IUsedToolkitPO> usedToolkits)
- throws PMException, GDProjectDeletedException {
+ throws PMException, ProjectDeletedException {
if (usedToolkits.isEmpty()) {
return;
}
@@ -213,7 +218,7 @@ public class UsedToolkitBP {
* @param project the Project
*/
public void refreshToolkitInfo(final IProjectPO project)
- throws PMException, GDProjectDeletedException {
+ throws PMException, ProjectDeletedException {
refreshToolkitInfo(project, null);
}
@@ -229,7 +234,7 @@ public class UsedToolkitBP {
*/
public void refreshToolkitInfo(final IProjectPO project,
final IProgressMonitor monitor)
- throws PMException, GDProjectDeletedException {
+ throws PMException, ProjectDeletedException {
EntityManager s = Hibernator.instance().openSession();
try {
@@ -279,7 +284,7 @@ public class UsedToolkitBP {
* @throws PMException in case of failed delete statement
*/
public void deleteToolkitsFromDB(EntityManager s, Long parentProjectId,
- boolean commit) throws PMException, GDProjectDeletedException {
+ boolean commit) throws PMException, ProjectDeletedException {
try {
if (commit) {
EntityTransaction tx = Hibernator.instance().getTransaction(s);
@@ -289,7 +294,8 @@ public class UsedToolkitBP {
executeDeleteStatement(s, parentProjectId);
}
} catch (PersistenceException e) {
- String msg = "Deletion of Toolkits failed."; //$NON-NLS-1$
+ String msg = Messages.DeletionOfToolkitsFailed
+ + StringConstants.DOT;
log.error(msg, e);
throw new PMException(msg, MessageIDs.E_DB_SAVE);
}
@@ -675,7 +681,7 @@ public class UsedToolkitBP {
refreshToolkitInfo(project);
} catch (PMException e) {
// nothing
- } catch (GDProjectDeletedException e) {
+ } catch (ProjectDeletedException e) {
// nothing
}
@@ -767,7 +773,7 @@ public class UsedToolkitBP {
.getToolkitPluginDescriptor(
reusedProject.getToolkit()));
}
- } catch (GDException e) {
+ } catch (JBException e) {
// Do nothing.
// If the project cannot be found in the db, then we cannot consider
// it in our computations.
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 0831e82db..39cbb1cd0 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,6 +17,7 @@ import javax.persistence.EntityManager;
import org.apache.commons.collections.ListUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.INodePO;
import org.eclipse.jubula.client.core.persistence.EditSupport;
import org.eclipse.jubula.client.core.persistence.GeneralStorage;
@@ -27,6 +28,7 @@ import org.eclipse.jubula.client.core.persistence.PMException;
import org.eclipse.jubula.client.core.persistence.PMObjectDeletedException;
import org.eclipse.jubula.client.core.persistence.PersistenceManager;
import org.eclipse.jubula.client.core.persistence.locking.LockManager;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import javax.persistence.PersistenceException;
@@ -74,12 +76,12 @@ public class NodeBP {
throw e;
} catch (PMException e) {
// Continue since we are just refreshing the cache
- LOG.fatal("Stray hibernate exception on evict/load, continueing..", //$NON-NLS-1$
- e);
+ LOG.fatal(Messages.StrayHibernateException + StringConstants.DOT
+ + StringConstants.DOT, e);
}
if (!LockManager.instance().lockPO(lockSession, node, false)) {
throw new PMAlreadyLockedException(node,
- "Original testcase already locked in db.", //$NON-NLS-1$
+ Messages.OrginalTestcaseLocked + StringConstants.DOT,
MessageIDs.E_OBJECT_IN_USE);
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestCaseBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestCaseBP.java
index facb725bf..0696f802c 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestCaseBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestCaseBP.java
@@ -26,7 +26,7 @@ import org.eclipse.jubula.client.core.persistence.PMException;
import org.eclipse.jubula.client.core.persistence.PMObjectDeletedException;
import org.eclipse.jubula.client.core.persistence.PMSaveException;
import org.eclipse.jubula.client.core.persistence.NodePM.AbstractCmdHandleChild;
-import org.eclipse.jubula.tools.exception.GDProjectDeletedException;
+import org.eclipse.jubula.tools.exception.ProjectDeletedException;
import org.eclipse.jubula.tools.exception.InvalidDataException;
@@ -54,7 +54,7 @@ public class TestCaseBP extends NodeBP {
* referenced before and is edited by another user.
* @throws PMDirtyVersionException if the referenced TC was modified
* @throws PMObjectDeletedException
- * if the po as deleted by another instance of GUIdancer
+ * if the po as deleted by another concurrently working user
* @return The ExecTC used to reference the SpecTC
*/
public static IExecTestCasePO addReferencedTestCase(
@@ -92,7 +92,7 @@ public class TestCaseBP extends NodeBP {
* if the TC was modified outside this instance of the
* application.
* @throws PMObjectDeletedException
- * if the po as deleted by another instance of GUIdancer
+ * if the po as deleted by another concurrently working user
*/
private static void handleFirstReference(EditSupport editSupport,
ISpecTestCasePO referencedTC, boolean isReferencedByThisAction)
@@ -125,7 +125,7 @@ public class TestCaseBP extends NodeBP {
* @throws PMDirtyVersionException
* if the TC was modified outside of this application instance.
* @throws PMObjectDeletedException
- * if the po as deleted by another instance of GUIdancer
+ * if the po as deleted by another concurrently working user
*/
public static void addEventHandler(EditSupport editSupport,
ISpecTestCasePO targetTC, IEventExecTestCasePO eventHandlerTC)
@@ -153,11 +153,11 @@ public class TestCaseBP extends NodeBP {
* @throws PMSaveException in case of save failed
* @throws PMAlreadyLockedException in case of already locked
* @throws PMException in case of exception
- * @throws GDProjectDeletedException in case of project deleted
+ * @throws ProjectDeletedException in case of project deleted
*/
public static ISpecTestCasePO createNewSpecTestCase(String name,
INodePO parent, Integer position) throws PMSaveException,
- PMAlreadyLockedException, PMException, GDProjectDeletedException {
+ PMAlreadyLockedException, PMException, ProjectDeletedException {
Integer pos = position;
ISpecTestCasePO specTC = NodeMaker.createSpecTestCasePO(name);
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestSuiteBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestSuiteBP.java
index 4bfd5dbce..caad5d571 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestSuiteBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestSuiteBP.java
@@ -51,7 +51,7 @@ public class TestSuiteBP extends NodeBP {
* @throws PMDirtyVersionException
* if the referenced TS was modified
* @throws PMObjectDeletedException
- * if the po as deleted by another instance of GUIdancer
+ * if the po as deleted by another concurrently working user
* @return The RefTestSuite used to reference the Test Suite
*/
public static IRefTestSuitePO addReferencedTestSuite(
@@ -86,7 +86,7 @@ public class TestSuiteBP extends NodeBP {
* if the TC was modified outside this instance of the
* application.
* @throws PMObjectDeletedException
- * if the po as deleted by another instance of GUIdancer
+ * if the po as deleted by another concurrently working user
*/
private static void handleFirstReference(EditSupport editSupport,
ITestSuitePO referencedTS, boolean isReferencedByThisAction)
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/treeoperations/CollectComponentNameUsersOp.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/treeoperations/CollectComponentNameUsersOp.java
index 4f1d88839..e490a6f79 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/treeoperations/CollectComponentNameUsersOp.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/treeoperations/CollectComponentNameUsersOp.java
@@ -19,7 +19,7 @@ import org.eclipse.jubula.client.core.model.IExecTestCasePO;
import org.eclipse.jubula.client.core.model.INodePO;
import org.eclipse.jubula.client.core.utils.ITreeNodeOperation;
import org.eclipse.jubula.client.core.utils.ITreeTraverserContext;
-import org.eclipse.jubula.tools.exception.GDException;
+import org.eclipse.jubula.tools.exception.JBException;
/**
@@ -44,7 +44,7 @@ public class CollectComponentNameUsersOp
* the exception that occurred during traversal, or <code>null</code>
* if no such exception occurred.
*/
- private GDException m_exception = null;
+ private JBException m_exception = null;
/**
* Constructor
@@ -95,7 +95,7 @@ public class CollectComponentNameUsersOp
}
}
- } catch (GDException e) {
+ } catch (JBException e) {
m_exception = e;
ctx.setContinued(false);
}
@@ -113,10 +113,10 @@ public class CollectComponentNameUsersOp
/**
*
* @return the Component Name usage map.
- * @throws GDException if a <code>GDException</code> occurred during
+ * @throws JBException if a <code>JBException</code> occurred during
* traversal.
*/
- public CompNameUsageMap getUsageMap() throws GDException {
+ public CompNameUsageMap getUsageMap() throws JBException {
if (m_exception != null) {
throw m_exception;
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/classloader/CryptClassLoader.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/classloader/CryptClassLoader.java
deleted file mode 100644
index ad40ffdd1..000000000
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/classloader/CryptClassLoader.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 BREDEX GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * BREDEX GmbH - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jubula.client.core.classloader;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.DESKeySpec;
-
-/**
- * This class is no longer used.
- * It only exists to confuse hackers
- */
-
-public class CryptClassLoader extends ClassLoader {
-
- /**
- *
- */
- private static byte[] key = { (byte)0 };
-
- /**
- *
- * @param parent ClassLoader
- */
- public CryptClassLoader(ClassLoader parent) {
- super(parent);
- }
-
- /**
- *
- * @param name String
- * @return Class
- * @throws ClassNotFoundException Exception
- */
- public Class findClass(String name) throws ClassNotFoundException {
- byte[] b;
- b = loadClassData(name);
- return defineClass(name, b, 0, b.length);
- }
-
-
- /**
- * @param name String
- * @return byte[]
- * @throws ClassNotFoundException class not found
- */
- private byte[] loadClassData(String name) throws ClassNotFoundException {
- // load the class data from the connection
- SecretKeyFactory skf;
- Cipher desCipher;
- byte[] clear;
- DESKeySpec spec;
-
- String resClass = name.replace('.', '/') + ".class"; //$NON-NLS-1$
- if (getResource(resClass) == null) {
- String resCrypt = name.replace('.', '/') + ".crypt"; //$NON-NLS-1$
- InputStream is = getResourceAsStream(resCrypt);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- if (is != null) {
- byte[] b = new byte[256];
- try {
- int length;
- while ((length = is.read(b)) != (-1)) {
- bos.write(b, 0, length);
- }
- } catch (IOException e) {
- throw new ClassNotFoundException();
- }
- }
- try {
- skf = SecretKeyFactory.getInstance("DES"); //$NON-NLS-1$
-
- desCipher = Cipher.getInstance("DES/ECB/PKCS5Padding"); //$NON-NLS-1$
-
- spec = new DESKeySpec(key);
-
- SecretKey desKey = skf.generateSecret(spec);
-
- desCipher.init(Cipher.DECRYPT_MODE, desKey);
-
- clear = desCipher.doFinal(bos.toByteArray());
- } catch (NoSuchPaddingException e) {
- throw new ClassNotFoundException();
- } catch (NoSuchAlgorithmException e) {
- throw new ClassNotFoundException();
- } catch (InvalidKeyException e) {
- throw new ClassNotFoundException();
- } catch (InvalidKeySpecException e) {
- throw new ClassNotFoundException();
- } catch (BadPaddingException e) {
- throw new ClassNotFoundException();
- } catch (IllegalBlockSizeException e) {
- throw new ClassNotFoundException();
- } catch (NullPointerException e) {
- throw new ClassNotFoundException();
- }
- } else {
- clear = readClearClass(resClass);
- }
- return clear;
- }
-
- /**
- * @param resClass String
- * @return byte[]
- * @throws ClassNotFoundException Exception
- */
- private byte[] readClearClass(String resClass)
- throws ClassNotFoundException {
-
- InputStream is = getResourceAsStream(resClass);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- if (is != null) {
- byte[] b = new byte[256];
- try {
- int length;
- while ((length = is.read(b)) != (-1)) {
- bos.write(b, 0, length);
- }
- } catch (IOException e) {
- throw new ClassNotFoundException();
- }
- }
- return bos.toByteArray();
- }
-
- /**
- *
- * @param newKey String
- */
- public static void set(byte[] newKey) {
- key = newKey;
- }
-}
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 4d5fd9685..3ec7bea61 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
@@ -14,10 +14,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.AUTServerEvent;
import org.eclipse.jubula.client.core.ClientTestFactory;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.AUTModeChangedMessage;
import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.tools.constants.StringConstants;
/**
@@ -60,7 +62,7 @@ public class AUTModeChangedCommand implements ICommand {
* {@inheritDoc}
*/
public Message execute() {
- log.info("AUTServer mode changed to " //$NON-NLS-1$
+ log.info(Messages.AUTServerModeChangedTo + StringConstants.SPACE
+ String.valueOf(m_message.getMode()));
// HERE notify listener about changed 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 0e7c7660a..3d2d1ada3 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
@@ -14,10 +14,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.AUTEvent;
import org.eclipse.jubula.client.core.ClientTestFactory;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.AUTServerStateMessage;
import org.eclipse.jubula.communication.message.AUTStartMessage;
import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.tools.constants.StringConstants;
/**
@@ -66,24 +68,26 @@ public class AUTServerStateCommand implements ICommand {
switch (state) {
case AUTServerStateMessage.READY:
- log.info("AUTServer is ready"); //$NON-NLS-1$
+ log.info(Messages.AUTServerIsReady);
// State "Ready" mapped to "AUT_RESTARTED" (see JavaDoc)
ClientTestFactory.getClientTest().fireAUTStateChanged(
new AUTEvent(AUTEvent.AUT_RESTARTED));
return new AUTStartMessage();
case AUTServerStateMessage.AUT_NOT_FOUND:
- log.info("The AUT could not found. " //$NON-NLS-1$
- + m_message.getDescription());
+ log.info(Messages.TheAUTCouldNotFound + StringConstants.DOT
+ + StringConstants.SPACE + m_message.getDescription());
ClientTestFactory.getClientTest().fireAUTStateChanged(
new AUTEvent(AUTEvent.AUT_NOT_FOUND));
break;
case AUTServerStateMessage.MAIN_METHOD_NOT_FOUND:
- log.info("The main method could not loaded. "); //$NON-NLS-1$
+ log.info(Messages.TheMainMethodCouldNotLoaded
+ + StringConstants.DOT + StringConstants.SPACE);
ClientTestFactory.getClientTest().fireAUTStateChanged(
new AUTEvent(AUTEvent.AUT_MAIN_NOT_FOUND));
break;
case AUTServerStateMessage.EXIT_AUT_WRONG_CLASS_VERSION:
- log.info("AUT class format not supported by used JRE. "); //$NON-NLS-1$
+ log.info(Messages.AUTClassFormatNotSupportedByUsedJRE
+ + StringConstants.DOT + StringConstants.SPACE);
ClientTestFactory.getClientTest().fireAUTStateChanged(
new AUTEvent(AUTEvent.AUT_CLASS_VERSION_ERROR));
break;
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 fc8f31ad3..b9edddf03 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
@@ -19,6 +19,7 @@ import org.eclipse.jubula.client.core.AUTEvent;
import org.eclipse.jubula.client.core.ClientTestFactory;
import org.eclipse.jubula.client.core.IAUTInfoListener;
import org.eclipse.jubula.client.core.businessprocess.ObjectMappingEventDispatcher;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IObjectMappingCategoryPO;
import org.eclipse.jubula.client.core.model.IObjectMappingPO;
import org.eclipse.jubula.communication.ICommand;
@@ -26,6 +27,7 @@ import org.eclipse.jubula.communication.message.AUTStartStateMessage;
import org.eclipse.jubula.communication.message.AUTStateMessage;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.i18n.CompSystemI18n;
import org.eclipse.jubula.tools.objects.IComponentIdentifier;
import org.eclipse.jubula.tools.xml.businessmodell.Component;
@@ -101,13 +103,13 @@ public class AUTStartedCommand implements ICommand {
int state = m_stateMessage.getState();
switch (state) {
case AUTStateMessage.RUNNING:
- log.info("AUT is running"); //$NON-NLS-1$
+ log.info(Messages.AUTIsRunning);
ClientTestFactory.getClientTest().fireAUTStateChanged(
new AUTEvent(AUTEvent.AUT_STARTED));
break;
case AUTStateMessage.START_FAILED:
- log.error("AUT could not started: " //$NON-NLS-1$
- + m_stateMessage.getDescription());
+ log.error(Messages.AUTCouldNotStarted + StringConstants.COLON
+ + StringConstants.SPACE + m_stateMessage.getDescription());
ClientTestFactory.getClientTest().fireAUTStateChanged(
new AUTEvent(AUTEvent.AUT_START_FAILED));
break;
@@ -189,8 +191,10 @@ public class AUTStartedCommand implements ICommand {
logicalName, id);
} else {
if (log.isErrorEnabled()) {
- log.error("No logical name for default mapping " //$NON-NLS-1$
- + "defined by component: " + comp); //$NON-NLS-1$
+ log.error(Messages.NoLogicalNameForDefaultMapping
+ + StringConstants.SPACE
+ + Messages.DefinedByComponent + StringConstants.COLON
+ + StringConstants.SPACE + comp);
}
}
}
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 018f0e54f..edb08cd6d 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
@@ -18,12 +18,14 @@ import org.eclipse.jubula.client.core.IAUTInfoListener;
import org.eclipse.jubula.client.core.MessageFactory;
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.communication.AUTConnection;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.AUTStateMessage;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.SendAUTListOfSupportedComponentsMessage;
import org.eclipse.jubula.communication.message.SendCompSystemI18nMessage;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
import org.eclipse.jubula.tools.i18n.CompSystemI18n;
import org.eclipse.jubula.tools.xml.businessmodell.CompSystem;
@@ -63,17 +65,14 @@ public class AUTStateCommand implements ICommand {
public void error(int reason) {
switch (reason) {
case IAUTInfoListener.ERROR_TIMEOUT:
- log.error("timeout occured getting " + //$NON-NLS-1$
- "all components from AUT"); //$NON-NLS-1$
+ log.error(Messages.TimeoutOccuredGettingCompAUT);
break;
case IAUTInfoListener.ERROR_COMMUNICATION:
- log.error("could not request " + //$NON-NLS-1$
- "components from AUT"); //$NON-NLS-1$
+ log.error(Messages.CouldNotRequestComsFromAUT);
break;
default:
- log.fatal("unknown error reason " + //$NON-NLS-1$
- "getting all components from AUT: " //$NON-NLS-1$
- + String.valueOf(reason));
+ log.fatal(Messages.UnknownErrorGettingAllCompsAUT
+ + StringConstants.COLON + String.valueOf(reason));
}
}
@@ -129,12 +128,10 @@ public class AUTStateCommand implements ICommand {
try {
AUTConnection.getInstance().send(i18nMessage);
} catch (CommunicationException ce) {
- log.fatal("communication error while setting Resource Bundle", //$NON-NLS-1$
- ce);
+ log.fatal(Messages.CommunicationErrorSetResourceBundle, ce);
}
} catch (CommunicationException bce) {
- log.fatal("communication error while getting all components from AUT", //$NON-NLS-1$
- bce);
+ log.fatal(Messages.CommunicationErrorGetResourceBundle, bce);
}
return null;
}
@@ -143,6 +140,6 @@ public class AUTStateCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- log.info("timeout expired"); //$NON-NLS-1$
+ log.info(Messages.TimeoutExpired);
}
}
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 1b950ad93..97f3af00e 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
@@ -29,6 +29,7 @@ import org.eclipse.jubula.client.core.businessprocess.IWritableComponentNameMapp
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.businessprocess.ComponentNamesBP.CompNameCreationContext;
import org.eclipse.jubula.client.core.communication.AUTConnection;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.client.core.model.ICapPO;
import org.eclipse.jubula.client.core.model.IComponentNamePO;
@@ -63,7 +64,7 @@ import org.eclipse.jubula.tools.xml.businessmodell.Component;
/**
- * This class is used by record mode of GUIdancer. Server sends a recorded CAP,
+ * This class is used by record mode of Jubula. Server sends a recorded CAP,
* which is added to specification store. (CAP + Objectmapping)
*
* @author BREDEX GmbH
@@ -107,7 +108,7 @@ public class CAPRecordedCommand implements ICommand {
/** info Message for actions that are not supported for selected toolkit */
private String m_wrongToolkit =
- "Current Action not available for selected Toolkit. Please check project properties."; //$NON-NLS-1$
+ Messages.CurrenActionNotAvailabelForSelectedToolkit;
/**
* get name of recorded action
@@ -167,9 +168,9 @@ public class CAPRecordedCommand implements ICommand {
String extraMsg = m_extraMsg;
return new ShowRecordedActionMessage(true, recAction, extraMsg);
} catch (IllegalArgumentException e) {
- LOG.error("execute() failed!", e); //$NON-NLS-1$
+ LOG.error(Messages.ExecutedFailed, e);
} catch (CommunicationException e) {
- LOG.error("execute() failed!", e); //$NON-NLS-1$
+ LOG.error(Messages.ExecutedFailed, e);
}
return new ShowRecordedActionMessage(false);
}
@@ -234,12 +235,14 @@ public class CAPRecordedCommand implements ICommand {
} catch (IncompatibleTypeException e) {
// Should not happen, but if it does, return null to indicate that
// the cap was not created successfully.
- LOG.error("Error occurred while observing Test Step.", e); //$NON-NLS-1$
+ LOG.error(Messages.ErrorOccurredWhileObservingTestStep
+ + StringConstants.DOT, e);
return null;
} catch (PMException e) {
// Should not happen, but if it does, return null to indicate that
// the cap was not created successfully.
- LOG.error("Error occurred while observing Test Step.", e); //$NON-NLS-1$
+ LOG.error(Messages.ErrorOccurredWhileObservingTestStep
+ + StringConstants.DOT, e);
return null;
}
recSpecTestCase.addNode(recCap);
@@ -366,7 +369,6 @@ public class CAPRecordedCommand implements ICommand {
|| actionName.equals("CompSystem.VerifyProperty") //$NON-NLS-1$
|| actionName.equals("CompSystem.PopupSelectByTextPath")) { //$NON-NLS-1$
compTyp = "guidancer.abstract.Widget"; //$NON-NLS-1$
-
} else if (actionName.equals("CompSystem.InputTextDirect") //$NON-NLS-1$
|| actionName.equals("CompSystem.InputText") //$NON-NLS-1$
|| actionName.equals("CompSystem.VerifyEditable")) { //$NON-NLS-1$
@@ -524,7 +526,7 @@ public class CAPRecordedCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- LOG.error(this.getClass().getName() + "timeout() called"); //$NON-NLS-1$
+ LOG.error(this.getClass().getName() + Messages.TimeoutCalled);
}
/**
* @param r The recSpecTestCase to set.
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 f671a964b..c283f76c8 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
@@ -13,10 +13,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.businessprocess.TestExecution;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
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;
@@ -85,21 +87,30 @@ public class CAPTestResponseCommand implements ICommand {
*/
public void timeout() {
StringBuilder messageCapData =
- new StringBuilder("; MessageCap: "); //$NON-NLS-1$
+ new StringBuilder(StringConstants.SEMICOLON);
+ messageCapData.append(Messages.MessageCap);
+ messageCapData.append(StringConstants.COLON);
+ messageCapData.append(StringConstants.SPACE);
if (LOG.isErrorEnabled()) {
if (m_capTestResponseMessage != null) {
MessageCap msgCap = m_capTestResponseMessage.getMessageCap();
- messageCapData.append("Method '") //$NON-NLS-1$
+ messageCapData.append(Messages.Method)
+ .append(StringConstants.APOSTROPHE)
.append(msgCap.getMethod())
- .append("', ComponentId '") //$NON-NLS-1$
+ .append(StringConstants.APOSTROPHE)
+ .append(StringConstants.COMMA)
+ .append(StringConstants.SPACE)
+ .append(Messages.ComponentId)
+ .append(StringConstants.SPACE)
+ .append(StringConstants.APOSTROPHE)
.append(msgCap.getCi())
- .append("'"); //$NON-NLS-1$
+ .append(StringConstants.APOSTROPHE);
} else {
- messageCapData.append("null"); //$NON-NLS-1$
+ messageCapData.append(Messages.Null);
}
}
LOG.error(this.getClass().getName()
- + " timeout() called" //$NON-NLS-1$
+ + StringConstants.SPACE + Messages.TimeoutCalled
+ messageCapData.toString());
TestExecution.getInstance().timeout();
}
@@ -110,59 +121,75 @@ public class CAPTestResponseCommand implements ICommand {
*/
private void logResult() {
if (LOG.isInfoEnabled()) {
- String message = "test step result:"; //$NON-NLS-1$
+ String message = Messages.TestStepResult + StringConstants.COLON;
int state = m_capTestResponseMessage.getState();
-
switch (state) {
case CAPTestResponseMessage.TEST_OK:
- message = message + "success"; //$NON-NLS-1$
+ message = message + Messages.Success;
if (!void.class.getName().equals(
m_capTestResponseMessage.getReturnType())) {
- message = message + "\nreturn type:" //$NON-NLS-1$
- + m_capTestResponseMessage.getReturnType()
- + "\nreturn value:" //$NON-NLS-1$
- + m_capTestResponseMessage.getReturnValue();
+ message = message + StringConstants.NEWLINE
+ + Messages.ReturnType + StringConstants.SPACE
+ + m_capTestResponseMessage.getReturnType()
+ + StringConstants.NEWLINE + Messages.ReturnValue
+ + StringConstants.COLON
+ + m_capTestResponseMessage.getReturnValue();
}
break;
case CAPTestResponseMessage.TEST_FAILED:
message = message
- + "general failure\n"; //$NON-NLS-1$
+ + Messages.GeneralFailure + StringConstants.NEWLINE;
break;
case CAPTestResponseMessage.FAILURE_SECURITY:
message = message
- + "failure: missing permission\n"; //$NON-NLS-1$
+ + Messages.Failure + StringConstants.COLON
+ + StringConstants.SPACE + Messages.MissingPermission
+ + StringConstants.NEWLINE;
break;
case CAPTestResponseMessage.FAILURE_ACCESSIBILITY:
message = message
- + "failure: method not accesible\n"; //$NON-NLS-1$
+ + Messages.Failure + StringConstants.COLON
+ + StringConstants.SPACE + Messages.MethodNotAccesible
+ + StringConstants.NEWLINE;
break;
case CAPTestResponseMessage
.FAILURE_INVALID_IMPLEMENTATION_CLASS:
message = message
- + "failure: missing implementation class\n"; //$NON-NLS-1$
+ + Messages.Failure + StringConstants.COLON
+ + StringConstants.SPACE
+ + Messages.MissingImplementationClass
+ + StringConstants.NEWLINE;
break;
case CAPTestResponseMessage.FAILURE_METHOD_NOT_FOUND:
break;
case CAPTestResponseMessage.FAILURE_INVALID_PARAMETER:
- message = message
- + "failure: parameters are not valid\n"; //$NON-NLS-1$
+ message = message + Messages.Failure + StringConstants.COLON
+ + StringConstants.SPACE + Messages.parametersAreNotValid
+ + StringConstants.NEWLINE;
break;
case CAPTestResponseMessage.FAILURE_STEP_EXECUTION:
- message = message
- + "failure: implementing method " //$NON-NLS-1$
- + "has thrown an exception\n"; //$NON-NLS-1$
+ message = message + Messages.Failure + StringConstants.COLON
+ + StringConstants.SPACE
+ + Messages.ImplementingMethodHasThrownAnException
+ + StringConstants.NEWLINE;
break;
case CAPTestResponseMessage.FAILURE_UNSUPPORTED_COMPONENT:
message = message
- + "failure: component is not supported\n"; //$NON-NLS-1$
+ + Messages.Failure + StringConstants.COLON
+ + StringConstants.SPACE
+ + Messages.ComponentIsNotSupported
+ + StringConstants.NEWLINE;
break;
case CAPTestResponseMessage.FAILURE_COMPONENT_NOT_FOUND:
message = message
- + "failure: component not found\n"; //$NON-NLS-1$
+ + Messages.Failure + StringConstants.COLON
+ + StringConstants.SPACE + Messages.ComponentNotFound
+ + StringConstants.NEWLINE;
break;
default:
- message = "unknown state: " + state; //$NON-NLS-1$
+ message = Messages.UnknownState + StringConstants.COLON
+ + StringConstants.SPACE + state;
}
LOG.debug(message);
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ConnectToAutResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ConnectToAutResponseCommand.java
index 960a8551b..fcf3170f1 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ConnectToAutResponseCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ConnectToAutResponseCommand.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.ConnectToAutResponseMessage;
import org.eclipse.jubula.communication.message.Message;
@@ -58,7 +59,7 @@ public class ConnectToAutResponseCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- LOG.warn(this.getClass().getName() + " timeout() called"); //$NON-NLS-1$
+ LOG.warn(this.getClass().getName() + Messages.TimeoutCalled);
}
}
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 bced93c83..496c0fd8f 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
@@ -14,9 +14,11 @@ 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.StringConstants;
/**
@@ -74,7 +76,8 @@ public class DisconnectFromAutAgentResponseCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- log.error(this.getClass().getName() + ".timeout() called"); //$NON-NLS-1$
+ log.error(this.getClass().getName() + StringConstants.DOT
+ + Messages.TimeoutCalled);
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisplayManualTestStepResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisplayManualTestStepResponseCommand.java
index 2c187a285..a71c10afb 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisplayManualTestStepResponseCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisplayManualTestStepResponseCommand.java
@@ -11,9 +11,11 @@
package org.eclipse.jubula.client.core.commands;
import org.eclipse.jubula.client.core.businessprocess.TestExecution.ManualTestStepCmd;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.DisplayManualTestStepResponseMessage;
import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,7 +76,8 @@ public class DisplayManualTestStepResponseCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- LOG.warn(this.getClass().getName() + " timeout() called"); //$NON-NLS-1$
+ LOG.warn(this.getClass().getName() + StringConstants.SPACE
+ + 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 0e8a33b0e..7b80a6324 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
@@ -15,9 +15,11 @@ 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;
+import org.eclipse.jubula.client.core.i18n.Messages;
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;
/**
@@ -72,7 +74,8 @@ public class EndTestExecutionResponseCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- log.error(this.getClass().getName() + ".timeout() called"); //$NON-NLS-1$
+ log.error(this.getClass().getName() + StringConstants.DOT
+ + Messages.TimeoutCalled);
}
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetAutConfigMapResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetAutConfigMapResponseCommand.java
index fd71b3b04..b39edf159 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetAutConfigMapResponseCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetAutConfigMapResponseCommand.java
@@ -11,9 +11,11 @@
package org.eclipse.jubula.client.core.commands;
import org.eclipse.jubula.client.core.ClientTestFactory;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.GetAutConfigMapResponseMessage;
import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,7 +62,8 @@ public class GetAutConfigMapResponseCommand implements ICommand {
*/
public void timeout() {
- LOG.error(this.getClass().getName() + ".timeout() called"); //$NON-NLS-1$
+ LOG.error(this.getClass().getName() + StringConstants.DOT
+ + Messages.TimeoutCalled);
}
}
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 4e8026397..56ad62427 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
@@ -15,11 +15,13 @@ 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;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.GetMonitoringDataResponseMessage;
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;
@@ -49,8 +51,7 @@ public class GetMonitoringDataResponseCommand implements ICommand {
Map<String, MonitoringValue> monitoringValue =
m_message.getMonitoringValues();
if (monitoringValue == null) {
- result.setMonitoringValues(
- MonitoringConstants.EMPTY_MONITORING_VALUES);
+ result.setMonitoringValues(null);
} else {
result.setMonitoringValues(m_message.getMonitoringValues());
}
@@ -77,7 +78,8 @@ public class GetMonitoringDataResponseCommand implements ICommand {
*/
public void timeout() {
- log.error(this.getClass().getName() + ".timeout() called"); //$NON-NLS-1$
+ log.error(this.getClass().getName() + StringConstants.DOT
+ + Messages.TimeoutCalled);
}
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 d075d21bd..5bccd169a 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
@@ -14,11 +14,13 @@ 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.TestResultBP;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.TestResult;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.SendMonitoringReportMessage;
import org.eclipse.jubula.tools.constants.MonitoringConstants;
+import org.eclipse.jubula.tools.constants.StringConstants;
/**
@@ -64,7 +66,8 @@ public class GetMonitoringReportCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- LOG.error(this.getClass().getName() + ".timeout() called"); //$NON-NLS-1$
+ LOG.error(this.getClass().getName() + StringConstants.DOT
+ + Messages.TimeoutCalled);
}
}
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 ca3934074..e29eae16b 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
@@ -17,9 +17,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.businessprocess.ObjectMappingEventDispatcher;
import org.eclipse.jubula.client.core.businessprocess.TestExecution;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.ObjectMappedMessage;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.objects.IComponentIdentifier;
@@ -73,20 +75,24 @@ public class ObjectMappedCommand implements ICommand {
private void mapObject(IComponentIdentifier componentIdentifier) {
if (log.isInfoEnabled()) {
try {
- String logMessage = "mapped object '" //$NON-NLS-1$
+ String logMessage = Messages.MappedObject
+ + StringConstants.SPACE + StringConstants.APOSTROPHE
+ componentIdentifier.getComponentName()
- + "' of type '" //$NON-NLS-1$
+ + StringConstants.APOSTROPHE + StringConstants.SPACE
+ + Messages.OfType + StringConstants.SPACE
+ + StringConstants.APOSTROPHE
+ componentIdentifier.getComponentClassName()
- + "' in hierachy: "; //$NON-NLS-1$
+ + StringConstants.APOSTROPHE + StringConstants.SPACE
+ + Messages.InHierachy + StringConstants.COLON
+ + StringConstants.SPACE;
for (Iterator iter = componentIdentifier.getHierarchyNames()
.iterator(); iter.hasNext();) {
String element = (String)iter.next();
- logMessage = logMessage + element + ","; //$NON-NLS-1$
+ logMessage = logMessage + element + StringConstants.COMMA;
}
log.info(logMessage);
} catch (ClassCastException cce) {
- log.error("component identifiers does " + //$NON-NLS-1$
- "not consist of Strings"); //$NON-NLS-1$
+ log.error(Messages.ComponentIdentifiersDoes);
}
}
if (TestExecution.getInstance().getConnectedAut() != null) {
@@ -99,7 +105,7 @@ public class ObjectMappedCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- log.error(this.getClass().getName() + "timeout() called"); //$NON-NLS-1$
+ log.error(this.getClass().getName() + Messages.TimeoutCalled);
}
}
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 039941349..b5a972ffd 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
@@ -12,9 +12,11 @@ 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.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.SendDirectoryResponseMessage;
+import org.eclipse.jubula.tools.constants.StringConstants;
/**
@@ -33,7 +35,9 @@ public class ProcessDirCommand implements ICommand {
* {@inheritDoc}
*/
public Message execute() {
- log.debug("executing directory list command (response)"); //$NON-NLS-1$
+ log.debug(Messages.ExecutingDirectoryListCommand
+ + StringConstants.RIGHT_PARENTHESES + Messages.Response
+ + StringConstants.LEFT_PARENTHESES);
return null;
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/RegisteredAutListCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/RegisteredAutListCommand.java
index 46de3c9fa..61862a3b0 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/RegisteredAutListCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/RegisteredAutListCommand.java
@@ -13,9 +13,11 @@ package org.eclipse.jubula.client.core.commands;
import org.eclipse.jubula.client.core.agent.AutRegistrationEvent;
import org.eclipse.jubula.client.core.agent.IAutRegistrationListener;
import org.eclipse.jubula.client.core.agent.AutRegistrationEvent.RegistrationStatus;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.RegisteredAutListMessage;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.registration.AutIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,7 +79,8 @@ public class RegisteredAutListCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- LOG.error(this.getClass().getName() + ".timeout() called"); //$NON-NLS-1$
+ LOG.error(this.getClass().getName() + StringConstants.DOT
+ + Messages.TimeoutCalled);
}
}
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 8442232bc..668f4806e 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
@@ -13,9 +13,11 @@ 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.IServerLogListener;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.ServerLogResponseMessage;
+import org.eclipse.jubula.tools.constants.StringConstants;
/**
@@ -72,7 +74,8 @@ public class ServerLogResponseCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- log.error(this.getClass().getName() + ".timeout() called"); //$NON-NLS-1$
+ log.error(this.getClass().getName() + StringConstants.DOT
+ + Messages.TimeoutCalled);
}
}
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 d8785c385..98f28c642 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
@@ -14,9 +14,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.eclipse.jubula.client.core.AUTServerEvent;
import org.eclipse.jubula.client.core.ClientTestFactory;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.StartAUTServerStateMessage;
+import org.eclipse.jubula.tools.constants.StringConstants;
/**
@@ -57,11 +59,12 @@ public class StartAUTServerStateCommand implements ICommand {
int state = m_message.getReason();
switch (state) {
case StartAUTServerStateMessage.OK:
- log.info("AUTServer is starting"); //$NON-NLS-1$
+ log.info(Messages.AUTServerIsStarting);
break;
case StartAUTServerStateMessage.IO:
// HERE notify error listener -> closing system
- log.fatal("No Java found: " //$NON-NLS-1$
+ log.fatal(Messages.NoJavaFound + StringConstants.COLON
+ + StringConstants.SPACE
+ m_message.getDescription());
ClientTestFactory.getClientTest().fireAUTServerStateChanged(
new AUTServerEvent(AUTServerEvent.INVALID_JAVA));
@@ -72,48 +75,54 @@ public class StartAUTServerStateCommand implements ICommand {
case StartAUTServerStateMessage.INVALID_ARGUMENTS:
case StartAUTServerStateMessage.ERROR:
case StartAUTServerStateMessage.COMMUNICATION:
- log.error("AUTServer could not start: " //$NON-NLS-1$
+ log.error(Messages.AUTServerCouldNotStart
+ + StringConstants.COLON + StringConstants.SPACE
+ m_message.getDescription());
ClientTestFactory.getClientTest().fireAUTServerStateChanged(
new AUTServerEvent(AUTServerEvent.COMMUNICATION));
break;
case StartAUTServerStateMessage.AUT_MAIN_NOT_DISTINCT_IN_JAR:
case StartAUTServerStateMessage.AUT_MAIN_NOT_FOUND_IN_JAR:
- log.info("AUTServer could not start: " //$NON-NLS-1$
+ log.info(Messages.AUTServerCouldNotStart
+ + StringConstants.COLON + StringConstants.SPACE
+ m_message.getDescription());
ClientTestFactory.getClientTest().fireAUTServerStateChanged(
new AUTServerEvent(AUTServerEvent.NO_MAIN_IN_JAR));
break;
case StartAUTServerStateMessage.NO_JAR_AS_CLASSPATH:
case StartAUTServerStateMessage.SCANNING_JAR_FAILED:
- log.info("AUTServer could not start: " //$NON-NLS-1$
+ log.info(Messages.AUTServerCouldNotStart
+ + StringConstants.COLON + StringConstants.SPACE
+ m_message.getDescription());
ClientTestFactory.getClientTest().fireAUTServerStateChanged(
new AUTServerEvent(AUTServerEvent.INVALID_JAR));
break;
case StartAUTServerStateMessage.NO_SERVER_CLASS:
- log.error("AUTServer could not start: " //$NON-NLS-1$
+ log.error(Messages.AUTServerCouldNotStart
+ + StringConstants.COLON + StringConstants.SPACE
+ m_message.getDescription());
ClientTestFactory.getClientTest().fireAUTServerStateChanged(
new AUTServerEvent(AUTServerEvent.SERVER_NOT_INSTANTIATED));
break;
case StartAUTServerStateMessage.DOTNET_INSTALL_INVALID:
- log.error("AUTServer could not start: " //$NON-NLS-1$
+ log.error(Messages.AUTServerCouldNotStart
+ + StringConstants.COLON + StringConstants.SPACE
+ m_message.getDescription());
ClientTestFactory.getClientTest().fireAUTServerStateChanged(
new AUTServerEvent(AUTServerEvent.DOTNET_INSTALL_INVALID));
break;
case StartAUTServerStateMessage.JDK_INVALID:
- log.error("AUTServer could not start: " //$NON-NLS-1$
+ log.error(Messages.AUTServerCouldNotStart
+ + StringConstants.COLON + StringConstants.SPACE
+ m_message.getDescription());
ClientTestFactory.getClientTest().fireAUTServerStateChanged(
new AUTServerEvent(AUTServerEvent.JDK_INVALID));
break;
default:
- log.error("unknown state " + //$NON-NLS-1$
- String.valueOf(state)
- + ":" + m_message.getDescription()); //$NON-NLS-1$
+ log.error(Messages.UnknownState + StringConstants.SPACE
+ + String.valueOf(state)
+ + StringConstants.COLON + m_message.getDescription());
}
return null;
}
@@ -122,6 +131,7 @@ public class StartAUTServerStateCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- log.error(this.getClass().getName() + "timeout() called"); //$NON-NLS-1$
+ log.error(this.getClass().getName() + StringConstants.DOT
+ + Messages.TimeoutCalled);
}
}
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 80c102351..0602105a0 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
@@ -12,9 +12,11 @@ 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.i18n.Messages;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.StopAUTServerStateMessage;
+import org.eclipse.jubula.tools.constants.StringConstants;
/**
@@ -60,7 +62,8 @@ public class StopAUTServerStateCommand implements ICommand {
*/
public void timeout() {
m_isTimeout = true;
- log.error(this.getClass().getName() + ".timeout() called"); //$NON-NLS-1$
+ log.error(this.getClass().getName() + StringConstants.DOT
+ + Messages.TimeoutCalled);
}
/**
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 99a9c05a1..be3675e39 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
@@ -12,10 +12,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.i18n.Messages;
import org.eclipse.jubula.client.core.model.TestResultNode;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.TakeScreenshotResponseMessage;
+import org.eclipse.jubula.tools.constants.StringConstants;
/**
@@ -70,7 +72,8 @@ public class TakeScreenshotResponseCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
- log.error(this.getClass().getName() + ".timeout() called"); //$NON-NLS-1$
+ log.error(this.getClass().getName() + StringConstants.DOT
+ + Messages.TimeoutCalled);
}
}
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 e3e53dab5..6fc0089a3 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
@@ -26,6 +26,7 @@ import org.eclipse.jubula.client.core.agent.AutAgentRegistration;
import org.eclipse.jubula.client.core.commands.ConnectToAutResponseCommand;
import org.eclipse.jubula.client.core.events.DataEventDispatcher;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.ServerState;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.client.core.model.IObjectMappingProfilePO;
import org.eclipse.jubula.client.core.persistence.GeneralStorage;
@@ -34,8 +35,9 @@ import org.eclipse.jubula.communication.listener.ICommunicationErrorListener;
import org.eclipse.jubula.communication.message.ConnectToAutMessage;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.SendCompSystemI18nMessage;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
-import org.eclipse.jubula.tools.exception.GDVersionException;
+import org.eclipse.jubula.tools.exception.JBVersionException;
import org.eclipse.jubula.tools.i18n.CompSystemI18n;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.registration.AutIdentifier;
@@ -107,11 +109,12 @@ public class AUTConnection extends BaseConnection {
* @param throwable
* the occured exception
* @throws ConnectionException
- * a GuiDancerConnectionException containing a detailed message
+ * a ConnectionException containing a detailed message
*/
private void handleInitError(Throwable throwable)
throws ConnectionException {
- String message = "initialisation of AUTConnection failed: "; //$NON-NLS-1$
+ String message = Messages.InitialisationOfAUTConnectionFailed
+ + StringConstants.COLON + StringConstants.SPACE;
log.fatal(message, throwable);
throw new ConnectionException(message + throwable.getMessage(),
MessageIDs.E_AUT_CONNECTION_INIT);
@@ -169,16 +172,15 @@ public class AUTConnection extends BaseConnection {
* @return <code>true</code> if a connection to the AUT could be
* established. Otherwise <code>false</code>.
*/
- public boolean connectToAut(AutIdentifier autId,
+ public boolean connectToAut(AutIdentifier autId,
IProgressMonitor monitor) {
if (!isConnected()) {
DataEventDispatcher.getInstance().fireAutServerConnectionChanged(
ServerState.Connecting);
try {
- monitor.beginTask("Connecting to AUT", //$NON-NLS-1$
+ monitor.beginTask(Messages.ConnectingToAUT,
IProgressMonitor.UNKNOWN);
- log.info("Establishing connection to AUT..."); //$NON-NLS-1$
-
+ log.info(Messages.EstablishingConnectionToAUT);
run();
getCommunicator().addCommunicationErrorListener(
m_autConnectionListener);
@@ -200,8 +202,7 @@ public class AUTConnection extends BaseConnection {
}
long timeout = 10000;
long startTime = System.currentTimeMillis();
- while (!monitor.isCanceled()
- && !isConnected()
+ while (!monitor.isCanceled() && !isConnected()
&& ServerConnection.getInstance().isConnected()
&& startTime + timeout > System.currentTimeMillis()) {
try {
@@ -211,35 +212,37 @@ public class AUTConnection extends BaseConnection {
// again on the next loop iteration.
}
}
-
if (isConnected()) {
m_connectedAutId = autId;
- log.info("Connection to AUT established."); //$NON-NLS-1$
+ log.info(Messages.ConnectionToAUTEstablished
+ + StringConstants.DOT);
IAUTMainPO aut = AutAgentRegistration.getAutForId(autId,
GeneralStorage.getInstance().getProject());
if (aut != null) {
getComponentsFromAut(aut);
sendResourceBundlesToAut();
} else {
- log.warn("Error occurred while activating Object Mapping Profile for Running AUT. No such AUT was found in the curent project."); //$NON-NLS-1$
+ log.warn(Messages.ErrorOccurredActivatingObjectMapping);
}
return true;
}
-
- log.error("Connection to AUT could not be established."); //$NON-NLS-1$
+ log.error(Messages.ConnectionToAUTCouldNotBeEstablished
+ + StringConstants.DOT);
} catch (CommunicationException e) {
- log.error("Error occurred while establishing connection to AUT.", e); //$NON-NLS-1$
+ log.error(Messages.ErrorOccurredEstablishingConnectionToAUT
+ + StringConstants.DOT, e);
} catch (UnknownHostException e) {
- log.error("Error occurred while establishing connection to AUT.", e); //$NON-NLS-1$
- } catch (GDVersionException e) {
- log.error("Error occurred while establishing connection to AUT.", e); //$NON-NLS-1$
+ log.error(Messages.ErrorOccurredEstablishingConnectionToAUT
+ + StringConstants.DOT, e);
+ } catch (JBVersionException e) {
+ log.error(Messages.ErrorOccurredEstablishingConnectionToAUT
+ + StringConstants.DOT, e);
} finally {
monitor.done();
}
} else {
- log.warn("Cannot establish new connection to AUT: Connection to AUT already exists."); //$NON-NLS-1$
- }
-
+ log.warn(Messages.CannotEstablishNewConnectionToAUT);
+ }
DataEventDispatcher.getInstance()
.fireAutServerConnectionChanged(
ServerState.Disconnected);
@@ -257,8 +260,8 @@ public class AUTConnection extends BaseConnection {
try {
send(i18nMessage);
} catch (CommunicationException ce) {
- log.fatal("communication error while setting Resource Bundle", //$NON-NLS-1$
- ce);
+ log.fatal(Messages.CommunicationErrorWhileSettingResourceBundle,
+ ce);
}
}
@@ -280,7 +283,9 @@ public class AUTConnection extends BaseConnection {
IAUTInfoListener listener = new IAUTInfoListener() {
public void error(int reason) {
- log.error("Error occurred while getting components from AUT. Error code: " + reason); //$NON-NLS-1$
+ log.error(Messages.ErrorOccurredWhileGettingComponentsFromAUT
+ + StringConstants.COLON + StringConstants.SPACE
+ + reason);
}
};
@@ -303,13 +308,12 @@ public class AUTConnection extends BaseConnection {
public void connectionGained(InetAddress inetAddress, int port) {
if (log.isInfoEnabled()) {
try {
- String logMessage = "connected to " //$NON-NLS-1$
+ String logMessage = Messages.ConnectedTo
+ inetAddress.getHostName()
- + ":" + String.valueOf(port); //$NON-NLS-1$
+ + StringConstants.COLON + String.valueOf(port);
log.info(logMessage);
} catch (SecurityException se) {
- log.debug("security violation while getting " //$NON-NLS-1$
- + "the host name from ip address"); //$NON-NLS-1$
+ log.debug(Messages.SecurityViolationGettingHostNameFromIP);
}
}
ClientTestFactory.getClientTest().
@@ -322,8 +326,8 @@ public class AUTConnection extends BaseConnection {
*/
public void shutDown() {
if (log.isInfoEnabled()) {
- log.info("connection to AUTServer closed"); //$NON-NLS-1$
- log.info("closing connection to the AutStarter"); //$NON-NLS-1$
+ log.info(Messages.ConnectionToAUTServerClosed);
+ log.info(Messages.ClosingConnectionToTheAutStarter);
}
disconnectFromAut();
DataEventDispatcher.getInstance().fireAutServerConnectionChanged(
@@ -342,9 +346,9 @@ public class AUTConnection extends BaseConnection {
* {@inheritDoc}
*/
public void sendFailed(Message message) {
- log.error("sending message failed:" //$NON-NLS-1$
+ log.error(Messages.SendingMessageFailed + StringConstants.COLON
+ message.toString());
- log.error("closing connection to the AUTServer"); //$NON-NLS-1$
+ log.error(Messages.ClosingConnectionToTheAUTServer);
close();
}
@@ -352,7 +356,8 @@ public class AUTConnection extends BaseConnection {
* {@inheritDoc}
*/
public void acceptingFailed(int port) {
- log.warn("accepting failed:" + String.valueOf(port)); //$NON-NLS-1$
+ log.warn(Messages.AcceptingFailed + StringConstants.COLON
+ + String.valueOf(port));
}
/**
@@ -360,7 +365,13 @@ public class AUTConnection extends BaseConnection {
* int)
*/
public void connectingFailed(InetAddress inetAddress, int port) {
- log.error("connectingFailed() called although this is a 'server'"); //$NON-NLS-1$
+ StringBuilder msg = new StringBuilder();
+ msg.append(Messages.ConnectingFailed);
+ msg.append(StringConstants.LEFT_PARENTHESES);
+ msg.append(StringConstants.RIGHT_PARENTHESES);
+ msg.append(StringConstants.SPACE);
+ msg.append(Messages.CalledAlthoughThisIsServer);
+ log.error(msg.toString());
}
}
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 f509b4c33..092e40b56 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
@@ -14,12 +14,14 @@ import java.net.InetAddress;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.communication.Communicator;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.listener.ICommunicationErrorListener;
import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
-import org.eclipse.jubula.tools.exception.GDVersionException;
+import org.eclipse.jubula.tools.exception.JBVersionException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
@@ -68,7 +70,7 @@ public abstract class BaseConnection {
// check paramater
if (communicator == null) {
throw new IllegalArgumentException(
- "communicator must not be null"); //$NON-NLS-1$
+ Messages.CommunicatorMustNotBeNull);
}
m_communicator = communicator;
// add an private listener for monitoring connection state
@@ -79,25 +81,28 @@ public abstract class BaseConnection {
/**
* synchronized method for starting the communication.
*
- * @throws GuiDancerAlreadyConnectedException
+ * @throws AlreadyConnectedException
* if this connection is laready connected.
- * @throws GDVersionException in case of version error between Client
+ * @throws JBVersionException in case of version error between Client
* and AutStarter
*/
- public synchronized void run() throws GuiDancerAlreadyConnectedException,
- GDVersionException {
+ public synchronized void run() throws AlreadyConnectedException,
+ JBVersionException {
if (isConnected()) {
- log.error("run() called to an already connected connection"); //$NON-NLS-1$
- throw new GuiDancerAlreadyConnectedException(
- "This connection is already connected", //$NON-NLS-1$
+ log.error(Messages.RunCalledToAnAlreadyConnectedConnection);
+ throw new AlreadyConnectedException(
+ Messages.ThisConnectionIsAlreadyConnected,
MessageIDs.E_CONNECTED_CONNECTION);
}
m_communicator.run();
if (log.isDebugEnabled()) {
- log.debug(this.getClass().getName() + ": Connection established on port: " //$NON-NLS-1$
- + getCommunicator().getPort() + " and local port: " //$NON-NLS-1$
- + getCommunicator().getLocalPort());
+ log.debug(this.getClass().getName() + StringConstants.COLON
+ + StringConstants.SPACE + Messages.ConnectionEstablishedOnPort
+ + StringConstants.COLON + StringConstants.SPACE
+ + getCommunicator().getPort() + StringConstants.SPACE
+ + Messages.AndLocalPort + StringConstants.COLON
+ + StringConstants.SPACE + getCommunicator().getLocalPort());
}
}
@@ -110,18 +115,18 @@ public abstract class BaseConnection {
* if Message is null
* @throws CommunicationException
* when the message could not send
- * @throws GuiDancerNotConnectedException
+ * @throws NotConnectedException
* when no connection is availiable either not yet set or lost
* {@inheritDoc}
*/
public synchronized void send(Message message)
throws IllegalArgumentException,
- GuiDancerNotConnectedException, CommunicationException {
+ NotConnectedException, CommunicationException {
if (!isConnected()) {
if (log.isWarnEnabled()) {
log.warn("send() called to an unconnected connection"); //$NON-NLS-1$
}
- throw new GuiDancerNotConnectedException(
+ throw new NotConnectedException(
"This connection is not connected", //$NON-NLS-1$
MessageIDs.E_UNCONNECTED_CONNECTION);
}
@@ -143,18 +148,18 @@ public abstract class BaseConnection {
* @param timeout -
* max milliseconds to wait for a response. Only values greater than
* zero are valid.
- * @throws G