Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.app.autagent/src/org/eclipse/jubula/app/autagent/AutAgentApplication.java2
-rw-r--r--org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java4
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java14
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java18
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutAutRun.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutConfiguration.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ConnectToAutCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisconnectFromAutAgentCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisplayManualTestStepCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetAutConfigMapCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetRegisteredAutListCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java4
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RestartAutCommand.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendDirectoryCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendServerLogCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowDialogCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowObservConsoleCommand.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowRecordedActionCommand.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StopAUTServerCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java8
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/GetMonitoringDataCommand.java10
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/ResetMonitoringDataCommand.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java12
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/AskCommand.java4
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/AskMessage.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/ResponseCommand.java4
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/ResponseMessage.java2
-rw-r--r--org.eclipse.jubula.client.api.commands/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java6
-rw-r--r--org.eclipse.jubula.client.api.commands/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java6
-rw-r--r--org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/AutAgentConnection.java2
-rw-r--r--org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/BaseConnection.java8
-rw-r--r--org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java22
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutAgentRegistration.java2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java28
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTHighlightComponentCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTModeChangedCommand.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTServerStateCommand.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStartedCommand.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java16
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPTestResponseCommand.java8
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ConnectToAutResponseCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisconnectFromAutAgentResponseCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisplayManualTestStepResponseCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/EndTestExecutionResponseCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetAutConfigMapResponseCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetKeyboardLayoutNameResponseCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringDataResponseCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringReportCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ObjectMappedCommand.java6
-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.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ServerLogResponseCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StopAUTServerStateCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/TakeScreenshotResponseCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/WindowTitlesChangedCommand.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java18
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/MessageFactory.java22
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/IServerLogListener.java2
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/ActivateInspectorResponseCommand.java6
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java6
-rw-r--r--org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/ActivateInspectorHandler.java2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/HandleRemoteFileBrowsing.java6
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/RemoteFileBrowserBP.java8
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowServerLogBP.java4
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionContributor.java2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionGUIController.java8
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/HighlightInAUTHandler.java4
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/html/OMChooseWindow.java2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/open/ShowServerLogHandler.java2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/utils/RemoteFileStore.java2
-rw-r--r--org.eclipse.jubula.communication/META-INF/MANIFEST.MF20
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/APICommand.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/APICommand.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/AbortingExceptionHandler.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/AbortingExceptionHandler.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/CommandFactory.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/CommandFactory.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/Communicator.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/Communicator.java)24
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/ConfigurableLogger.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/ConfigurableLogger.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/ICommand.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/ICommand.java)4
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/IConnectionInitializer.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/IConnectionInitializer.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/IExceptionHandler.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/IExceptionHandler.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/UnknownCommandException.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/UnknownCommandException.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/commands/SetCompSystemI18nCommand.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/commands/SetCompSystemI18nCommand.java)8
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/Connection.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/Connection.java)18
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/ConnectionState.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/ConnectionState.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/DefaultClientSocket.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/DefaultClientSocket.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/DefaultServerSocket.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/DefaultServerSocket.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/DefaultSocket.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/DefaultSocket.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/RestartAutProtocol.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/RestartAutProtocol.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/UnexpectedEofException.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/UnexpectedEofException.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/listener/ICommunicationErrorListener.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/listener/ICommunicationErrorListener.java)4
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/listener/IErrorHandler.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/listener/IErrorHandler.java)4
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/listener/IMessageHandler.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/listener/IMessageHandler.java)4
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTHighlightComponentMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTHighlightComponentMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTHighlightComponentResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTHighlightComponentResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTModeChangedMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTModeChangedMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTServerStateMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTServerStateMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTStartMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTStartMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTStartStateMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTStartStateMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTStateMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTStateMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ActivateInspectorMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ActivateInspectorMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ActivateInspectorResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ActivateInspectorResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AutRegisteredMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AutRegisteredMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/BuildMonitoringReportMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/BuildMonitoringReportMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/CAPRecordedMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPRecordedMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/CAPTestMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPTestMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/CAPTestResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPTestResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ChangeAUTModeMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ChangeAUTModeMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ConnectToAutMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ConnectToAutMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ConnectToAutResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ConnectToAutResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ConnectToClientMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ConnectToClientMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisconnectFromAutAgentMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisconnectFromAutAgentMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisconnectFromAutAgentResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisconnectFromAutAgentResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisplayManualTestStepMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisplayManualTestStepMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisplayManualTestStepResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisplayManualTestStepResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/EndTestExecutionMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/EndTestExecutionMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/EndTestExecutionResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/EndTestExecutionResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetAutConfigMapMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetAutConfigMapMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetAutConfigMapResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetAutConfigMapResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetKeyboardLayoutNameMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetKeyboardLayoutNameMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetKeyboardLayoutNameResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetKeyboardLayoutNameResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetMonitoringDataMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetMonitoringDataMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetMonitoringDataResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetMonitoringDataResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetRegisteredAutListMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetRegisteredAutListMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/InitTestExecutionMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/InitTestExecutionMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/InspectorComponentSelectedMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/InspectorComponentSelectedMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/Message.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/Message.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageCap.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageCap.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageHeader.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageHeader.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageIdentifier.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageIdentifier.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageParam.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageParam.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/NullMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/NullMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ObjectMappedMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ObjectMappedMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/PrepareForShutdownMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/PrepareForShutdownMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/RecordActionMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/RecordActionMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/RegisteredAutListMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/RegisteredAutListMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ResetMonitoringDataMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ResetMonitoringDataMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/RestartAutMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/RestartAutMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendAUTListOfSupportedComponentsMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendAUTListOfSupportedComponentsMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendCompSystemI18nMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendCompSystemI18nMessage.java)4
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendDirectoryMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendDirectoryMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendDirectoryResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendDirectoryResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendMonitoringReportMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendMonitoringReportMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendServerLogMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendServerLogMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerLogResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerLogResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerShowDialogMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerShowDialogResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerShowObservConsoleMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowObservConsoleMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SetKeyboardLayoutMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SetKeyboardLayoutMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ShowObservInfoMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowObservInfoMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ShowRecordedActionMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowRecordedActionMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StartAUTServerMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StartAUTServerStateMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerStateMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StopAUTServerMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StopAUTServerStateMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerStateMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/TakeScreenshotMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/TakeScreenshotMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/TakeScreenshotResponseMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/TakeScreenshotResponseMessage.java)2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/html/CAPHtmlTestMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/html/CAPHtmlTestMessage.java)6
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/html/OMSelectWindowMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/html/OMSelectWindowMessage.java)4
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/html/WindowTitlesMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/html/WindowTitlesMessage.java)4
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/javafx/CAPJavaFXTestMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/javafx/CAPJavaFXTestMessage.java)6
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/swing/CAPSwingTestMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/swing/CAPSwingTestMessage.java)6
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/swt/CAPSwtTestMessage.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/swt/CAPSwtTestMessage.java)6
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/parser/MessageHeaderSerializer.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/parser/MessageHeaderSerializer.java)4
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/parser/MessageSerializer.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/parser/MessageSerializer.java)6
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/writer/MessageWriter.java (renamed from org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/writer/MessageWriter.java)2
-rw-r--r--org.eclipse.jubula.launch/src/org/eclipse/jubula/launch/AutLaunchUtils.java2
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java12
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTHighlightComponentCommand.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTStartCommand.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractCapTestCommand.java14
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ActivateInspectorCommand.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ChangeAUTModeCommand.java12
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ConnectToClientCommand.java6
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/EndTestExecutionCommand.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/GetKeyboardLayoutNameCommand.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/InitTestExecutionCommand.java6
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/MethodInvoker.java4
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/MethodParams.java2
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/NullCommand.java6
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/PrepareForShutdownCommand.java18
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/SendAUTListOfSupportedComponentsCommand.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ShowDialogResultCommand.java10
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/TakeScreenshotCommand.java8
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/MethodParamException.java2
-rw-r--r--org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/registration/AgentRegisterAut.java6
-rw-r--r--org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/listener/MappingListener.java2
-rw-r--r--org.eclipse.jubula.rc.rcp.common/META-INF/MANIFEST.MF4
-rw-r--r--org.eclipse.jubula.rc.rcp.e3/src/org/eclipse/jubula/rc/rcp/e3/gef/inspector/GefInspectorListenerAppender.java2
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/AbstractAutSwingEventListener.java4
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/CheckListener.java4
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/ComponentHandler.java2
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/MappingListener.java2
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordActions.java10
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordListener.java2
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/SetKeyboardLayoutCommand.java6
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractAutSwtEventListener.java2
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java4
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/ComponentHandler.java2
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/MappingListener.java2
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordActionsSWT.java10
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java2
211 files changed, 526 insertions, 526 deletions
diff --git a/org.eclipse.jubula.app.autagent/src/org/eclipse/jubula/app/autagent/AutAgentApplication.java b/org.eclipse.jubula.app.autagent/src/org/eclipse/jubula/app/autagent/AutAgentApplication.java
index 8df659289..5f3b24728 100644
--- a/org.eclipse.jubula.app.autagent/src/org/eclipse/jubula/app/autagent/AutAgentApplication.java
+++ b/org.eclipse.jubula.app.autagent/src/org/eclipse/jubula/app/autagent/AutAgentApplication.java
@@ -38,7 +38,7 @@ import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.autagent.AutStarter.Verbosity;
import org.eclipse.jubula.autagent.agent.AutAgent;
import org.eclipse.jubula.autagent.desktop.DesktopIntegration;
-import org.eclipse.jubula.communication.connection.ConnectionState;
+import org.eclipse.jubula.communication.internal.connection.ConnectionState;
import org.eclipse.jubula.tools.internal.constants.EnvConstants;
import org.eclipse.jubula.tools.internal.exception.JBVersionException;
import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils;
diff --git a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java
index 842298caf..58e70d587 100644
--- a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java
+++ b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java
@@ -22,8 +22,8 @@ import java.util.Map;
import org.eclipse.jubula.app.autrun.i18n.Messages;
import org.eclipse.jubula.autagent.commands.IStartAut;
-import org.eclipse.jubula.communication.connection.ConnectionState;
-import org.eclipse.jubula.communication.connection.RestartAutProtocol;
+import org.eclipse.jubula.communication.internal.connection.ConnectionState;
+import org.eclipse.jubula.communication.internal.connection.RestartAutProtocol;
import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
import org.eclipse.jubula.tools.internal.registration.AutIdentifier;
import org.slf4j.Logger;
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 61cc1629e..892ed7b71 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
@@ -28,13 +28,13 @@ import javax.swing.UnsupportedLookAndFeelException;
import org.eclipse.jubula.autagent.agent.AutAgent;
import org.eclipse.jubula.autagent.remote.dialogs.ChooseCheckModeDialogBP;
import org.eclipse.jubula.autagent.remote.dialogs.ObservationConsoleBP;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.IConnectionInitializer;
-import org.eclipse.jubula.communication.connection.ConnectionState;
-import org.eclipse.jubula.communication.listener.ICommunicationErrorListener;
-import org.eclipse.jubula.communication.message.AutRegisteredMessage;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.StartAUTServerStateMessage;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.IConnectionInitializer;
+import org.eclipse.jubula.communication.internal.connection.ConnectionState;
+import org.eclipse.jubula.communication.internal.listener.ICommunicationErrorListener;
+import org.eclipse.jubula.communication.internal.message.AutRegisteredMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerStateMessage;
import org.eclipse.jubula.tools.internal.constants.AUTServerExitConstants;
import org.eclipse.jubula.tools.internal.constants.AUTStartResponse;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
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 9dff22bb4..39207f779 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
@@ -27,15 +27,15 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.IConnectionInitializer;
-import org.eclipse.jubula.communication.connection.ConnectionState;
-import org.eclipse.jubula.communication.listener.ICommunicationErrorListener;
-import org.eclipse.jubula.communication.message.ConnectToAutResponseMessage;
-import org.eclipse.jubula.communication.message.ConnectToClientMessage;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.PrepareForShutdownMessage;
-import org.eclipse.jubula.communication.message.StartAUTServerMessage;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.IConnectionInitializer;
+import org.eclipse.jubula.communication.internal.connection.ConnectionState;
+import org.eclipse.jubula.communication.internal.listener.ICommunicationErrorListener;
+import org.eclipse.jubula.communication.internal.message.ConnectToAutResponseMessage;
+import org.eclipse.jubula.communication.internal.message.ConnectToClientMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.PrepareForShutdownMessage;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerMessage;
import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
import org.eclipse.jubula.tools.internal.constants.EnvConstants;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutAutRun.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutAutRun.java
index d55ca884a..6c961f91f 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutAutRun.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutAutRun.java
@@ -15,7 +15,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.net.Socket;
-import org.eclipse.jubula.communication.connection.RestartAutProtocol;
+import org.eclipse.jubula.communication.internal.connection.RestartAutProtocol;
import org.eclipse.jubula.tools.internal.registration.AutIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutConfiguration.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutConfiguration.java
index 190c88455..4af931404 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutConfiguration.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutConfiguration.java
@@ -11,7 +11,7 @@
package org.eclipse.jubula.autagent.agent;
import org.eclipse.jubula.autagent.commands.StartAUTServerCommand;
-import org.eclipse.jubula.communication.message.StartAUTServerMessage;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerMessage;
import org.eclipse.jubula.tools.internal.registration.AutIdentifier;
/**
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 fdec9308c..0c02ce69e 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
@@ -27,7 +27,7 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.jubula.autagent.monitoring.IMonitoring;
import org.eclipse.jubula.autagent.monitoring.MonitoringDataStore;
import org.eclipse.jubula.autagent.monitoring.MonitoringUtil;
-import org.eclipse.jubula.communication.message.StartAUTServerStateMessage;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerStateMessage;
import org.eclipse.jubula.tools.internal.constants.AUTStartResponse;
import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
index a06292043..0ad96b8db 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
@@ -21,7 +21,7 @@ import java.util.Vector;
import org.apache.commons.lang.LocaleUtils;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jubula.autagent.AutStarter;
-import org.eclipse.jubula.communication.Communicator;
+import org.eclipse.jubula.communication.internal.Communicator;
import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java
index 55253eb70..ac6a6c70e 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java
@@ -27,7 +27,7 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.autagent.monitoring.MonitoringDataStore;
import org.eclipse.jubula.autagent.monitoring.MonitoringUtil;
-import org.eclipse.jubula.communication.message.StartAUTServerStateMessage;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerStateMessage;
import org.eclipse.jubula.tools.internal.constants.AUTStartResponse;
import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
import org.eclipse.jubula.tools.internal.constants.AutEnvironmentConstants;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ConnectToAutCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ConnectToAutCommand.java
index bd590db38..cb49c351a 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ConnectToAutCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ConnectToAutCommand.java
@@ -13,10 +13,10 @@ package org.eclipse.jubula.autagent.commands;
import org.apache.commons.lang.Validate;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.autagent.agent.AutAgent;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.ConnectToAutMessage;
-import org.eclipse.jubula.communication.message.ConnectToAutResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.ConnectToAutMessage;
+import org.eclipse.jubula.communication.internal.message.ConnectToAutResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisconnectFromAutAgentCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisconnectFromAutAgentCommand.java
index 7d5ea8312..50f33b8c5 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisconnectFromAutAgentCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisconnectFromAutAgentCommand.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.commands;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.DisconnectFromAutAgentMessage;
-import org.eclipse.jubula.communication.message.DisconnectFromAutAgentResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.DisconnectFromAutAgentMessage;
+import org.eclipse.jubula.communication.internal.message.DisconnectFromAutAgentResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisplayManualTestStepCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisplayManualTestStepCommand.java
index 8bd6b4866..c204dd47e 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisplayManualTestStepCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/DisplayManualTestStepCommand.java
@@ -12,10 +12,10 @@ package org.eclipse.jubula.autagent.commands;
import org.eclipse.jubula.autagent.gui.ManualTestStepOptionPane;
import org.eclipse.jubula.autagent.gui.ManualTestStepOptionPane.ManualTestStepResult;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.DisplayManualTestStepMessage;
-import org.eclipse.jubula.communication.message.DisplayManualTestStepResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.DisplayManualTestStepMessage;
+import org.eclipse.jubula.communication.internal.message.DisplayManualTestStepResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetAutConfigMapCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetAutConfigMapCommand.java
index 2f05ef256..3465f463b 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetAutConfigMapCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetAutConfigMapCommand.java
@@ -13,10 +13,10 @@ package org.eclipse.jubula.autagent.commands;
import java.util.Map;
import org.eclipse.jubula.autagent.monitoring.MonitoringDataStore;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.GetAutConfigMapMessage;
-import org.eclipse.jubula.communication.message.GetAutConfigMapResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.GetAutConfigMapMessage;
+import org.eclipse.jubula.communication.internal.message.GetAutConfigMapResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetRegisteredAutListCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetRegisteredAutListCommand.java
index 8dbd4e2a9..ea2a0ba7b 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetRegisteredAutListCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetRegisteredAutListCommand.java
@@ -14,10 +14,10 @@ import java.util.Collection;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.autagent.agent.AutAgent;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.GetRegisteredAutListMessage;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.RegisteredAutListMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.GetRegisteredAutListMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.RegisteredAutListMessage;
import org.eclipse.jubula.tools.internal.registration.AutIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java
index 436ed0b0c..9230d134e 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java
@@ -13,8 +13,8 @@ package org.eclipse.jubula.autagent.commands;
import java.io.IOException;
import java.util.Map;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.StartAUTServerStateMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerStateMessage;
import org.eclipse.jubula.tools.internal.constants.AUTStartResponse;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java
index 8a6444c8f..fcd820ed2 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java
@@ -11,10 +11,10 @@
package org.eclipse.jubula.autagent.commands;
import org.eclipse.jubula.autagent.AutStarter;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.CAPRecordedMessage;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.RecordActionMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.CAPRecordedMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.RecordActionMessage;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RestartAutCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RestartAutCommand.java
index 3bedf9cc1..f2434eb81 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RestartAutCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RestartAutCommand.java
@@ -14,9 +14,9 @@ import org.apache.commons.lang.StringUtils;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.autagent.monitoring.IMonitoring;
import org.eclipse.jubula.autagent.monitoring.MonitoringDataStore;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.RestartAutMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.RestartAutMessage;
import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
import org.eclipse.jubula.tools.internal.registration.AutIdentifier;
import org.slf4j.Logger;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendDirectoryCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendDirectoryCommand.java
index 623df270e..050b954d3 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendDirectoryCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendDirectoryCommand.java
@@ -12,10 +12,10 @@ package org.eclipse.jubula.autagent.commands;
import java.io.File;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.SendDirectoryMessage;
-import org.eclipse.jubula.communication.message.SendDirectoryResponseMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.SendDirectoryMessage;
+import org.eclipse.jubula.communication.internal.message.SendDirectoryResponseMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendServerLogCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendServerLogCommand.java
index 5db3fc76f..45b7ce6d5 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendServerLogCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/SendServerLogCommand.java
@@ -17,10 +17,10 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.Iterator;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.SendServerLogMessage;
-import org.eclipse.jubula.communication.message.ServerLogResponseMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.SendServerLogMessage;
+import org.eclipse.jubula.communication.internal.message.ServerLogResponseMessage;
import org.slf4j.LoggerFactory;
import ch.qos.logback.classic.Logger;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowDialogCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowDialogCommand.java
index b4d11fdf6..a5bf70363 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowDialogCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowDialogCommand.java
@@ -11,10 +11,10 @@
package org.eclipse.jubula.autagent.commands;
import org.eclipse.jubula.autagent.remote.dialogs.ChooseCheckModeDialogBP;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.ServerShowDialogMessage;
-import org.eclipse.jubula.communication.message.ServerShowDialogResponseMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.ServerShowDialogMessage;
+import org.eclipse.jubula.communication.internal.message.ServerShowDialogResponseMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowObservConsoleCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowObservConsoleCommand.java
index 996f7957a..aed0c13d2 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowObservConsoleCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ServerShowObservConsoleCommand.java
@@ -11,9 +11,9 @@
package org.eclipse.jubula.autagent.commands;
import org.eclipse.jubula.autagent.remote.dialogs.ObservationConsoleBP;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.ServerShowObservConsoleMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.ServerShowObservConsoleMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java
index 8d6a85105..e1d16addc 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java
@@ -11,9 +11,9 @@
package org.eclipse.jubula.autagent.commands;
import org.eclipse.jubula.autagent.remote.dialogs.ObservationConsoleBP;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.ShowObservInfoMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.ShowObservInfoMessage;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowRecordedActionCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowRecordedActionCommand.java
index 595bc18e9..18a852391 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowRecordedActionCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowRecordedActionCommand.java
@@ -12,9 +12,9 @@ package org.eclipse.jubula.autagent.commands;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jubula.autagent.remote.dialogs.ObservationConsoleBP;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.ShowRecordedActionMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.ShowRecordedActionMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 2a652d190..66a351ba7 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
@@ -13,10 +13,10 @@ package org.eclipse.jubula.autagent.commands;
import java.io.IOException;
import org.eclipse.jubula.autagent.AutStarter;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.StartAUTServerMessage;
-import org.eclipse.jubula.communication.message.StartAUTServerStateMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerMessage;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerStateMessage;
import org.eclipse.jubula.tools.internal.constants.AUTStartResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StopAUTServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StopAUTServerCommand.java
index 749bdf65e..ba150c1bf 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StopAUTServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StopAUTServerCommand.java
@@ -12,10 +12,10 @@ package org.eclipse.jubula.autagent.commands;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.autagent.agent.AutAgent;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.StopAUTServerMessage;
-import org.eclipse.jubula.communication.message.StopAUTServerStateMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.StopAUTServerMessage;
+import org.eclipse.jubula.communication.internal.message.StopAUTServerStateMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 618f6d27d..dfb37cbe7 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
@@ -17,10 +17,10 @@ import java.net.Socket;
import java.net.SocketTimeoutException;
import org.eclipse.jubula.autagent.AutStarter;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.BuildMonitoringReportMessage;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.SendMonitoringReportMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.BuildMonitoringReportMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.SendMonitoringReportMessage;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 f059bffe4..a1d6e0b45 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
@@ -13,11 +13,11 @@ package org.eclipse.jubula.autagent.monitoring;
import java.util.Map;
import org.eclipse.jubula.autagent.AutStarter;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.GetMonitoringDataMessage;
-import org.eclipse.jubula.communication.message.GetMonitoringDataResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.GetMonitoringDataMessage;
+import org.eclipse.jubula.communication.internal.message.GetMonitoringDataResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
import org.eclipse.jubula.tools.internal.objects.IMonitoringValue;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/ResetMonitoringDataCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/ResetMonitoringDataCommand.java
index 0376cd63b..30ecb1c01 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/ResetMonitoringDataCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/ResetMonitoringDataCommand.java
@@ -10,9 +10,9 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.monitoring;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.ResetMonitoringDataMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.ResetMonitoringDataMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
index 05b1f8e58..7bbfe1b57 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
@@ -28,12 +28,12 @@ import java.util.Map;
import javax.swing.JTextField;
import org.eclipse.jubula.autagent.AutStarter;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.message.CAPRecordedMessage;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
-import org.eclipse.jubula.communication.message.MessageCap;
-import org.eclipse.jubula.communication.message.MessageParam;
-import org.eclipse.jubula.communication.message.ServerShowDialogResponseMessage;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.message.CAPRecordedMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.MessageParam;
+import org.eclipse.jubula.communication.internal.message.ServerShowDialogResponseMessage;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/AskCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/AskCommand.java
index 5565582aa..272ac1978 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/AskCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/AskCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.test;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
/**
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/AskMessage.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/AskMessage.java
index d81cc3594..0595b4d92 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/AskMessage.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/AskMessage.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.test;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.message.Message;
/**
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/ResponseCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/ResponseCommand.java
index 9d7d4257f..fa80ba7cc 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/ResponseCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/ResponseCommand.java
@@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.test;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
/**
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/ResponseMessage.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/ResponseMessage.java
index c6a7839fe..afc8c67ed 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/ResponseMessage.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/test/ResponseMessage.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.jubula.autagent.test;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.message.Message;
/**
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.client.api.commands/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java b/org.eclipse.jubula.client.api.commands/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java
index d80021c4b..71995ef4a 100644
--- a/org.eclipse.jubula.client.api.commands/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java
+++ b/org.eclipse.jubula.client.api.commands/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java
@@ -13,9 +13,9 @@ package org.eclipse.jubula.client.core.commands;
import java.util.concurrent.Exchanger;
import org.eclipse.jubula.client.internal.Synchronizer;
-import org.eclipse.jubula.communication.APICommand;
-import org.eclipse.jubula.communication.message.AutRegisteredMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.APICommand;
+import org.eclipse.jubula.communication.internal.message.AutRegisteredMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.client.api.commands/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java b/org.eclipse.jubula.client.api.commands/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java
index 846f342b9..77f7dddd4 100644
--- a/org.eclipse.jubula.client.api.commands/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java
+++ b/org.eclipse.jubula.client.api.commands/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java
@@ -13,9 +13,9 @@ package org.eclipse.jubula.client.core.commands;
import java.util.concurrent.Exchanger;
import org.eclipse.jubula.client.internal.Synchronizer;
-import org.eclipse.jubula.communication.APICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.StartAUTServerStateMessage;
+import org.eclipse.jubula.communication.internal.APICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerStateMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/AutAgentConnection.java b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/AutAgentConnection.java
index cff919c04..743cbb06b 100644
--- a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/AutAgentConnection.java
+++ b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/AutAgentConnection.java
@@ -14,7 +14,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import org.eclipse.jubula.client.internal.exceptions.ConnectionException;
-import org.eclipse.jubula.communication.Communicator;
+import org.eclipse.jubula.communication.internal.Communicator;
import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/BaseConnection.java b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/BaseConnection.java
index 14bd9fa4a..8d6359efa 100644
--- a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/BaseConnection.java
+++ b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/BaseConnection.java
@@ -12,10 +12,10 @@ package org.eclipse.jubula.client.internal;
import java.net.InetAddress;
-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.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.listener.ICommunicationErrorListener;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
import org.eclipse.jubula.tools.internal.exception.JBVersionException;
import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
diff --git a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java
index 2518ccbd6..444924254 100644
--- a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java
+++ b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java
@@ -16,9 +16,9 @@ import org.eclipse.jubula.client.AUTAgent;
import org.eclipse.jubula.client.internal.AutAgentConnection;
import org.eclipse.jubula.client.internal.Synchronizer;
import org.eclipse.jubula.client.launch.AUTConfiguration;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.message.StartAUTServerMessage;
-import org.eclipse.jubula.communication.message.StopAUTServerMessage;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerMessage;
+import org.eclipse.jubula.communication.internal.message.StopAUTServerMessage;
import org.eclipse.jubula.tools.internal.constants.AUTStartResponse;
import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
import org.eclipse.jubula.tools.internal.constants.ToolkitConstants;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java
index 816a4cb48..a2f08927b 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java
@@ -85,17 +85,17 @@ import org.eclipse.jubula.client.internal.AutAgentConnection;
import org.eclipse.jubula.client.internal.BaseConnection;
import org.eclipse.jubula.client.internal.BaseConnection.NotConnectedException;
import org.eclipse.jubula.client.internal.exceptions.ConnectionException;
-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.BuildMonitoringReportMessage;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
-import org.eclipse.jubula.communication.message.DisconnectFromAutAgentMessage;
-import org.eclipse.jubula.communication.message.GetAutConfigMapMessage;
-import org.eclipse.jubula.communication.message.GetMonitoringDataMessage;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.StartAUTServerMessage;
-import org.eclipse.jubula.communication.message.StopAUTServerMessage;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.listener.ICommunicationErrorListener;
+import org.eclipse.jubula.communication.internal.message.BuildMonitoringReportMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.DisconnectFromAutAgentMessage;
+import org.eclipse.jubula.communication.internal.message.GetAutConfigMapMessage;
+import org.eclipse.jubula.communication.internal.message.GetMonitoringDataMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerMessage;
+import org.eclipse.jubula.communication.internal.message.StopAUTServerMessage;
import org.eclipse.jubula.toolkit.common.businessprocess.ToolkitSupportBP;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.monitoring.MonitoringAttribute;
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 965a88b92..4a79534e5 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
@@ -31,7 +31,7 @@ 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.internal.AutAgentConnection;
-import org.eclipse.jubula.communication.message.GetRegisteredAutListMessage;
+import org.eclipse.jubula.communication.internal.message.GetRegisteredAutListMessage;
import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
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 63ceccabd..e31f95c87 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
@@ -77,20 +77,20 @@ import org.eclipse.jubula.client.core.utils.Traverser;
import org.eclipse.jubula.client.internal.AutAgentConnection;
import org.eclipse.jubula.client.internal.BaseConnection.NotConnectedException;
import org.eclipse.jubula.client.internal.exceptions.ConnectionException;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.CAPTestMessage;
-import org.eclipse.jubula.communication.message.CAPTestResponseMessage;
-import org.eclipse.jubula.communication.message.DisplayManualTestStepMessage;
-import org.eclipse.jubula.communication.message.EndTestExecutionMessage;
-import org.eclipse.jubula.communication.message.InitTestExecutionMessage;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.MessageCap;
-import org.eclipse.jubula.communication.message.MessageParam;
-import org.eclipse.jubula.communication.message.NullMessage;
-import org.eclipse.jubula.communication.message.PrepareForShutdownMessage;
-import org.eclipse.jubula.communication.message.ResetMonitoringDataMessage;
-import org.eclipse.jubula.communication.message.RestartAutMessage;
-import org.eclipse.jubula.communication.message.TakeScreenshotMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.CAPTestMessage;
+import org.eclipse.jubula.communication.internal.message.CAPTestResponseMessage;
+import org.eclipse.jubula.communication.internal.message.DisplayManualTestStepMessage;
+import org.eclipse.jubula.communication.internal.message.EndTestExecutionMessage;
+import org.eclipse.jubula.communication.internal.message.InitTestExecutionMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.MessageParam;
+import org.eclipse.jubula.communication.internal.message.NullMessage;
+import org.eclipse.jubula.communication.internal.message.PrepareForShutdownMessage;
+import org.eclipse.jubula.communication.internal.message.ResetMonitoringDataMessage;
+import org.eclipse.jubula.communication.internal.message.RestartAutMessage;
+import org.eclipse.jubula.communication.internal.message.TakeScreenshotMessage;
import org.eclipse.jubula.toolkit.common.businessprocess.ToolkitSupportBP;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTHighlightComponentCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTHighlightComponentCommand.java
index e725c34ed..722680760 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTHighlightComponentCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTHighlightComponentCommand.java
@@ -11,9 +11,9 @@
package org.eclipse.jubula.client.core.commands;
import org.eclipse.jubula.client.core.events.IAUTEventListener;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.AUTHighlightComponentResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.AUTHighlightComponentResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 74725a92a..cf2b13da8 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
@@ -13,10 +13,10 @@ package org.eclipse.jubula.client.core.commands;
import org.eclipse.jubula.client.core.ClientTest;
import org.eclipse.jubula.client.core.events.AUTServerEvent;
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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.AUTModeChangedMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 9734cce75..fd25735fd 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
@@ -13,10 +13,10 @@ package org.eclipse.jubula.client.core.commands;
import org.eclipse.jubula.client.core.ClientTest;
import org.eclipse.jubula.client.core.events.AUTEvent;
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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.AUTServerStateMessage;
+import org.eclipse.jubula.communication.internal.message.AUTStartMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 6df6e176e..e0ff71ce2 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
@@ -14,10 +14,10 @@ import org.eclipse.jubula.client.core.ClientTest;
import org.eclipse.jubula.client.core.IClientTest;
import org.eclipse.jubula.client.core.events.AUTEvent;
import org.eclipse.jubula.client.core.i18n.Messages;
-import org.eclipse.jubula.communication.ICommand;
-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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.AUTStartStateMessage;
+import org.eclipse.jubula.communication.internal.message.AUTStateMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 1a8b7606d..a37a9b471 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java
@@ -12,9 +12,9 @@ package org.eclipse.jubula.client.core.commands;
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.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.AUTStateMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java
index 112f731ad..6609ad82d 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AutRegisteredCommand.java
@@ -13,9 +13,9 @@ package org.eclipse.jubula.client.core.commands;
import org.eclipse.jubula.client.core.agent.AutAgentRegistration;
import org.eclipse.jubula.client.core.agent.AutRegistrationEvent;
import org.eclipse.jubula.client.core.agent.AutRegistrationEvent.RegistrationStatus;
-import org.eclipse.jubula.communication.APICommand;
-import org.eclipse.jubula.communication.message.AutRegisteredMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.APICommand;
+import org.eclipse.jubula.communication.internal.message.AutRegisteredMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 bd728b783..c7f556df8 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
@@ -38,14 +38,14 @@ import org.eclipse.jubula.client.core.model.PoMaker;
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.communication.ICommand;
-import org.eclipse.jubula.communication.message.CAPRecordedMessage;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.MessageCap;
-import org.eclipse.jubula.communication.message.MessageParam;
-import org.eclipse.jubula.communication.message.ShowObservInfoMessage;
-import org.eclipse.jubula.communication.message.ShowRecordedActionMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.CAPRecordedMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.MessageParam;
+import org.eclipse.jubula.communication.internal.message.ShowObservInfoMessage;
+import org.eclipse.jubula.communication.internal.message.ShowRecordedActionMessage;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.constants.TestDataConstants;
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 b5b8651ad..2864e81cf 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
@@ -12,10 +12,10 @@ package org.eclipse.jubula.client.core.commands;
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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.CAPTestResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.osgi.util.NLS;
import org.slf4j.Logger;
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 fcf3170f1..1ba0d3459 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
@@ -11,9 +11,9 @@
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;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.ConnectToAutResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 1f3a49e67..9a0f2986b 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
@@ -13,9 +13,9 @@ package org.eclipse.jubula.client.core.commands;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.internal.AutAgentConnection;
import org.eclipse.jubula.client.internal.exceptions.ConnectionException;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.DisconnectFromAutAgentResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.DisconnectFromAutAgentResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 be392a7dd..49fbb5dfc 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
@@ -12,9 +12,9 @@ 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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.DisplayManualTestStepResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 bcec554db..31cdcd649 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,9 @@ import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.businessprocess.TestExecutionEvent;
import org.eclipse.jubula.client.core.businessprocess.TestExecutionEvent.State;
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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.EndTestExecutionResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 4e0981210..64e43b195 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
@@ -13,9 +13,9 @@ package org.eclipse.jubula.client.core.commands;
import java.util.Map;
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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.GetAutConfigMapResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetKeyboardLayoutNameResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetKeyboardLayoutNameResponseCommand.java
index f002d92f6..8854b6b2c 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetKeyboardLayoutNameResponseCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetKeyboardLayoutNameResponseCommand.java
@@ -10,9 +10,9 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.commands;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.GetKeyboardLayoutNameResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.GetKeyboardLayoutNameResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 c364aefb9..1e980b1e2 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,9 +15,9 @@ import java.util.Map;
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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.GetMonitoringDataResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.MonitoringConstants;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.objects.MonitoringValue;
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 4fab37f1f..6b0d32f6a 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
@@ -21,9 +21,9 @@ import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.TestResult;
import org.eclipse.jubula.client.internal.AutAgentConnection;
import org.eclipse.jubula.client.internal.exceptions.ConnectionException;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.SendMonitoringReportMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.SendMonitoringReportMessage;
import org.eclipse.jubula.tools.internal.constants.MonitoringConstants;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
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 c623010a5..056d2caa1 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
@@ -16,9 +16,9 @@ import java.util.Iterator;
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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.ObjectMappedMessage;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier;
import org.slf4j.Logger;
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 b9ad1c978..3d6fee984 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
@@ -11,9 +11,9 @@
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.Message;
-import org.eclipse.jubula.communication.message.SendDirectoryResponseMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.SendDirectoryResponseMessage;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 156dbb2d4..5f77976a0 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
@@ -14,9 +14,9 @@ import org.eclipse.jubula.client.core.agent.AutRegistrationEvent;
import org.eclipse.jubula.client.core.agent.AutRegistrationEvent.RegistrationStatus;
import org.eclipse.jubula.client.core.agent.IAutRegistrationListener;
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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.RegisteredAutListMessage;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.registration.AutIdentifier;
import org.slf4j.Logger;
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 6a19fd727..4469a91b7 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
@@ -12,9 +12,9 @@ package org.eclipse.jubula.client.core.commands;
import org.eclipse.jubula.client.core.events.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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.ServerLogResponseMessage;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 0c0fff9cc..746d3f36e 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,9 @@ import org.eclipse.jubula.client.core.ClientTest;
import org.eclipse.jubula.client.core.IClientTest;
import org.eclipse.jubula.client.core.events.AUTServerEvent;
import org.eclipse.jubula.client.core.i18n.Messages;
-import org.eclipse.jubula.communication.APICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.StartAUTServerStateMessage;
+import org.eclipse.jubula.communication.internal.APICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.StartAUTServerStateMessage;
import org.eclipse.jubula.tools.internal.constants.AUTStartResponse;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
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 88fb2e5bf..93dfca3ef 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
@@ -11,9 +11,9 @@
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.Message;
-import org.eclipse.jubula.communication.message.StopAUTServerStateMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.StopAUTServerStateMessage;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 ccbd20192..cd4e907e7 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,9 +12,9 @@ package org.eclipse.jubula.client.core.commands;
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.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.TakeScreenshotResponseMessage;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/WindowTitlesChangedCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/WindowTitlesChangedCommand.java
index ea20013f0..469f72389 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/WindowTitlesChangedCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/WindowTitlesChangedCommand.java
@@ -2,9 +2,9 @@ package org.eclipse.jubula.client.core.commands;
import org.eclipse.jubula.client.core.events.DataEventDispatcher;
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.html.WindowTitlesMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.html.WindowTitlesMessage;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 59f652e8b..b0425bfe7 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
@@ -39,15 +39,15 @@ import org.eclipse.jubula.client.core.utils.Languages;
import org.eclipse.jubula.client.internal.AutAgentConnection;
import org.eclipse.jubula.client.internal.BaseConnection;
import org.eclipse.jubula.client.internal.exceptions.ConnectionException;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.listener.ICommunicationErrorListener;
-import org.eclipse.jubula.communication.message.AUTStateMessage;
-import org.eclipse.jubula.communication.message.ConnectToAutMessage;
-import org.eclipse.jubula.communication.message.GetKeyboardLayoutNameMessage;
-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.communication.message.SetKeyboardLayoutMessage;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.listener.ICommunicationErrorListener;
+import org.eclipse.jubula.communication.internal.message.AUTStateMessage;
+import org.eclipse.jubula.communication.internal.message.ConnectToAutMessage;
+import org.eclipse.jubula.communication.internal.message.GetKeyboardLayoutNameMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.SendAUTListOfSupportedComponentsMessage;
+import org.eclipse.jubula.communication.internal.message.SendCompSystemI18nMessage;
+import org.eclipse.jubula.communication.internal.message.SetKeyboardLayoutMessage;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
import org.eclipse.jubula.tools.internal.constants.EnvConstants;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/MessageFactory.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/MessageFactory.java
index b8180a8c7..041b02abe 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/MessageFactory.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/MessageFactory.java
@@ -17,9 +17,9 @@ import org.eclipse.jubula.client.core.businessprocess.TestExecution;
import org.eclipse.jubula.client.core.i18n.Messages;
import org.eclipse.jubula.client.core.model.IAUTMainPO;
import org.eclipse.jubula.client.internal.exceptions.ConnectionException;
-import org.eclipse.jubula.communication.message.CAPTestMessage;
-import org.eclipse.jubula.communication.message.MessageCap;
-import org.eclipse.jubula.communication.message.SendAUTListOfSupportedComponentsMessage;
+import org.eclipse.jubula.communication.internal.message.CAPTestMessage;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.SendAUTListOfSupportedComponentsMessage;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
@@ -46,21 +46,21 @@ public class MessageFactory {
static {
toolkitToTestMessageClassName.put(CommandConstants.SWT_TOOLKIT,
- "org.eclipse.jubula.communication.message.swt.CAPSwtTestMessage"); //$NON-NLS-1$
+ "org.eclipse.jubula.communication.internal.message.swt.CAPSwtTestMessage"); //$NON-NLS-1$
toolkitToTestMessageClassName.put(CommandConstants.RCP_TOOLKIT,
toolkitToTestMessageClassName.get(CommandConstants.SWT_TOOLKIT));
toolkitToTestMessageClassName.put(CommandConstants.SWING_TOOLKIT,
- "org.eclipse.jubula.communication.message.swing.CAPSwingTestMessage"); //$NON-NLS-1$
+ "org.eclipse.jubula.communication.internal.message.swing.CAPSwingTestMessage"); //$NON-NLS-1$
toolkitToTestMessageClassName.put(CommandConstants.HTML_TOOLKIT,
- "org.eclipse.jubula.communication.message.html.CAPHtmlTestMessage"); //$NON-NLS-1$
+ "org.eclipse.jubula.communication.internal.message.html.CAPHtmlTestMessage"); //$NON-NLS-1$
toolkitToTestMessageClassName.put(CommandConstants.WIN_TOOLKIT,
- "org.eclipse.jubula.communication.message.win.CAPWinTestMessage"); //$NON-NLS-1$
+ "org.eclipse.jubula.communication.internal.message.win.CAPWinTestMessage"); //$NON-NLS-1$
toolkitToTestMessageClassName.put(CommandConstants.WIN__APPS_TOOLKIT,
- "org.eclipse.jubula.communication.message.win.CAPWinTestMessage"); //$NON-NLS-1$
+ "org.eclipse.jubula.communication.internal.message.win.CAPWinTestMessage"); //$NON-NLS-1$
toolkitToTestMessageClassName.put(CommandConstants.IOS_TOOLKIT,
- "org.eclipse.jubula.communication.message.ios.IOSCAPTestMessage"); //$NON-NLS-1$
+ "org.eclipse.jubula.communication.internal.message.ios.IOSCAPTestMessage"); //$NON-NLS-1$
toolkitToTestMessageClassName.put(CommandConstants.JAVAFX_TOOLKIT,
- "org.eclipse.jubula.communication.message.javafx.CAPJavaFXTestMessage"); //$NON-NLS-1$
+ "org.eclipse.jubula.communication.internal.message.javafx.CAPJavaFXTestMessage"); //$NON-NLS-1$
}
/**
@@ -174,7 +174,7 @@ public class MessageFactory {
throws UnknownMessageException {
String messageClassName = "null"; //$NON-NLS-1$
try {
- messageClassName = "org.eclipse.jubula.communication.message.SendAUTListOfSupportedComponentsMessage"; //$NON-NLS-1$
+ messageClassName = "org.eclipse.jubula.communication.internal.message.SendAUTListOfSupportedComponentsMessage"; //$NON-NLS-1$
Class messageClass = Class.forName(messageClassName, false,
SendAUTListOfSupportedComponentsMessage.class
.getClassLoader());
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/IServerLogListener.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/IServerLogListener.java
index 2061349f7..880c33f17 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/IServerLogListener.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/IServerLogListener.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.jubula.client.core.events;
-import org.eclipse.jubula.communication.message.ServerLogResponseMessage;
+import org.eclipse.jubula.communication.internal.message.ServerLogResponseMessage;
/**
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/ActivateInspectorResponseCommand.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/ActivateInspectorResponseCommand.java
index 9048b4f4d..aec96cf5d 100644
--- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/ActivateInspectorResponseCommand.java
+++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/ActivateInspectorResponseCommand.java
@@ -12,9 +12,9 @@ package org.eclipse.jubula.client.inspector.ui.commands;
import org.eclipse.jubula.client.inspector.ui.i18n.Messages;
import org.eclipse.jubula.client.inspector.ui.provider.sourceprovider.InspectorStateProvider;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.ActivateInspectorResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.ActivateInspectorResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.services.ISourceProviderService;
import org.slf4j.Logger;
diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java
index b990a52dd..19e627720 100644
--- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java
+++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java
@@ -15,9 +15,9 @@ import org.eclipse.jubula.client.inspector.ui.i18n.Messages;
import org.eclipse.jubula.client.inspector.ui.model.InspectedComponent;
import org.eclipse.jubula.client.inspector.ui.provider.sourceprovider.InspectorStateProvider;
import org.eclipse.jubula.client.internal.exceptions.ConnectionException;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.InspectorComponentSelectedMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.InspectorComponentSelectedMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/ActivateInspectorHandler.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/ActivateInspectorHandler.java
index 85f1a97da..fcf838687 100644
--- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/ActivateInspectorHandler.java
+++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/ActivateInspectorHandler.java
@@ -25,7 +25,7 @@ import org.eclipse.jubula.client.internal.BaseConnection.NotConnectedException;
import org.eclipse.jubula.client.internal.exceptions.ConnectionException;
import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil;
import org.eclipse.jubula.client.ui.utils.JobUtils;
-import org.eclipse.jubula.communication.message.ActivateInspectorMessage;
+import org.eclipse.jubula.communication.internal.message.ActivateInspectorMessage;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.internal.registration.AutIdentifier;
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/HandleRemoteFileBrowsing.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/HandleRemoteFileBrowsing.java
index 2eac2a061..71d4e2e59 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/HandleRemoteFileBrowsing.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/HandleRemoteFileBrowsing.java
@@ -10,9 +10,9 @@
*******************************************************************************/
package org.eclipse.jubula.client.ui.rcp.businessprocess;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.SendDirectoryResponseMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.SendDirectoryResponseMessage;
/**
* Handle the answer to the browsing request
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/RemoteFileBrowserBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/RemoteFileBrowserBP.java
index 1c789b568..67d6cc3e5 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/RemoteFileBrowserBP.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/RemoteFileBrowserBP.java
@@ -16,10 +16,10 @@ import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.SendDirectoryMessage;
-import org.eclipse.jubula.communication.message.SendDirectoryResponseMessage;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.SendDirectoryMessage;
+import org.eclipse.jubula.communication.internal.message.SendDirectoryResponseMessage;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowServerLogBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowServerLogBP.java
index 7df5a10a0..8480c56f8 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowServerLogBP.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowServerLogBP.java
@@ -18,8 +18,8 @@ import org.eclipse.jubula.client.core.events.IServerLogListener;
import org.eclipse.jubula.client.internal.AutAgentConnection;
import org.eclipse.jubula.client.internal.BaseConnection.NotConnectedException;
import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil;
-import org.eclipse.jubula.communication.message.SendServerLogMessage;
-import org.eclipse.jubula.communication.message.ServerLogResponseMessage;
+import org.eclipse.jubula.communication.internal.message.SendServerLogMessage;
+import org.eclipse.jubula.communication.internal.message.ServerLogResponseMessage;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.internal.utils.TimeUtil;
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionContributor.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionContributor.java
index 765b95628..45da53779 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionContributor.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionContributor.java
@@ -53,7 +53,7 @@ import org.eclipse.jubula.client.ui.rcp.i18n.Messages;
import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.OMEditorTreeLabelProvider;
import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil;
import org.eclipse.jubula.client.ui.utils.JobUtils;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
import org.eclipse.jubula.tools.internal.constants.EnvConstants;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.constants.TimingConstantsClient;
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionGUIController.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionGUIController.java
index d177dd215..54f0b465a 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionGUIController.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionGUIController.java
@@ -36,10 +36,10 @@ import org.eclipse.jubula.client.ui.rcp.i18n.Messages;
import org.eclipse.jubula.client.ui.rcp.utils.AutAgentManager.AutAgent;
import org.eclipse.jubula.client.ui.rcp.utils.JBThread;
import org.eclipse.jubula.client.ui.utils.JobUtils;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.SendCompSystemI18nMessage;
-import org.eclipse.jubula.communication.message.StopAUTServerMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.SendCompSystemI18nMessage;
+import org.eclipse.jubula.communication.internal.message.StopAUTServerMessage;
import org.eclipse.jubula.tools.internal.constants.AutConfigConstants;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java
index 0d72de924..2e5b26598 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java
@@ -102,7 +102,7 @@ import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil;
import org.eclipse.jubula.client.ui.utils.LayoutUtil;
import org.eclipse.jubula.client.ui.views.IJBPart;
import org.eclipse.jubula.client.ui.views.IMultiTreeViewerContainer;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException;
import org.eclipse.jubula.tools.internal.i18n.I18n;
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/HighlightInAUTHandler.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/HighlightInAUTHandler.java
index 6a66e76ed..5b5a1ed83 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/HighlightInAUTHandler.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/HighlightInAUTHandler.java
@@ -24,8 +24,8 @@ import org.eclipse.jubula.client.internal.BaseConnection.NotConnectedException;
import org.eclipse.jubula.client.ui.handlers.AbstractSelectionBasedHandler;
import org.eclipse.jubula.client.ui.rcp.i18n.Messages;
import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil;
-import org.eclipse.jubula.communication.message.AUTHighlightComponentMessage;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.AUTHighlightComponentMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
import org.eclipse.jubula.tools.internal.exception.JBException;
import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/html/OMChooseWindow.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/html/OMChooseWindow.java
index dac080d91..ab6a15bbb 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/html/OMChooseWindow.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/html/OMChooseWindow.java
@@ -18,7 +18,7 @@ import org.eclipse.core.commands.State;
import org.eclipse.jubula.client.core.communication.AUTConnection;
import org.eclipse.jubula.client.internal.BaseConnection.NotConnectedException;
import org.eclipse.jubula.client.ui.rcp.utils.HTMLAutWindowManager;
-import org.eclipse.jubula.communication.message.html.OMSelectWindowMessage;
+import org.eclipse.jubula.communication.internal.message.html.OMSelectWindowMessage;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
import org.eclipse.ui.commands.IElementUpdater;
import org.eclipse.ui.menus.UIElement;
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/open/ShowServerLogHandler.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/open/ShowServerLogHandler.java
index 64df252c9..0cd23a4ff 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/open/ShowServerLogHandler.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/open/ShowServerLogHandler.java
@@ -17,7 +17,7 @@ import org.eclipse.jubula.client.ui.rcp.businessprocess.ShowServerLogBP;
import org.eclipse.jubula.client.ui.rcp.editors.ISimpleEditorInput;
import org.eclipse.jubula.client.ui.rcp.editors.ServerLogInput;
import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil;
-import org.eclipse.jubula.communication.message.ServerLogResponseMessage;
+import org.eclipse.jubula.communication.internal.message.ServerLogResponseMessage;
import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/utils/RemoteFileStore.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/utils/RemoteFileStore.java
index 63cea981b..c331922e2 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/utils/RemoteFileStore.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/utils/RemoteFileStore.java
@@ -26,7 +26,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jubula.client.ui.rcp.businessprocess.RemoteFileBrowserBP;
import org.eclipse.jubula.client.ui.rcp.i18n.Messages;
-import org.eclipse.jubula.communication.Communicator;
+import org.eclipse.jubula.communication.internal.Communicator;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
diff --git a/org.eclipse.jubula.communication/META-INF/MANIFEST.MF b/org.eclipse.jubula.communication/META-INF/MANIFEST.MF
index c736d275b..cb762e1c1 100644
--- a/org.eclipse.jubula.communication/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.communication/META-INF/MANIFEST.MF
@@ -6,16 +6,16 @@ Bundle-Version: 2.4.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Jubula
Bundle-Localization: plugin
-Export-Package: org.eclipse.jubula.communication,
- org.eclipse.jubula.communication.commands,
- org.eclipse.jubula.communication.connection,
- org.eclipse.jubula.communication.listener,
- org.eclipse.jubula.communication.message,
- org.eclipse.jubula.communication.message.html,
- org.eclipse.jubula.communication.message.swing,
- org.eclipse.jubula.communication.message.swt,
- org.eclipse.jubula.communication.parser,
- org.eclipse.jubula.communication.writer
+Export-Package: org.eclipse.jubula.communication.internal,
+ org.eclipse.jubula.communication.internal.commands,
+ org.eclipse.jubula.communication.internal.connection,
+ org.eclipse.jubula.communication.internal.listener,
+ org.eclipse.jubula.communication.internal.message,
+ org.eclipse.jubula.communication.internal.message.html,
+ org.eclipse.jubula.communication.internal.message.swing,
+ org.eclipse.jubula.communication.internal.message.swt,
+ org.eclipse.jubula.communication.internal.parser,
+ org.eclipse.jubula.communication.internal.writer
Require-Bundle: org.eclipse.jubula.tools;bundle-version="[2.4.0,2.5.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.slf4j.api;bundle-version="[1.7.2,2.0.0)"
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/APICommand.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/APICommand.java
index 391e6caf3..1485109fd 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/APICommand.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/APICommand.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication;
+package org.eclipse.jubula.communication.internal;
/**
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/AbortingExceptionHandler.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/AbortingExceptionHandler.java
index a6428348c..9b819c2d8 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/AbortingExceptionHandler.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/AbortingExceptionHandler.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication;
+package org.eclipse.jubula.communication.internal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/CommandFactory.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/CommandFactory.java
index aaded583c..9fc4614df 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/CommandFactory.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/CommandFactory.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication;
+package org.eclipse.jubula.communication.internal;
import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/Communicator.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/Communicator.java
index 3de3d214a..282e03a8b 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/Communicator.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/Communicator.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication;
+package org.eclipse.jubula.communication.internal;
import java.io.BufferedReader;
import java.io.IOException;
@@ -26,17 +26,17 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.Validate;
-import org.eclipse.jubula.communication.connection.Connection;
-import org.eclipse.jubula.communication.connection.ConnectionState;
-import org.eclipse.jubula.communication.connection.DefaultClientSocket;
-import org.eclipse.jubula.communication.connection.DefaultServerSocket;
-import org.eclipse.jubula.communication.listener.ICommunicationErrorListener;
-import org.eclipse.jubula.communication.listener.IErrorHandler;
-import org.eclipse.jubula.communication.listener.IMessageHandler;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.MessageHeader;
-import org.eclipse.jubula.communication.message.MessageIdentifier;
-import org.eclipse.jubula.communication.parser.MessageSerializer;
+import org.eclipse.jubula.communication.internal.connection.Connection;
+import org.eclipse.jubula.communication.internal.connection.ConnectionState;
+import org.eclipse.jubula.communication.internal.connection.DefaultClientSocket;
+import org.eclipse.jubula.communication.internal.connection.DefaultServerSocket;
+import org.eclipse.jubula.communication.internal.listener.ICommunicationErrorListener;
+import org.eclipse.jubula.communication.internal.listener.IErrorHandler;
+import org.eclipse.jubula.communication.internal.listener.IMessageHandler;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.MessageHeader;
+import org.eclipse.jubula.communication.internal.message.MessageIdentifier;
+import org.eclipse.jubula.communication.internal.parser.MessageSerializer;
import org.eclipse.jubula.tools.internal.exception.Assert;
import org.eclipse.jubula.tools.internal.exception.AssertException;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/ConfigurableLogger.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/ConfigurableLogger.java
index dc52e7be4..6e7fed312 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/ConfigurableLogger.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/ConfigurableLogger.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication;
+package org.eclipse.jubula.communication.internal;
import org.eclipse.jubula.tools.internal.exception.Assert;
import org.slf4j.Logger;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/ICommand.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/ICommand.java
index 8d1f61820..dccbe680b 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/ICommand.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/ICommand.java
@@ -8,9 +8,9 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication;
+package org.eclipse.jubula.communication.internal;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.message.Message;
/**
* Every command class must implement the <code>ICommand</code> interface.
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/IConnectionInitializer.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/IConnectionInitializer.java
index 0e36c4165..b245db783 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/IConnectionInitializer.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/IConnectionInitializer.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication;
+package org.eclipse.jubula.communication.internal;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/IExceptionHandler.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/IExceptionHandler.java
index 4365ee155..23e4f7d5a 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/IExceptionHandler.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/IExceptionHandler.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication;
+package org.eclipse.jubula.communication.internal;
/**
* Interface for an Exception handler. <br>
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/UnknownCommandException.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/UnknownCommandException.java
index 51b50cbfd..c427972fc 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/UnknownCommandException.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/UnknownCommandException.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication;
+package org.eclipse.jubula.communication.internal;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/commands/SetCompSystemI18nCommand.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/commands/SetCompSystemI18nCommand.java
index 0acf8a8cc..4c061b1fd 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/commands/SetCompSystemI18nCommand.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/commands/SetCompSystemI18nCommand.java
@@ -8,11 +8,11 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.commands;
+package org.eclipse.jubula.communication.internal.commands;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.SendCompSystemI18nMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.SendCompSystemI18nMessage;
import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/Connection.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/Connection.java
index 1278b5594..82388b6d9 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/Connection.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/Connection.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.connection;
+package org.eclipse.jubula.communication.internal.connection;
import java.io.BufferedReader;
import java.io.IOException;
@@ -24,14 +24,14 @@ import java.util.Iterator;
import java.util.Set;
import org.apache.commons.lang.Validate;
-import org.eclipse.jubula.communication.ConfigurableLogger;
-import org.eclipse.jubula.communication.IExceptionHandler;
-import org.eclipse.jubula.communication.listener.IErrorHandler;
-import org.eclipse.jubula.communication.listener.IMessageHandler;
-import org.eclipse.jubula.communication.message.MessageHeader;
-import org.eclipse.jubula.communication.message.MessageHeader.InvalidHeaderVersionException;
-import org.eclipse.jubula.communication.parser.MessageHeaderSerializer;
-import org.eclipse.jubula.communication.writer.MessageWriter;
+import org.eclipse.jubula.communication.internal.ConfigurableLogger;
+import org.eclipse.jubula.communication.internal.IExceptionHandler;
+import org.eclipse.jubula.communication.internal.listener.IErrorHandler;
+import org.eclipse.jubula.communication.internal.listener.IMessageHandler;
+import org.eclipse.jubula.communication.internal.message.MessageHeader;
+import org.eclipse.jubula.communication.internal.message.MessageHeader.InvalidHeaderVersionException;
+import org.eclipse.jubula.communication.internal.parser.MessageHeaderSerializer;
+import org.eclipse.jubula.communication.internal.writer.MessageWriter;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.exception.SerialisationException;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/ConnectionState.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/ConnectionState.java
index e4a48f76e..85f8caa0e 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/ConnectionState.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/ConnectionState.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.connection;
+package org.eclipse.jubula.communication.internal.connection;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/DefaultClientSocket.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/DefaultClientSocket.java
index 83a8b317e..453eef14b 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/DefaultClientSocket.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/DefaultClientSocket.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.connection;
+package org.eclipse.jubula.communication.internal.connection;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/DefaultServerSocket.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/DefaultServerSocket.java
index 2c8feedb2..19519e38d 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/DefaultServerSocket.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/DefaultServerSocket.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.connection;
+package org.eclipse.jubula.communication.internal.connection;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/DefaultSocket.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/DefaultSocket.java
index 788184d37..4e737a621 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/DefaultSocket.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/DefaultSocket.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.connection;
+package org.eclipse.jubula.communication.internal.connection;
import java.io.IOException;
import java.net.InetAddress;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/RestartAutProtocol.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/RestartAutProtocol.java
index 52e93051a..1fba119e7 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/RestartAutProtocol.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/RestartAutProtocol.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.connection;
+package org.eclipse.jubula.communication.internal.connection;
/**
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/UnexpectedEofException.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/UnexpectedEofException.java
index 5f67e0d1a..2e9ca47d7 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/connection/UnexpectedEofException.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/connection/UnexpectedEofException.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.connection;
+package org.eclipse.jubula.communication.internal.connection;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/listener/ICommunicationErrorListener.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/listener/ICommunicationErrorListener.java
index 569d23c55..fe03652ed 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/listener/ICommunicationErrorListener.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/listener/ICommunicationErrorListener.java
@@ -8,11 +8,11 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.listener;
+package org.eclipse.jubula.communication.internal.listener;
import java.net.InetAddress;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.message.Message;
/**
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/listener/IErrorHandler.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/listener/IErrorHandler.java
index e9282960c..e6e1897f7 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/listener/IErrorHandler.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/listener/IErrorHandler.java
@@ -8,9 +8,9 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.listener;
+package org.eclipse.jubula.communication.internal.listener;
-import org.eclipse.jubula.communication.message.MessageHeader;
+import org.eclipse.jubula.communication.internal.message.MessageHeader;
/**
* The interface a connection uses to notify listener for connection errors.
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/listener/IMessageHandler.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/listener/IMessageHandler.java
index d2623302f..ed791e42f 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/listener/IMessageHandler.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/listener/IMessageHandler.java
@@ -8,9 +8,9 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.listener;
+package org.eclipse.jubula.communication.internal.listener;
-import org.eclipse.jubula.communication.message.MessageHeader;
+import org.eclipse.jubula.communication.internal.message.MessageHeader;
/**
* The interface a connection uses to notify listener for incoming messages.
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTHighlightComponentMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTHighlightComponentMessage.java
index 3c441d5a1..aec9d3b01 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTHighlightComponentMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTHighlightComponentMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTHighlightComponentResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTHighlightComponentResponseMessage.java
index 8f39639ba..a8c777661 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTHighlightComponentResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTHighlightComponentResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTModeChangedMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTModeChangedMessage.java
index 929685b9a..0bedd8c7b 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTModeChangedMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTModeChangedMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTServerStateMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTServerStateMessage.java
index dc068c7ad..a66f51860 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTServerStateMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTServerStateMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTStartMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTStartMessage.java
index 9610b1b88..b34589b9d 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTStartMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTStartMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTStartStateMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTStartStateMessage.java
index 64d454232..6b6151220 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTStartStateMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTStartStateMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTStateMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTStateMessage.java
index 596b4629c..98d09159c 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AUTStateMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AUTStateMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
/**
* This message is used to transmit the state of the AUT, see the constants. <br>
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ActivateInspectorMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ActivateInspectorMessage.java
index b8023aa64..a29735ad5 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ActivateInspectorMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ActivateInspectorMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ActivateInspectorResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ActivateInspectorResponseMessage.java
index 894184fe2..2d35df938 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ActivateInspectorResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ActivateInspectorResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AutRegisteredMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AutRegisteredMessage.java
index 455e2c1ec..cd6f0a3e0 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/AutRegisteredMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/AutRegisteredMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.registration.AutIdentifier;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/BuildMonitoringReportMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/BuildMonitoringReportMessage.java
index 59d9ad284..420d1d281 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/BuildMonitoringReportMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/BuildMonitoringReportMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPRecordedMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/CAPRecordedMessage.java
index e25cae137..a88799bf1 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPRecordedMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/CAPRecordedMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPTestMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/CAPTestMessage.java
index c49b66366..4fcc0caeb 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPTestMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/CAPTestMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
/**
* This class sends a component-action-param-triple to the server.
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPTestResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/CAPTestResponseMessage.java
index b9b9d3dca..ace82ff7e 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPTestResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/CAPTestResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ChangeAUTModeMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ChangeAUTModeMessage.java
index 44244e278..991712fe6 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ChangeAUTModeMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ChangeAUTModeMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import java.util.SortedSet;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ConnectToAutMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ConnectToAutMessage.java
index 2c58b731f..1e7ad3c71 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ConnectToAutMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ConnectToAutMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.apache.commons.lang.Validate;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ConnectToAutResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ConnectToAutResponseMessage.java
index 684364abf..947f01689 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ConnectToAutResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ConnectToAutResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ConnectToClientMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ConnectToClientMessage.java
index b4899e9b5..c152d98a4 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ConnectToClientMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ConnectToClientMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisconnectFromAutAgentMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisconnectFromAutAgentMessage.java
index a15013af1..9d9019470 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisconnectFromAutAgentMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisconnectFromAutAgentMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisconnectFromAutAgentResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisconnectFromAutAgentResponseMessage.java
index ac6dd6867..da9320dd4 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisconnectFromAutAgentResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisconnectFromAutAgentResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisplayManualTestStepMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisplayManualTestStepMessage.java
index e9f9b8610..b5e8736d6 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisplayManualTestStepMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisplayManualTestStepMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisplayManualTestStepResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisplayManualTestStepResponseMessage.java
index a500052e3..77d086105 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/DisplayManualTestStepResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/DisplayManualTestStepResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/EndTestExecutionMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/EndTestExecutionMessage.java
index 11ce233f8..80e0977de 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/EndTestExecutionMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/EndTestExecutionMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/EndTestExecutionResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/EndTestExecutionResponseMessage.java
index 8753b6e3b..c998dff2b 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/EndTestExecutionResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/EndTestExecutionResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetAutConfigMapMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetAutConfigMapMessage.java
index 8b408df78..aa3e65688 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetAutConfigMapMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetAutConfigMapMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetAutConfigMapResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetAutConfigMapResponseMessage.java
index 0629aa46a..512d385cf 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetAutConfigMapResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetAutConfigMapResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import java.util.Map;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetKeyboardLayoutNameMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetKeyboardLayoutNameMessage.java
index bc5abc7e1..225ae1ff2 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetKeyboardLayoutNameMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetKeyboardLayoutNameMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetKeyboardLayoutNameResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetKeyboardLayoutNameResponseMessage.java
index a298bd242..18fd06ac5 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetKeyboardLayoutNameResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetKeyboardLayoutNameResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetMonitoringDataMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetMonitoringDataMessage.java
index 7d61f3204..c435a4c0e 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetMonitoringDataMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetMonitoringDataMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetMonitoringDataResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetMonitoringDataResponseMessage.java
index 712c36510..30196683b 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetMonitoringDataResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetMonitoringDataResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import java.util.Map;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetRegisteredAutListMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetRegisteredAutListMessage.java
index bd5e9e268..8bda28d39 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetRegisteredAutListMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/GetRegisteredAutListMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/InitTestExecutionMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/InitTestExecutionMessage.java
index a306ad4b9..d25b14b77 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/InitTestExecutionMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/InitTestExecutionMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/InspectorComponentSelectedMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/InspectorComponentSelectedMessage.java
index be58ddbf5..f5c3014b3 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/InspectorComponentSelectedMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/InspectorComponentSelectedMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/Message.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/Message.java
index 656bea7f0..a010f53da 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/Message.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/Message.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
/**
* This class is the abstract base class for all messages which could be send
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageCap.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageCap.java
index c79e7bdd7..5d45469ef 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageCap.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageCap.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import java.util.ArrayList;
import java.util.List;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageHeader.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageHeader.java
index 59d1f26c4..42c01efc6 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageHeader.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageHeader.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.apache.commons.lang.Validate;
import org.apache.commons.lang.builder.EqualsBuilder;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageIdentifier.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageIdentifier.java
index 3bb52818f..0fb9e39c6 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageIdentifier.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageIdentifier.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageParam.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageParam.java
index e46cd0365..ef8ee6589 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/MessageParam.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/MessageParam.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import java.io.Serializable;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/NullMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/NullMessage.java
index bedfc0fd4..4745f79ba 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/NullMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/NullMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ObjectMappedMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ObjectMappedMessage.java
index 6e3520c27..d53404296 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ObjectMappedMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ObjectMappedMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/PrepareForShutdownMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/PrepareForShutdownMessage.java
index 68056c063..953da8ab1 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/PrepareForShutdownMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/PrepareForShutdownMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/RecordActionMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/RecordActionMessage.java
index afe45bec0..0eff5f655 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/RecordActionMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/RecordActionMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/RegisteredAutListMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/RegisteredAutListMessage.java
index 3df842625..cefc8ad8a 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/RegisteredAutListMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/RegisteredAutListMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.registration.AutIdentifier;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ResetMonitoringDataMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ResetMonitoringDataMessage.java
index 6f0bf70c6..856a4bb58 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ResetMonitoringDataMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ResetMonitoringDataMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/RestartAutMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/RestartAutMessage.java
index 0e1d32996..16e5b169e 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/RestartAutMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/RestartAutMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.apache.commons.lang.Validate;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendAUTListOfSupportedComponentsMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendAUTListOfSupportedComponentsMessage.java
index 9fd9e57c0..d8d00ec2e 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendAUTListOfSupportedComponentsMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendAUTListOfSupportedComponentsMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import java.util.ArrayList;
import java.util.List;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendCompSystemI18nMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendCompSystemI18nMessage.java
index 57cb242bb..9b6dadad9 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendCompSystemI18nMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendCompSystemI18nMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
/**
* @author BREDEX GmbH
@@ -25,7 +25,7 @@ public class SendCompSystemI18nMessage extends Message {
/** {@inheritDoc} */
public String getCommandClass() {
- return "org.eclipse.jubula.communication.commands.SetCompSystemI18nCommand"; //$NON-NLS-1$
+ return "org.eclipse.jubula.communication.internal.commands.SetCompSystemI18nCommand"; //$NON-NLS-1$
}
/** @return the ResourceBundles */
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendDirectoryMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendDirectoryMessage.java
index 1889d7d1d..cae06e6d8 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendDirectoryMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendDirectoryMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendDirectoryResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendDirectoryResponseMessage.java
index d56a84d6a..b07dc501d 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendDirectoryResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendDirectoryResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import java.io.File;
import java.util.ArrayList;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendMonitoringReportMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendMonitoringReportMessage.java
index 7c5ec1752..923cf6062 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendMonitoringReportMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendMonitoringReportMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendServerLogMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendServerLogMessage.java
index f75634fb5..e2c267665 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendServerLogMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SendServerLogMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerLogResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerLogResponseMessage.java
index 7ac10a06a..f096e9475 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerLogResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerLogResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerShowDialogMessage.java
index 5f83e2cf9..c644c12ea 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerShowDialogMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import java.awt.Point;
import java.util.Map;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerShowDialogResponseMessage.java
index d761fb6c9..24a38b8bf 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerShowDialogResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowObservConsoleMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerShowObservConsoleMessage.java
index 523c10079..cadfdc4fd 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowObservConsoleMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ServerShowObservConsoleMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SetKeyboardLayoutMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SetKeyboardLayoutMessage.java
index e4eb59999..4320de18c 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SetKeyboardLayoutMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/SetKeyboardLayoutMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import java.util.Properties;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowObservInfoMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ShowObservInfoMessage.java
index b06b99955..75d14bc88 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowObservInfoMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ShowObservInfoMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowRecordedActionMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ShowRecordedActionMessage.java
index f48d272c4..e787dc813 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowRecordedActionMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/ShowRecordedActionMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StartAUTServerMessage.java
index 5fd9c8ac0..0a97e3a02 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StartAUTServerMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import java.util.Map;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerStateMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StartAUTServerStateMessage.java
index 48a782bba..f0d12f6ad 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerStateMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StartAUTServerStateMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.AUTStartResponse;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StopAUTServerMessage.java
index 33739ce91..f2a806e8b 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StopAUTServerMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.registration.AutIdentifier;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerStateMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StopAUTServerStateMessage.java
index d764e4df9..f8e6ea1c4 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerStateMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/StopAUTServerStateMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/TakeScreenshotMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/TakeScreenshotMessage.java
index 0dc17d6a2..cec85714f 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/TakeScreenshotMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/TakeScreenshotMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/TakeScreenshotResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/TakeScreenshotResponseMessage.java
index f81b9accc..54c61cb2b 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/TakeScreenshotResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/TakeScreenshotResponseMessage.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message;
+package org.eclipse.jubula.communication.internal.message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
import org.eclipse.jubula.tools.internal.serialisation.SerializedImage;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/html/CAPHtmlTestMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/html/CAPHtmlTestMessage.java
index f596e82f1..c849386c4 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/html/CAPHtmlTestMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/html/CAPHtmlTestMessage.java
@@ -8,10 +8,10 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message.html;
+package org.eclipse.jubula.communication.internal.message.html;
-import org.eclipse.jubula.communication.message.CAPTestMessage;
-import org.eclipse.jubula.communication.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.CAPTestMessage;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
/**
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/html/OMSelectWindowMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/html/OMSelectWindowMessage.java
index 9e31240d9..d9e81b023 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/html/OMSelectWindowMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/html/OMSelectWindowMessage.java
@@ -8,9 +8,9 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message.html;
+package org.eclipse.jubula.communication.internal.message.html;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
/**
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/html/WindowTitlesMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/html/WindowTitlesMessage.java
index 8faf77349..675324b31 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/html/WindowTitlesMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/html/WindowTitlesMessage.java
@@ -8,9 +8,9 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message.html;
+package org.eclipse.jubula.communication.internal.message.html;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
/**
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/javafx/CAPJavaFXTestMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/javafx/CAPJavaFXTestMessage.java
index c042febd5..9a165ec14 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/javafx/CAPJavaFXTestMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/javafx/CAPJavaFXTestMessage.java
@@ -8,10 +8,10 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message.javafx;
+package org.eclipse.jubula.communication.internal.message.javafx;
-import org.eclipse.jubula.communication.message.CAPTestMessage;
-import org.eclipse.jubula.communication.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.CAPTestMessage;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
/**
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/swing/CAPSwingTestMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/swing/CAPSwingTestMessage.java
index a0746a013..d97a02a43 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/swing/CAPSwingTestMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/swing/CAPSwingTestMessage.java
@@ -8,10 +8,10 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message.swing;
+package org.eclipse.jubula.communication.internal.message.swing;
-import org.eclipse.jubula.communication.message.CAPTestMessage;
-import org.eclipse.jubula.communication.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.CAPTestMessage;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
/**
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/swt/CAPSwtTestMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/swt/CAPSwtTestMessage.java
index d0d1be705..f23b9c579 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/swt/CAPSwtTestMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/message/swt/CAPSwtTestMessage.java
@@ -8,10 +8,10 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.message.swt;
+package org.eclipse.jubula.communication.internal.message.swt;
-import org.eclipse.jubula.communication.message.CAPTestMessage;
-import org.eclipse.jubula.communication.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.CAPTestMessage;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
import org.eclipse.jubula.tools.internal.constants.CommandConstants;
/**
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/parser/MessageHeaderSerializer.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/parser/MessageHeaderSerializer.java
index ac4de0967..5398704df 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/parser/MessageHeaderSerializer.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/parser/MessageHeaderSerializer.java
@@ -8,10 +8,10 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.parser;
+package org.eclipse.jubula.communication.internal.parser;
import org.apache.commons.lang.Validate;
-import org.eclipse.jubula.communication.message.MessageHeader;
+import org.eclipse.jubula.communication.internal.message.MessageHeader;
import org.eclipse.jubula.tools.internal.exception.SerialisationException;
import org.eclipse.jubula.tools.internal.serialisation.IXmlSerializer;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/parser/MessageSerializer.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/parser/MessageSerializer.java
index 91f731937..2ed8b741a 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/parser/MessageSerializer.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/parser/MessageSerializer.java
@@ -8,11 +8,11 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.parser;
+package org.eclipse.jubula.communication.internal.parser;
import org.apache.commons.lang.Validate;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.MessageHeader;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.MessageHeader;
import org.eclipse.jubula.tools.internal.exception.SerialisationException;
import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.internal.serialisation.IXmlSerializer;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/writer/MessageWriter.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/writer/MessageWriter.java
index a2e514d59..72c412fe0 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/writer/MessageWriter.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/internal/writer/MessageWriter.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.communication.writer;
+package org.eclipse.jubula.communication.internal.writer;
import java.io.BufferedWriter;
import java.io.IOException;
diff --git a/org.eclipse.jubula.launch/src/org/eclipse/jubula/launch/AutLaunchUtils.java b/org.eclipse.jubula.launch/src/org/eclipse/jubula/launch/AutLaunchUtils.java
index c9e00a8b9..03fd9c3fd 100644
--- a/org.eclipse.jubula.launch/src/org/eclipse/jubula/launch/AutLaunchUtils.java
+++ b/org.eclipse.jubula.launch/src/org/eclipse/jubula/launch/AutLaunchUtils.java
@@ -22,7 +22,7 @@ import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jubula.client.autagent.handlers.ConnectToEmbeddedAutAgentHandler;
import org.eclipse.jubula.client.internal.AutAgentConnection;
import org.eclipse.jubula.client.internal.exceptions.ConnectionException;
-import org.eclipse.jubula.communication.Communicator;
+import org.eclipse.jubula.communication.internal.Communicator;
import org.eclipse.jubula.launch.i18n.Messages;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.handlers.IHandlerService;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java
index 00ffea16d..5a2ef7c14 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/AUTServer.java
@@ -20,12 +20,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.listener.ICommunicationErrorListener;
-import org.eclipse.jubula.communication.message.AUTServerStateMessage;
-import org.eclipse.jubula.communication.message.AUTStartMessage;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.listener.ICommunicationErrorListener;
+import org.eclipse.jubula.communication.internal.message.AUTServerStateMessage;
+import org.eclipse.jubula.communication.internal.message.AUTStartMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.rc.common.adaptable.AdapterFactoryRegistry;
import org.eclipse.jubula.rc.common.commands.AUTStartCommand;
import org.eclipse.jubula.rc.common.commands.ChangeAUTModeCommand;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTHighlightComponentCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTHighlightComponentCommand.java
index 338007185..0c83c2ced 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTHighlightComponentCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTHighlightComponentCommand.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.AUTHighlightComponentMessage;
-import org.eclipse.jubula.communication.message.AUTHighlightComponentResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.AUTHighlightComponentMessage;
+import org.eclipse.jubula.communication.internal.message.AUTHighlightComponentResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.rc.common.AUTServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTStartCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTStartCommand.java
index 40e7c0e63..1e4ac906f 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTStartCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AUTStartCommand.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.AUTStartMessage;
-import org.eclipse.jubula.communication.message.AUTStateMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.AUTStartMessage;
+import org.eclipse.jubula.communication.internal.message.AUTStateMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.rc.common.AUTServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractCapTestCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractCapTestCommand.java
index 7179de617..92213cd36 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractCapTestCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/AbstractCapTestCommand.java
@@ -13,13 +13,13 @@ package org.eclipse.jubula.rc.common.commands;
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.lang.Validate;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.CAPTestMessage;
-import org.eclipse.jubula.communication.message.CAPTestResponseMessage;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.MessageCap;
-import org.eclipse.jubula.communication.message.MessageParam;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.CAPTestMessage;
+import org.eclipse.jubula.communication.internal.message.CAPTestResponseMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.MessageParam;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.AUTServerConfiguration;
import org.eclipse.jubula.rc.common.exception.ComponentNotFoundException;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ActivateInspectorCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ActivateInspectorCommand.java
index 6c027ff55..8e40c89ec 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ActivateInspectorCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ActivateInspectorCommand.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.ActivateInspectorMessage;
-import org.eclipse.jubula.communication.message.ActivateInspectorResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.ActivateInspectorMessage;
+import org.eclipse.jubula.communication.internal.message.ActivateInspectorResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.logger.AutServerLogger;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ChangeAUTModeCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ChangeAUTModeCommand.java
index 09579a712..05739b3cb 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ChangeAUTModeCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ChangeAUTModeCommand.java
@@ -10,12 +10,12 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-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.communication.message.ServerShowDialogMessage;
-import org.eclipse.jubula.communication.message.ServerShowObservConsoleMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.AUTModeChangedMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.ServerShowDialogMessage;
+import org.eclipse.jubula.communication.internal.message.ServerShowObservConsoleMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.AUTServerConfiguration;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ConnectToClientCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ConnectToClientCommand.java
index c6404c85d..6ddcee8d6 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ConnectToClientCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ConnectToClientCommand.java
@@ -12,9 +12,9 @@ package org.eclipse.jubula.rc.common.commands;
import java.net.UnknownHostException;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.ConnectToClientMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.ConnectToClientMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.rc.common.AUTServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/EndTestExecutionCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/EndTestExecutionCommand.java
index 2c0e40d36..c1379da09 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/EndTestExecutionCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/EndTestExecutionCommand.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.EndTestExecutionMessage;
-import org.eclipse.jubula.communication.message.EndTestExecutionResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.EndTestExecutionMessage;
+import org.eclipse.jubula.communication.internal.message.EndTestExecutionResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/GetKeyboardLayoutNameCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/GetKeyboardLayoutNameCommand.java
index dcb238e17..adf2c0576 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/GetKeyboardLayoutNameCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/GetKeyboardLayoutNameCommand.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.GetKeyboardLayoutNameMessage;
-import org.eclipse.jubula.communication.message.GetKeyboardLayoutNameResponseMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.GetKeyboardLayoutNameMessage;
+import org.eclipse.jubula.communication.internal.message.GetKeyboardLayoutNameResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.tools.internal.constants.RcpAccessorConstants;
import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils;
import org.slf4j.Logger;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/InitTestExecutionCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/InitTestExecutionCommand.java
index 04e059d0a..065036e35 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/InitTestExecutionCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/InitTestExecutionCommand.java
@@ -10,9 +10,9 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.InitTestExecutionMessage;
-import org.eclipse.jubula.communication.message.Message;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.InitTestExecutionMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.driver.IRobot;
import org.eclipse.jubula.rc.common.driver.RobotConfiguration;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/MethodInvoker.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/MethodInvoker.java
index 6e24cba36..17311184d 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/MethodInvoker.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/MethodInvoker.java
@@ -15,8 +15,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.commons.beanutils.MethodUtils;
-import org.eclipse.jubula.communication.message.MessageCap;
-import org.eclipse.jubula.communication.message.MessageParam;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.MessageParam;
import org.eclipse.jubula.rc.common.exception.MethodParamException;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/MethodParams.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/MethodParams.java
index 5492b8689..fd795f566 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/MethodParams.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/MethodParams.java
@@ -14,7 +14,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.beanutils.ConvertUtils;
-import org.eclipse.jubula.communication.message.MessageParam;
+import org.eclipse.jubula.communication.internal.message.MessageParam;
import org.eclipse.jubula.rc.common.exception.MethodParamException;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/NullCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/NullCommand.java
index d10d5391f..1291957d9 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/NullCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/NullCommand.java
@@ -10,9 +10,9 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.NullMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.NullMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/PrepareForShutdownCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/PrepareForShutdownCommand.java
index f69fb735a..66840e173 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/PrepareForShutdownCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/PrepareForShutdownCommand.java
@@ -10,15 +10,15 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.connection.Connection;
-import org.eclipse.jubula.communication.listener.IErrorHandler;
-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.communication.message.MessageHeader;
-import org.eclipse.jubula.communication.message.PrepareForShutdownMessage;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.connection.Connection;
+import org.eclipse.jubula.communication.internal.listener.IErrorHandler;
+import org.eclipse.jubula.communication.internal.message.CAPTestResponseMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.MessageHeader;
+import org.eclipse.jubula.communication.internal.message.PrepareForShutdownMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.tools.internal.constants.AUTServerExitConstants;
import org.eclipse.jubula.tools.internal.constants.TimeoutConstants;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/SendAUTListOfSupportedComponentsCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/SendAUTListOfSupportedComponentsCommand.java
index c43afc330..b49b02149 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/SendAUTListOfSupportedComponentsCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/SendAUTListOfSupportedComponentsCommand.java
@@ -15,10 +15,10 @@ import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.AUTStartStateMessage;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.SendAUTListOfSupportedComponentsMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.AUTStartStateMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.SendAUTListOfSupportedComponentsMessage;
import org.eclipse.jubula.rc.common.AUTServerConfiguration;
import org.eclipse.jubula.tools.internal.xml.businessmodell.Component;
import org.eclipse.jubula.tools.internal.xml.businessmodell.ConcreteComponent;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ShowDialogResultCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ShowDialogResultCommand.java
index 59427c736..c5f35d9f1 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ShowDialogResultCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/ShowDialogResultCommand.java
@@ -10,11 +10,11 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.commands;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.ServerShowDialogResponseMessage;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.ServerShowDialogResponseMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.AUTServerConfiguration;
import org.eclipse.jubula.tools.internal.exception.CommunicationException;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/TakeScreenshotCommand.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/TakeScreenshotCommand.java
index d9ec57da9..b3053f0c7 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/TakeScreenshotCommand.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/commands/TakeScreenshotCommand.java
@@ -12,10 +12,10 @@ package org.eclipse.jubula.rc.common.commands;
import java.awt.image.BufferedImage;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.TakeScreenshotMessage;
-import org.eclipse.jubula.communication.message.TakeScreenshotResponseMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.TakeScreenshotMessage;
+import org.eclipse.jubula.communication.internal.message.TakeScreenshotResponseMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.tools.internal.serialisation.SerializedImage;
import org.slf4j.Logger;
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/MethodParamException.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/MethodParamException.java
index b71b58781..fea6c71d6 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/MethodParamException.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/exception/MethodParamException.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.jubula.rc.common.exception;
-import org.eclipse.jubula.communication.message.MessageParam;
+import org.eclipse.jubula.communication.internal.message.MessageParam;
/**
* Represents an exception during the method parameter evaluation.
diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/registration/AgentRegisterAut.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/registration/AgentRegisterAut.java
index 31eb667c3..a5b0957ba 100644
--- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/registration/AgentRegisterAut.java
+++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/registration/AgentRegisterAut.java
@@ -19,9 +19,9 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.connection.ConnectionState;
-import org.eclipse.jubula.communication.connection.DefaultSocket;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.connection.ConnectionState;
+import org.eclipse.jubula.communication.internal.connection.DefaultSocket;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.tools.internal.constants.TimingConstantsServer;
import org.eclipse.jubula.tools.internal.exception.JBVersionException;
diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/listener/MappingListener.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/listener/MappingListener.java
index 9967949e1..953395131 100644
--- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/listener/MappingListener.java
+++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/listener/MappingListener.java
@@ -21,7 +21,7 @@ import javafx.scene.input.KeyEvent;
import javafx.scene.input.MouseEvent;
import javafx.stage.Stage;
-import org.eclipse.jubula.communication.message.ObjectMappedMessage;
+import org.eclipse.jubula.communication.internal.message.ObjectMappedMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.exception.NoIdentifierForComponentException;
import org.eclipse.jubula.rc.common.logger.AutServerLogger;
diff --git a/org.eclipse.jubula.rc.rcp.common/META-INF/MANIFEST.MF b/org.eclipse.jubula.rc.rcp.common/META-INF/MANIFEST.MF
index 1754ad03f..5c6ebb1d7 100644
--- a/org.eclipse.jubula.rc.rcp.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.rc.rcp.common/META-INF/MANIFEST.MF
@@ -29,8 +29,8 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.apache.commons.beanutils,
org.apache.commons.lang,
- org.eclipse.jubula.communication,
- org.eclipse.jubula.communication.message,
+ org.eclipse.jubula.communication.internal,
+ org.eclipse.jubula.communication.internal.message,
org.eclipse.jubula.rc.common,
org.eclipse.jubula.rc.common.adaptable,
org.eclipse.jubula.rc.common.businessprocess,
diff --git a/org.eclipse.jubula.rc.rcp.e3/src/org/eclipse/jubula/rc/rcp/e3/gef/inspector/GefInspectorListenerAppender.java b/org.eclipse.jubula.rc.rcp.e3/src/org/eclipse/jubula/rc/rcp/e3/gef/inspector/GefInspectorListenerAppender.java
index 6879017df..beb411931 100644
--- a/org.eclipse.jubula.rc.rcp.e3/src/org/eclipse/jubula/rc/rcp/e3/gef/inspector/GefInspectorListenerAppender.java
+++ b/org.eclipse.jubula.rc.rcp.e3/src/org/eclipse/jubula/rc/rcp/e3/gef/inspector/GefInspectorListenerAppender.java
@@ -30,7 +30,7 @@ import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef.RootEditPart;
import org.eclipse.gef.palette.PaletteEntry;
import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.jubula.communication.message.InspectorComponentSelectedMessage;
+import org.eclipse.jubula.communication.internal.message.InspectorComponentSelectedMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.listener.IAutListenerAppender;
import org.eclipse.jubula.rc.common.logger.AutServerLogger;
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/AbstractAutSwingEventListener.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/AbstractAutSwingEventListener.java
index 13e845c7a..e8a00c6e9 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/AbstractAutSwingEventListener.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/AbstractAutSwingEventListener.java
@@ -20,8 +20,8 @@ import java.awt.event.ActionListener;
import javax.swing.SwingUtilities;
import javax.swing.Timer;
-import org.eclipse.jubula.communication.Communicator;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.Communicator;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.AUTServerConfiguration;
import org.eclipse.jubula.rc.common.commands.ChangeAUTModeCommand;
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/CheckListener.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/CheckListener.java
index 1bb1e75b7..fb25a7406 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/CheckListener.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/CheckListener.java
@@ -34,8 +34,8 @@ import javax.swing.JTree;
import javax.swing.text.JTextComponent;
import javax.swing.tree.TreePath;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
-import org.eclipse.jubula.communication.message.ServerShowDialogMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.ServerShowDialogMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.AUTServerConfiguration;
import org.eclipse.jubula.rc.common.Constants;
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/ComponentHandler.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/ComponentHandler.java
index 2493b5bd1..e6abe6afb 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/ComponentHandler.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/ComponentHandler.java
@@ -23,7 +23,7 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.commons.lang.SystemUtils;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.exception.ComponentNotFoundException;
import org.eclipse.jubula.rc.common.exception.ComponentNotManagedException;
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/MappingListener.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/MappingListener.java
index fefd1abd1..023b1364e 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/MappingListener.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/MappingListener.java
@@ -24,7 +24,7 @@ import java.util.Map;
import javax.swing.JList;
import javax.swing.plaf.basic.ComboPopup;
-import org.eclipse.jubula.communication.message.ObjectMappedMessage;
+import org.eclipse.jubula.communication.internal.message.ObjectMappedMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.AUTServerConfiguration;
import org.eclipse.jubula.rc.common.exception.ComponentNotFoundException;
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordActions.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordActions.java
index a4e71d100..3a0ffd5db 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordActions.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordActions.java
@@ -41,11 +41,11 @@ import javax.swing.text.JTextComponent;
import javax.swing.tree.TreePath;
import org.apache.commons.lang.StringUtils;
-import org.eclipse.jubula.communication.message.CAPRecordedMessage;
-import org.eclipse.jubula.communication.message.MessageCap;
-import org.eclipse.jubula.communication.message.MessageParam;
-import org.eclipse.jubula.communication.message.RecordActionMessage;
-import org.eclipse.jubula.communication.message.ShowObservInfoMessage;
+import org.eclipse.jubula.communication.internal.message.CAPRecordedMessage;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.MessageParam;
+import org.eclipse.jubula.communication.internal.message.RecordActionMessage;
+import org.eclipse.jubula.communication.internal.message.ShowObservInfoMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.Constants;
import org.eclipse.jubula.rc.common.exception.NoIdentifierForComponentException;
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordListener.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordListener.java
index 945f5172c..1c20d3654 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordListener.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordListener.java
@@ -46,7 +46,7 @@ import javax.swing.plaf.basic.ComboPopup;
import javax.swing.text.JTextComponent;
import javax.swing.tree.TreePath;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.exception.NoIdentifierForComponentException;
import org.eclipse.jubula.rc.common.logger.AutServerLogger;
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/SetKeyboardLayoutCommand.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/SetKeyboardLayoutCommand.java
index 5563ed169..0beef9958 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/SetKeyboardLayoutCommand.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/commands/SetKeyboardLayoutCommand.java
@@ -10,9 +10,9 @@
*******************************************************************************/
package org.eclipse.jubula.rc.swt.commands;
-import org.eclipse.jubula.communication.ICommand;
-import org.eclipse.jubula.communication.message.Message;
-import org.eclipse.jubula.communication.message.SetKeyboardLayoutMessage;
+import org.eclipse.jubula.communication.internal.ICommand;
+import org.eclipse.jubula.communication.internal.message.Message;
+import org.eclipse.jubula.communication.internal.message.SetKeyboardLayoutMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.swt.driver.RobotSwtImpl;
import org.slf4j.Logger;
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractAutSwtEventListener.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractAutSwtEventListener.java
index 228bac8a5..e4033d7fb 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractAutSwtEventListener.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/AbstractAutSwtEventListener.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.jubula.rc.swt.listener;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.AUTServerConfiguration;
import org.eclipse.jubula.rc.common.commands.ChangeAUTModeCommand;
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java
index c1019afd5..94b0979c8 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java
@@ -14,8 +14,8 @@ import java.awt.Point;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
-import org.eclipse.jubula.communication.message.ServerShowDialogMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.ServerShowDialogMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.AUTServerConfiguration;
import org.eclipse.jubula.rc.common.Constants;
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/ComponentHandler.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/ComponentHandler.java
index 86ad55f1e..2ab337553 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/ComponentHandler.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/ComponentHandler.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.jubula.rc.swt.listener;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.driver.IEventThreadQueuer;
import org.eclipse.jubula.rc.common.driver.IRunnable;
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/MappingListener.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/MappingListener.java
index 7627bde13..46901e43a 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/MappingListener.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/MappingListener.java
@@ -12,7 +12,7 @@ package org.eclipse.jubula.rc.swt.listener;
import java.util.Map;
-import org.eclipse.jubula.communication.message.ObjectMappedMessage;
+import org.eclipse.jubula.communication.internal.message.ObjectMappedMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.Constants;
import org.eclipse.jubula.rc.common.exception.NoIdentifierForComponentException;
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordActionsSWT.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordActionsSWT.java
index 21b97d526..8201a19a0 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordActionsSWT.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordActionsSWT.java
@@ -16,11 +16,11 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
-import org.eclipse.jubula.communication.message.CAPRecordedMessage;
-import org.eclipse.jubula.communication.message.MessageCap;
-import org.eclipse.jubula.communication.message.MessageParam;
-import org.eclipse.jubula.communication.message.RecordActionMessage;
-import org.eclipse.jubula.communication.message.ShowObservInfoMessage;
+import org.eclipse.jubula.communication.internal.message.CAPRecordedMessage;
+import org.eclipse.jubula.communication.internal.message.MessageCap;
+import org.eclipse.jubula.communication.internal.message.MessageParam;
+import org.eclipse.jubula.communication.internal.message.RecordActionMessage;
+import org.eclipse.jubula.communication.internal.message.ShowObservInfoMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.Constants;
import org.eclipse.jubula.rc.common.exception.NoIdentifierForComponentException;
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java
index 258651477..d25742556 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.jubula.rc.swt.listener;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.communication.internal.message.ChangeAUTModeMessage;
import org.eclipse.jubula.rc.common.AUTServer;
import org.eclipse.jubula.rc.common.Constants;
import org.eclipse.jubula.rc.common.exception.NoIdentifierForComponentException;

Back to the top