Merge branch 'maint-r13' into maint-r14

Conflicts:
	lib/cosNotification/src/CosNotification_Definitions.hrl
	lib/cosNotification/vsn.mk
	lib/orber/vsn.mk

3 files changed, 72 insertions, 32 deletions

diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml
index de5a3e5f4c..04c0c2accd 100644
--- a/lib/cosNotification/doc/src/notes.xml
+++ b/lib/cosNotification/doc/src/notes.xml
@@ -31,6 +31,46 @@
     <file>notes.xml</file>
   </header>
 
+  <section><title>cosNotification 1.1.15</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Switched from using the deprecated regexp to re instead.</p>
+          <p>
+	    Own Id: OTP-8846</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section>
+    <title>cosNotification 1.1.14</title>
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Test suites published.</p>
+          <p>
+            Own Id: OTP-8543 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <list type="bulleted">
+        <item>
+          <p>Added missing trailing bracket to define in hrl-file.</p>
+          <p>Own Id: OTP-8489 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
   <section>
     <title>cosNotification 1.1.14</title>
     <section>
@@ -64,15 +104,15 @@
       <list type="bulleted">
         <item>
           <p>Removed superfluous VT in the documentation.</p>
-          <p>Own id: OTP-8353 Aux Id:</p>
+          <p>Own Id: OTP-8353 Aux Id:</p>
         </item>
         <item>
           <p>Removed superfluous backslash in the documentation.</p>
-          <p>Own id: OTP-8354 Aux Id:</p>
+          <p>Own Id: OTP-8354 Aux Id:</p>
         </item>
         <item>
           <p>The documentation EIX file was not generated.</p>
-          <p>Own id: OTP-8355 Aux Id:</p>
+          <p>Own Id: OTP-8355 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -104,7 +144,7 @@
         <item>
           <p>Obsolete guards, e.g. record vs is_record, has been changed
              to avoid compiler warnings.</p>
-          <p>Own id: OTP-7987</p>
+          <p>Own Id: OTP-7987</p>
         </item>
       </list>
     </section>
@@ -118,7 +158,7 @@
       <list type="bulleted">
         <item>
           <p>Updated file headers.</p>
-          <p>Own id: OTP-7837 Aux Id:</p>
+          <p>Own Id: OTP-7837 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -132,7 +172,7 @@
       <list type="bulleted">
         <item>
           <p>Documentation source included in open source releases.</p>
-          <p>Own id: OTP-7595 Aux Id:</p>
+          <p>Own Id: OTP-7595 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -147,7 +187,7 @@
         <item>
           <p>The CosNotification proxy objects ignored the gcLimit option, instead
              the gcTime value was used.</p>
-          <p>Own id: OTP-7553 Aux Id:</p>
+          <p>Own Id: OTP-7553 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -161,7 +201,7 @@
       <list type="bulleted">
         <item>
           <p>Updated file headers.</p>
-          <p>Own id: OTP-7011</p>
+          <p>Own Id: OTP-7011</p>
         </item>
       </list>
     </section>
@@ -175,7 +215,7 @@
       <list type="bulleted">
         <item>
           <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own id: OTP-6754</p>
+          <p>Own Id: OTP-6754</p>
         </item>
       </list>
     </section>
@@ -189,7 +229,7 @@
       <list type="bulleted">
         <item>
           <p>Minor Makefile changes.</p>
-          <p>Own id: OTP-6701</p>
+          <p>Own Id: OTP-6701</p>
         </item>
       </list>
     </section>
@@ -203,7 +243,7 @@
       <list type="bulleted">
         <item>
           <p>Removed some unused code.</p>
-          <p>Own id: OTP-6527</p>
+          <p>Own Id: OTP-6527</p>
         </item>
       </list>
     </section>
@@ -219,7 +259,7 @@
           <p>A user can now define the QoS EventReliability to be 
             Persistent. Note, this is only a lightweight version
             and events will be lost if a proxy is terminated.</p>
-          <p>Own id: OTP-5923</p>
+          <p>Own Id: OTP-5923</p>
         </item>
       </list>
     </section>
