From 1e115b3e972bb8c23504ee75ad8fb2e202a6758a Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Fri, 24 Apr 2015 09:51:50 +0200
Subject: [orber, cos*] Remove usage of erlang:now()

---
 lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl | 6 ++++--
 lib/cosProperty/src/cosProperty.erl                            | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'lib/cosProperty')

diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl
index 157b243c53..788518c7bb 100644
--- a/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl
+++ b/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2015. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -128,7 +128,9 @@
 %%              {stop, Reason}
 %%----------------------------------------------------------------------
 init({DefMode, AllowedTypes, AllowedProperties, InitProperties, MyType}) ->
-    Key = term_to_binary({now(), node()}),
+    Key = term_to_binary({{erlang:system_time(), 
+			   erlang:unique_integer()}, 
+			  node()}),
     _F = ?write_function(#oe_CosPropertyService{key=Key,
 						properties=InitProperties}),
     write_result(mnesia:transaction(_F)),
diff --git a/lib/cosProperty/src/cosProperty.erl b/lib/cosProperty/src/cosProperty.erl
index 2368ee3db6..57c35dedf9 100644
--- a/lib/cosProperty/src/cosProperty.erl
+++ b/lib/cosProperty/src/cosProperty.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2015. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -406,8 +406,9 @@ type_check(Obj, Mod) ->
 %% Effect   : 
 %%------------------------------------------------------------
 create_name(Type) ->
-    {MSec, Sec, USec} = erlang:now(),
-    lists:concat(['oe_',node(),'_',Type,'_',MSec, '_', Sec, '_', USec]).
+    Time = erlang:system_time(),
+    Unique = erlang:unique_integer([positive]),
+    lists:concat(['oe_',node(),'_',Type,'_',Time,'_',Unique]).
 
 %%--------------- END OF MODULE ------------------------------
 
-- 
cgit v1.2.3


From 9ca2c2fcc364ee320c61281cf0e89fdd120617c9 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars.thorsen@ericsson.com>
Date: Tue, 28 Apr 2015 08:12:05 +0200
Subject: [orber, cos*] Bump versions and update dependencies in app file

---
 lib/cosProperty/src/cosProperty.app.src | 2 +-
 lib/cosProperty/vsn.mk                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/cosProperty')

diff --git a/lib/cosProperty/src/cosProperty.app.src b/lib/cosProperty/src/cosProperty.app.src
index b977bb5984..7fad7a602a 100644
--- a/lib/cosProperty/src/cosProperty.app.src
+++ b/lib/cosProperty/src/cosProperty.app.src
@@ -43,5 +43,5 @@
   {env, []},
   {mod, {cosProperty, []}},
   {runtime_dependencies, ["stdlib-2.0","orber-3.6.27","mnesia-4.12",
-			  "kernel-3.0","erts-6.0"]}
+			  "kernel-3.0","erts-7.0"]}
 ]}.
diff --git a/lib/cosProperty/vsn.mk b/lib/cosProperty/vsn.mk
index 0f546a2da8..d96508c2d2 100644
--- a/lib/cosProperty/vsn.mk
+++ b/lib/cosProperty/vsn.mk
@@ -1,2 +1,2 @@
-COSPROPERTY_VSN = 1.1.17
+COSPROPERTY_VSN = 1.2
 
-- 
cgit v1.2.3


From e09dd66dc4d89c62ddfd8c19791f9678d5d787c6 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 12 May 2015 18:18:55 +0200
Subject: Prepare release

---
 lib/cosProperty/doc/src/notes.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'lib/cosProperty')

diff --git a/lib/cosProperty/doc/src/notes.xml b/lib/cosProperty/doc/src/notes.xml
index 739f41617f..1885a8fd6b 100644
--- a/lib/cosProperty/doc/src/notes.xml
+++ b/lib/cosProperty/doc/src/notes.xml
@@ -31,7 +31,23 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosProperty 1.1.17</title>
+  <section><title>cosProperty 1.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Remove the usage of erlang:now() from all Corba
+	    applications and use the new rand module instead of
+	    random. </p>
+          <p>
+	    Own Id: OTP-12687</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>cosProperty 1.1.17</title>
 
     <section><title>Improvements and New Features</title>
       <list>
-- 
cgit v1.2.3


From 9a81b28598fadc44bf506354c9227e41aac786f6 Mon Sep 17 00:00:00 2001
From: Henrik Nord <henrik@erlang.org>
Date: Wed, 13 May 2015 09:40:16 +0200
Subject: Revert "Prepare release"

This reverts commit e09dd66dc4d89c62ddfd8c19791f9678d5d787c6.
---
 lib/cosProperty/doc/src/notes.xml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'lib/cosProperty')

diff --git a/lib/cosProperty/doc/src/notes.xml b/lib/cosProperty/doc/src/notes.xml
index 1885a8fd6b..739f41617f 100644
--- a/lib/cosProperty/doc/src/notes.xml
+++ b/lib/cosProperty/doc/src/notes.xml
@@ -31,23 +31,7 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosProperty 1.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Remove the usage of erlang:now() from all Corba
-	    applications and use the new rand module instead of
-	    random. </p>
-          <p>
-	    Own Id: OTP-12687</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosProperty 1.1.17</title>
+  <section><title>cosProperty 1.1.17</title>
 
     <section><title>Improvements and New Features</title>
       <list>
-- 
cgit v1.2.3