From 5159131a83573e7c99615cd37417365649006601 Mon Sep 17 00:00:00 2001 From: Niclas Eklund Date: Thu, 23 Sep 2010 10:45:47 +0200 Subject: Switched from using the deprecated regexp to re instead. --- lib/cosNotification/doc/src/notes.xml | 25 +++++++++++++++++ lib/cosNotification/src/cosNotification_Filter.erl | 32 +++++++++++----------- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml index 29879e95fb..5570660061 100644 --- a/lib/cosNotification/doc/src/notes.xml +++ b/lib/cosNotification/doc/src/notes.xml @@ -31,6 +31,31 @@ notes.xml +
+ cosNotification 1.1.14 +
+ Improvements and New Features + + +

+ Test suites published.

+

+ Own Id: OTP-8543 Aux Id:

+ + +
+ +
+ Fixed Bugs and Malfunctions + + +

Added missing trailing bracket to define in hrl-file.

+

Own id: OTP-8489 Aux Id:

+ + +
+
+
cosNotification 1.1.13 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; _-> -- cgit v1.2.3 From 02d774d80e6f85e665b4f28b78f5e307d46e2b0d Mon Sep 17 00:00:00 2001 From: Niclas Eklund Date: Thu, 23 Sep 2010 11:04:44 +0200 Subject: Added missing bracket. --- lib/cosNotification/src/CosNotification_Definitions.hrl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cosNotification/src/CosNotification_Definitions.hrl b/lib/cosNotification/src/CosNotification_Definitions.hrl index 755b07cd5d..9f4989838a 100644 --- a/lib/cosNotification/src/CosNotification_Definitions.hrl +++ b/lib/cosNotification/src/CosNotification_Definitions.hrl @@ -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 @@ -162,7 +162,7 @@ low_val=any:create(orber_tc:long(), ?not_MinConsumerEvents), high_val=any:create(orber_tc:long(), ?not_MaxConsumerEvents) }} -]. +]). -- cgit v1.2.3 From 8378fa2e70ed201cac4b57b7ef3ad7af8f80d3a5 Mon Sep 17 00:00:00 2001 From: Niclas Eklund Date: Thu, 23 Sep 2010 11:09:13 +0200 Subject: Uppdatet year in header. --- lib/cosNotification/doc/src/notes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml index 5570660061..ebca1f64db 100644 --- a/lib/cosNotification/doc/src/notes.xml +++ b/lib/cosNotification/doc/src/notes.xml @@ -4,7 +4,7 @@
- 20002009 + 20002010 Ericsson AB. All Rights Reserved. -- cgit v1.2.3 From cb02a519a697122d632d312f044dc1b12348380d Mon Sep 17 00:00:00 2001 From: Niclas Eklund Date: Wed, 27 Oct 2010 13:35:12 +0200 Subject: Fiex TR tag. --- lib/cosNotification/doc/src/notes.xml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml index ebca1f64db..70b3d98563 100644 --- a/lib/cosNotification/doc/src/notes.xml +++ b/lib/cosNotification/doc/src/notes.xml @@ -50,7 +50,7 @@

Added missing trailing bracket to define in hrl-file.

-

Own id: OTP-8489 Aux Id:

+

Own Id: OTP-8489 Aux Id:
@@ -64,15 +64,15 @@

Removed superfluous VT in the documentation.

-

Own id: OTP-8353 Aux Id:

+

Own Id: OTP-8353 Aux Id:

Removed superfluous backslash in the documentation.

-

Own id: OTP-8354 Aux Id:

+

Own Id: OTP-8354 Aux Id:

The documentation EIX file was not generated.

-

Own id: OTP-8355 Aux Id:

+

Own Id: OTP-8355 Aux Id:

 @@ -104,7 +104,7 @@

Obsolete guards, e.g. record vs is_record, has been changed to avoid compiler warnings.

-

Own id: OTP-7987

+

Own Id: OTP-7987

 @@ -118,7 +118,7 @@

Updated file headers.

-

Own id: OTP-7837 Aux Id:

+

Own Id: OTP-7837 Aux Id:

 @@ -132,7 +132,7 @@

Documentation source included in open source releases.

-

Own id: OTP-7595 Aux Id:

+

Own Id: OTP-7595 Aux Id:

 @@ -147,7 +147,7 @@

The CosNotification proxy objects ignored the gcLimit option, instead the gcTime value was used.

-

Own id: OTP-7553 Aux Id:

+

Own Id: OTP-7553 Aux Id:

 @@ -161,7 +161,7 @@

Updated file headers.

-

Own id: OTP-7011

+

Own Id: OTP-7011

 @@ -175,7 +175,7 @@

The documentation source has been converted from SGML to XML.

-

Own id: OTP-6754

+

Own Id: OTP-6754

 @@ -189,7 +189,7 @@

Minor Makefile changes.

-

Own id: OTP-6701

+

Own Id: OTP-6701

 @@ -203,7 +203,7 @@

Removed some unused code.

-

Own id: OTP-6527

+

Own Id: OTP-6527

 @@ -219,7 +219,7 @@

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.

-

Own id: OTP-5923

+

Own Id: OTP-5923

@@ -235,7 +235,7 @@

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.

-

Own id: OTP-5823 Aux Id: seq10143

+

Own Id: OTP-5823 Aux Id: seq10143

@@ -249,7 +249,7 @@

The app-file contained duplicated modules.

-

Own id: OTP-4976

+

Own Id: OTP-4976

 @@ -268,7 +268,7 @@ Interface Repository. It is necessary to re-compile all IDL-files and use COS-applications, including Orber, compiled with IC-4.2.

-

Own id: OTP-4576

+

Own Id: OTP-4576

-- cgit v1.2.3