Author: dkulp
Date: Fri Aug 24 14:41:28 2012
New Revision: 1376947
URL: http://svn.apache.org/viewvc?rev=1376947&view=rev
Log:
Fill in the other probe matches
Modified:
cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
Modified:
cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java?rev=1376947&r1=1376946&r2=1376947&view=diff
==============================================================================
---
cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
(original)
+++
cxf/trunk/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
Fri Aug 24 14:41:28 2012
@@ -20,11 +20,13 @@
package org.apache.cxf.ws.discovery.internal;
import java.io.IOException;
+import java.net.URI;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.xml.bind.JAXBContext;
@@ -189,6 +191,47 @@ public class WSDiscoveryServiceImpl impl
return pmt;
}
+
+ private UUID toUUID(String scope) {
+ URI uri = URI.create(scope);
+ if (uri.getScheme() == null) {
+ return UUID.fromString(scope);
+ } else {
+ if (uri.getScheme().equals("urn")) {
+ uri = URI.create(uri.getSchemeSpecificPart());
+ }
+ if (uri.getScheme().equals("uuid")) {
+ return UUID.fromString(uri.getSchemeSpecificPart());
+ }
+ }
+ return null;
+ }
+
+ private boolean compare(String s, String s2) {
+ if (s != null) {
+ return s.equalsIgnoreCase(s2);
+ }
+ return false;
+ }
+ private boolean matchURIs(URI probe, URI target) {
+ if (compare(target.getScheme(), probe.getScheme())
+ && compare(target.getAuthority(), probe.getAuthority())) {
+ String[] ppath = probe.getPath().split("/");
+ String[] tpath = target.getPath().split("/");
+
+ if (ppath.length <= tpath.length) {
+ for (int i = 0; i < ppath.length; i++) {
+ if (!ppath[i].equals(tpath[i])) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+
private void matchScopes(ProbeType pt, List<HelloType> consider) {
if (pt.getScopes() == null || pt.getScopes().getValue().isEmpty()) {
return;
@@ -204,13 +247,49 @@ public class WSDiscoveryServiceImpl impl
boolean matches = false;
if
("http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/rfc3986".equals(mb)) {
- //FIXME
+ matches = true;
+ if (!pt.getScopes().getValue().isEmpty()) {
+ for (String ps : pt.getScopes().getValue()) {
+ boolean foundOne = false;
+ URI psuri = URI.create(ps);
+ for (String hts : ht.getScopes().getValue()) {
+ URI hturi = URI.create(hts);
+ if (matchURIs(psuri, hturi)) {
+ foundOne = true;
+ }
+ }
+ matches &= foundOne;
+ }
+ }
} else if
("http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/uuid".equals(mb)) {
- //FIXME
+ matches = true;
+ if (!pt.getScopes().getValue().isEmpty()) {
+ for (String ps : pt.getScopes().getValue()) {
+ boolean foundOne = false;
+ UUID psuuid = toUUID(ps);
+ for (String hts : ht.getScopes().getValue()) {
+ UUID htuuid = toUUID(hts);
+ if (!htuuid.equals(psuuid)) {
+ foundOne = true;
+ }
+ }
+ matches &= foundOne;
+ }
+ }
} else if
("http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ldap".equals(mb)) {
- //FIXME
+ //LDAP not supported
+ if (!pt.getScopes().getValue().isEmpty()) {
+ matches = false;
+ }
} else if
("http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/strcmp0".equals(mb)) {
- //FIXME
+ matches = true;
+ if (!pt.getScopes().getValue().isEmpty()) {
+ for (String s : pt.getScopes().getValue()) {
+ if (!ht.getScopes().getValue().contains(s)) {
+ matches = false;
+ }
+ }
+ }
} else if
("http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/none".equals(mb)
&& (ht.getScopes() == null ||
ht.getScopes().getValue().isEmpty())) {
matches = true;
