5 files changed, 10 insertions, 7 deletions
diff --git a/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl b/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl
index e0d14299a3..e24bcb9a04 100644
--- a/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl
+++ b/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -169,6 +169,7 @@ create(_Self, _State, _TimeOut) ->
 %% Effect   : 
 %%------------------------------------------------------------
 
+-spec recreate(_, _, _) -> no_return().
 recreate(_Self, _State, #'CosTransactions_PropagationContext'{current = _C}) ->
     corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}).
 %recreate(Self, State, #'CosTransactions_PropagationContext'{current = C}) ->
diff --git a/lib/cosTransactions/src/ETraP_Server_impl.erl b/lib/cosTransactions/src/ETraP_Server_impl.erl
index 7b451e1762..5c7b5f6350 100644
--- a/lib/cosTransactions/src/ETraP_Server_impl.erl
+++ b/lib/cosTransactions/src/ETraP_Server_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -675,6 +675,7 @@ is_same_transaction(Self, {Env, Local}, Coordinator) ->
 %% Effect   :
 %%------------------------------------------------------------
 
+-spec is_related_transaction(_, _, _) -> no_return().
 is_related_transaction(_Self, {_Env, _Local}, _Coordinator) ->
     corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}).
 %    type_check(?tr_get_typeCheck(Env), ?tr_Coordinator,
@@ -689,6 +690,7 @@ is_related_transaction(_Self, {_Env, _Local}, _Coordinator) ->
 %% Effect   :
 %%------------------------------------------------------------
 
+-spec is_ancestor_transaction(_, _, _) -> no_return().
 is_ancestor_transaction(_Self, {_Env, _Local}, _Coordinator) ->
     corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}).
 %    type_check(?tr_get_typeCheck(Env), ?tr_Coordinator,
@@ -826,6 +828,7 @@ register_subtran_aware(Self, {Env, Local}, SubTrAwareResource) ->
 %% Effect   : 
 %%------------------------------------------------------------
 
+-spec register_synchronization(_, _, _) -> no_return().
 register_synchronization(_Self, {_Env, _Local}, _Synchronization) ->
     corba:raise(#'CosTransactions_SynchronizationUnavailable'{}).
 
@@ -950,6 +953,7 @@ create_subtransaction(Self, {Env, Local}) ->
 %% Effect   : 
 %%------------------------------------------------------------
 
+-spec get_txcontext(_, _) -> no_return().
 get_txcontext(_Self, {_Env, _Local}) ->
     corba:raise(#'CosTransactions_Unavailable'{}).
 
diff --git a/lib/cosTransactions/test/Makefile b/lib/cosTransactions/test/Makefile
index 3cdb05e7ef..9bcd461f04 100644
--- a/lib/cosTransactions/test/Makefile
+++ b/lib/cosTransactions/test/Makefile
@@ -93,13 +93,11 @@ ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosTransactions/ebin\
 ERL_COMPILE_FLAGS +=  \
 	$(ERL_IDL_FLAGS) \
 	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/lib/test_server/ebin \
 	-pa $(ERL_TOP)/lib/cosTransactions/ebin \
 	-pa $(ERL_TOP)/lib/cosTransactions/test/idl_output \
 	-I$(ERL_TOP)/lib/orber/include \
 	-I$(ERL_TOP)/lib/cosTransactions \
-	-I$(ERL_TOP)/lib/cosTransactions/test/$(IDLOUTDIR) \
-	-I$(ERL_TOP)/lib/test_server/include
+	-I$(ERL_TOP)/lib/cosTransactions/test/$(IDLOUTDIR)
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/cosTransactions/test/generated_SUITE.erl b/lib/cosTransactions/test/generated_SUITE.erl
index 9d5cfb154a..c4bd86a892 100644
--- a/lib/cosTransactions/test/generated_SUITE.erl
+++ b/lib/cosTransactions/test/generated_SUITE.erl
@@ -27,7 +27,7 @@
 
 -module(generated_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/cosTransactions/test/transactions_SUITE.erl b/lib/cosTransactions/test/transactions_SUITE.erl
index 0f06c3d262..63ec04f74f 100644
--- a/lib/cosTransactions/test/transactions_SUITE.erl
+++ b/lib/cosTransactions/test/transactions_SUITE.erl
@@ -29,7 +29,7 @@
 -include_lib("cosTransactions/include/CosTransactions.hrl").
 -include("etrap_test_lib.hrl").
  
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(default_timeout, ?t:minutes(20)).