3 new revisions: Revision: 3c7407e9a105 Author: Mikko Korpela <[email protected]> Date: Wed Dec 14 03:28:00 2011 Log: package for java based timeout http://code.google.com/p/robotframework/source/detail?r=3c7407e9a105
Revision: 945af18f0261 Author: Mikko Korpela <[email protected]> Date: Wed Dec 14 03:50:46 2011 Log: Automated merge with https://code.google.com/p/robotframework/ http://code.google.com/p/robotframework/source/detail?r=945af18f0261 Revision: 630feb7206c4 Author: Mikko Korpela <[email protected]> Date: Wed Dec 14 04:01:31 2011 Log: remove timeoutjava for now. http://code.google.com/p/robotframework/source/detail?r=630feb7206c4 ============================================================================== Revision: 3c7407e9a105 Author: Mikko Korpela <[email protected]> Date: Wed Dec 14 03:28:00 2011 Log: package for java based timeout http://code.google.com/p/robotframework/source/detail?r=3c7407e9a105 Added: /src/robot/running/timeouts/timeoutjava.py Modified: /src/robot/running/timeouts/__init__.py ======================================= --- /dev/null +++ /src/robot/running/timeouts/timeoutjava.py Wed Dec 14 03:28:00 2011 @@ -0,0 +1,15 @@ +# Copyright 2008-2011 Nokia Siemens Networks Oyj +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from timeoutthread import Timeout ======================================= --- /src/robot/running/timeouts/__init__.py Mon Dec 12 06:41:18 2011 +++ /src/robot/running/timeouts/__init__.py Wed Dec 14 03:28:00 2011 @@ -20,7 +20,7 @@ elif os.name == 'nt': from timeoutwin import Timeout elif os.name == 'java': - from timeoutthread import Timeout + from timeoutjava import Timeout else: try: from timeoutsignaling import Timeout ============================================================================== Revision: 945af18f0261 Author: Mikko Korpela <[email protected]> Date: Wed Dec 14 03:50:46 2011 Log: Automated merge with https://code.google.com/p/robotframework/ http://code.google.com/p/robotframework/source/detail?r=945af18f0261 ============================================================================== Revision: 630feb7206c4 Author: Mikko Korpela <[email protected]> Date: Wed Dec 14 04:01:31 2011 Log: remove timeoutjava for now. http://code.google.com/p/robotframework/source/detail?r=630feb7206c4 Deleted: /src/robot/running/timeouts/timeoutjava.py Modified: /src/robot/running/timeouts/__init__.py ======================================= --- /src/robot/running/timeouts/timeoutjava.py Wed Dec 14 03:28:00 2011 +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2008-2011 Nokia Siemens Networks Oyj -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from timeoutthread import Timeout ======================================= --- /src/robot/running/timeouts/__init__.py Wed Dec 14 03:28:00 2011 +++ /src/robot/running/timeouts/__init__.py Wed Dec 14 04:01:31 2011 @@ -20,7 +20,7 @@ elif os.name == 'nt': from timeoutwin import Timeout elif os.name == 'java': - from timeoutjava import Timeout + from timeoutthread import Timeout else: try: from timeoutsignaling import Timeout
