- String url = _url.replace("/AAF_NS.", "/%C%CID%AAF_NS.");
- String root_ns = access.getProperty(Config.AAF_ROOT_NS, null);
- if(url.indexOf('%')>=0) {
- String str = access.getProperty(Config.AAF_LOCATOR_CONTAINER_ID, null);
- if(str==null) {
- url = url.replace("%CID","");
- } else {
- url = url.replace("%CID",str+'.');
- }
- str = access.getProperty(Config.AAF_LOCATOR_CONTAINER, null);
- if(str==null) {
- url = url.replace("%C","");
- } else {
- url = url.replace("%C",str+'.');
- }
-
- if (root_ns==null) {
- url = url.replace("%AAF_NS","");
- } else {
- url = url.replace("%AAF_NS",root_ns);
- }
- }
+// String url = _url.replace("/AAF_NS.", "/%C%CID%AAF_NS.");
+// String root_ns = access.getProperty(Config.AAF_ROOT_NS, null);
+ String url;
+ RegistrationPropHolder rph;
+ try {
+ rph = new RegistrationPropHolder(access, 0);
+ url = rph.replacements(_url, null, null);
+ } catch (UnknownHostException | CadiException e1) {
+ throw new LocatorException(e1);
+ }
+
+// if(url.indexOf('%')>=0) {
+// String str = access.getProperty(Config.AAF_LOCATOR_CONTAINER_ID, null);
+// if(str==null) {
+// url = url.replace("%CID","");
+// } else {
+// url = url.replace("%CID",str+'.');
+// }
+// str = access.getProperty(Config.AAF_LOCATOR_CONTAINER, null);
+// if(str==null) {
+// url = url.replace("%C","");
+// } else {
+// url = url.replace("%C",str+'.');
+// }
+//
+// if (root_ns==null) {
+// url = url.replace("%AAF_NS","");
+// } else {
+// url = url.replace("%AAF_NS",root_ns);
+// }
+// }