@@ -235,7 +275,7 @@
           <p>Possible to configure cosNotification not to type check,
             by invoking corba_object:is_a/2, supplied IOR:s. When
             a type check fails, the feedback has been improved.</p>
-          <p>Own id: OTP-5823 Aux Id: seq10143</p>
+          <p>Own Id: OTP-5823 Aux Id: seq10143</p>
         </item>
       </list>
     </section>
@@ -249,7 +289,7 @@
       <list type="bulleted">
         <item>
           <p>The app-file contained duplicated modules.</p>
-          <p>Own id: OTP-4976</p>
+          <p>Own Id: OTP-4976</p>
         </item>
       </list>
     </section>
@@ -268,7 +308,7 @@
             Interface Repository. It is necessary to re-compile all IDL-files
             and use COS-applications, including Orber, compiled with
             IC-4.2.</p>
-          <p>Own id: OTP-4576</p>
+          <p>Own Id: OTP-4576</p>
         </item>
       </list>
     </section>
diff --git a/lib/cosNotification/src/cosNotification_Filter.erl b/lib/cosNotification/src/cosNotification_Filter.erl
index dd3b5beb93..7201f7d6e2 100644
--- a/lib/cosNotification/src/cosNotification_Filter.erl
+++ b/lib/cosNotification/src/cosNotification_Filter.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -877,9 +877,9 @@ check_wildcard(Types, Which, WC, Domain, Type) ->
 	end,
     check_types(Types, Which, NewWC).
 
-%% Change '*' to '.*', see regexp:parse/2 documentation.
+%% Change '*' to '.*', see re:compile/1 documentation.
 convert_wildcard([], Acc) ->
-    case regexp:parse(lists:reverse(Acc)) of
+    case re:compile(lists:reverse(Acc)) of
 	{ok, Expr} ->
 	    Expr;
 	_ ->
@@ -900,37 +900,37 @@ match_types(_, _, []) ->
     false;
 match_types(Domain, Type, [{domain, WCDomain, Type}|T]) ->
     L=length(Domain),
-    case catch regexp:matches(Domain, WCDomain) of
-	{match, []} ->
+    case catch re:run(Domain, WCDomain) of
+	nomatch ->
 	    match_types(Domain, Type, T);
-	{match, [{1, L}]} ->
+	{match, [{0, L}]} ->
 	    true;
 	_->
 	    match_types(Domain, Type, T)
     end;
 match_types(Domain, Type, [{type, Domain, WCType}|T]) ->
     L=length(Type),
-    case catch regexp:matches(Type, WCType) of
-	{match, []} ->
+    case catch re:run(Type, WCType) of
+	nomatch ->
 	    match_types(Domain, Type, T);
-	{match, [{1, L}]} ->
+	{match, [{0, L}]} ->
 	    true;
 	_->
 	    match_types(Domain, Type, T)
     end;
 match_types(Domain, Type, [{both, WCDomain, WCType}|T]) ->
     L1=length(Domain),
-    case catch regexp:matches(Domain, WCDomain) of
-	{match, []} ->
+    case catch re:run(Domain, WCDomain) of
+	nomatch ->
 	    match_types(Domain, Type, T);
-	{match, [{1, L1}]} ->
+	{match, [{0, L1}]} ->
 	    L2=length(Type),
-	    case catch regexp:matches(Type, WCType) of
-		{match, []} ->
+	    case catch re:run(Type, WCType) of
+		nomatch ->
 		    match_types(Domain, Type, T);
-		{match, [{1, L2}]} ->
+		{match, [{0, L2}]} ->
 		    true;
-		_->
+		_ ->
 		    match_types(Domain, Type, T)
 	    end;
 	_->
diff --git a/lib/cosNotification/vsn.mk b/lib/cosNotification/vsn.mk
index c03f0ef161..cfd5948dfc 100644
--- a/lib/cosNotification/vsn.mk
+++ b/lib/cosNotification/vsn.mk
@@ -1 +1 @@
-COSNOTIFICATION_VSN = 1.1.14
+COSNOTIFICATION_VSN = 1.1.15