applying tuscany_2552_domain_search_phillipe_ramalho_08_08_2009.patch and tuscany_2552_domain_manager_phillipe_ramalho_08_08_2009.patch submitted to TUSCANY-2552

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@802637 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 5 deletions

diff --git a/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/CompositeDocumentProcessor.java b/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/CompositeDocumentProcessor.java
index f28d876d2e..79ac6e9958 100644
--- a/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/CompositeDocumentProcessor.java
+++ b/branches/sca-java-1.x/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/CompositeDocumentProcessor.java
@@ -15,11 +15,9 @@ public class CompositeDocumentProcessor implements DocumentProcessor {
 
 		if (object instanceof Composite) {
 			Composite composite = (Composite) object;
-			String uri = composite.getURI();
 			QName name = composite.getName();
-
-			uri = (uri == null ? "" : uri) + (name == null ? "" : name.toString());
-
+			String uri = (name == null ? "" : name.getNamespaceURI() + ';'  + name.getLocalPart());
+			
 			if (uri.length() == 0) {
 				uri = null;
 				
@@ -28,7 +26,7 @@ public class CompositeDocumentProcessor implements DocumentProcessor {
 			}
 			
 			if (uri != null) {
-				parent += DomainPathAnalyzer.PATH_SEPARATOR + SearchFields.COMPOSITE_FIELD + DomainPathAnalyzer.TYPE_SEPARATOR + composite.getURI() + DomainPathAnalyzer.URI_SEPARATOR + composite.getName();
+				parent += DomainPathAnalyzer.PATH_SEPARATOR + SearchFields.COMPOSITE_FIELD + DomainPathAnalyzer.TYPE_SEPARATOR + uri;
 			}
 			
 			for (Component component : composite.getComponents()) {