[prev in list] [next in list] [prev in thread] [next in thread] 

List:       juddi-cvs
Subject:    svn commit: r1241100 [26/41] - in /juddi/scout/site: ./ apidocs/ apidocs/org/apache/ws/scout/model/u
From:       kstam () apache ! org
Date:       2012-02-06 18:11:18
Message-ID: 20120206181152.49A402388C3E () eris ! apache ! org
[Download RAW message or body]

Modified: juddi/scout/site/cpd.xml
URL: http://svn.apache.org/viewvc/juddi/scout/site/cpd.xml?rev=1241100&r1=1241099&r2=1241100&view=diff
 ==============================================================================
--- juddi/scout/site/cpd.xml (original)
+++ juddi/scout/site/cpd.xml Mon Feb  6 18:10:50 2012
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pmd-cpd>
 <duplication lines="163" tokens="1071">
-<file line="285" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
                
-<file line="257" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
 +<file line="285" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
 +<file line="257" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         } catch (RegistryV3Exception e)
@@ -171,164 +171,9 @@
 ]]>
 </codefragment>
 </duplication>
-<duplication lines="147" tokens="755">
-<file line="247" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
                
-<file line="238" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
                
-<codefragment>
-<![CDATA[
-			log.debug("BindingTemplate=" + bt.toString());
-		} catch (Exception ud) {
-            throw new JAXRException("Apache JAXR Impl:", ud);
-        }
-        return bt;
-    }
-
-	public static PublisherAssertion getPubAssertionFromJAXRAssociation(
-			Association association) throws JAXRException {
-		PublisherAssertion pa = objectFactory.createPublisherAssertion();
-		try {
-			if (association.getSourceObject().getKey() != null && 
-				association.getSourceObject().getKey().getId() != null) {
-            pa.setFromKey(association.getSourceObject().getKey().getId());
-			}
-			
-			if (association.getTargetObject().getKey() != null &&
-				association.getTargetObject().getKey().getId() != null) {
-            pa.setToKey(association.getTargetObject().getKey().getId());
-			}
-            Concept c = association.getAssociationType();
-            String v = c.getValue();
-			KeyedReference kr = objectFactory.createKeyedReference();
-            Key key = c.getKey();
-			if (key == null) {
-				// TODO:Need to check this. If the concept is a predefined
-				// enumeration, the key can be the parent classification scheme
-                key = c.getClassificationScheme().getKey();
-            }
-			if (key != null && key.getId() != null) {
-				kr.setTModelKey(key.getId());
-			} 
-            kr.setKeyName("Concept");
-
-			if (v != null) {
-				kr.setKeyValue(v);
-			}
-
-            pa.setKeyedReference(kr);
-		} catch (Exception ud) {
-            throw new JAXRException("Apache JAXR Impl:", ud);
-        }
-        return pa;
-    }
-
-	public static PublisherAssertion getPubAssertionFromJAXRAssociationKey(
-			String key) throws JAXRException {
-		PublisherAssertion pa = objectFactory.createPublisherAssertion();
-		try {
-			StringTokenizer token = new StringTokenizer(key, ":");
-			if (token.hasMoreTokens()) {
-               pa.setFromKey(getToken(token.nextToken()));
-               pa.setToKey(getToken(token.nextToken()));
-				KeyedReference kr = objectFactory.createKeyedReference();
-				// Sometimes the Key is UUID:something
-               String str = getToken(token.nextToken());
-				if ("UUID".equals(str))
-					str += ":" + getToken(token.nextToken());
-               kr.setTModelKey(str);
-               kr.setKeyName(getToken(token.nextToken()));
-               kr.setKeyValue(getToken(token.nextToken()));
-               pa.setKeyedReference(kr);
-            }
-
-		} catch (Exception ud) {
-            throw new JAXRException("Apache JAXR Impl:", ud);
-        }
-        return pa;
-    }
-
-	public static BusinessService getBusinessServiceFromJAXRService(
-			Service service) throws JAXRException {
-		BusinessService bs = objectFactory.createBusinessService();
-		try {
-			InternationalString iname = service.getName();
-						
-			addNames(bs.getName(), iname);
-	         
-            InternationalString idesc = service.getDescription();
-    
-           addDescriptions(bs.getDescription(), idesc);
-
-            Organization o = service.getProvidingOrganization();
-
-            /*
-             * there may not always be a key...
-             */
-            if (o != null) {
-                Key k = o.getKey();
-
-				if (k != null && k.getId() != null) {
-                    bs.setBusinessKey(k.getId());
-                } 
-                    
-			} else {
-                /*
-                 * gmj - I *think* this is the right thing to do
-                 */
-				throw new JAXRException(
-						"Service has no associated organization");
-            }
-
-			if (service.getKey() != null && service.getKey().getId() != null) {
-                bs.setServiceKey(service.getKey().getId());
-            } else {
-                bs.setServiceKey("");
-            }
-
-            CategoryBag catBag = \
                getCategoryBagFromClassifications(service.getClassifications());
-            if (catBag!=null) {
-                bs.setCategoryBag(catBag);
-            }
-
-            //Add the ServiceBinding information
-            BindingTemplates bt = getBindingTemplates(service.getServiceBindings());
-            if (bt != null) {
-                bs.setBindingTemplates(bt);
-            }
-   		    
-            log.debug("BusinessService=" + bs.toString());
-		} catch (Exception ud) {
-            throw new JAXRException("Apache JAXR Impl:", ud);
-        }
-        return bs;
-    }
-
-	public static TModel getTModelFromJAXRClassificationScheme(
-			ClassificationScheme classificationScheme) throws JAXRException {
-		TModel tm = objectFactory.createTModel();
-		try {
-            /*
-             * a fresh scheme might not have a key
-             */
-
-            Key k = classificationScheme.getKey();
-
-            if (k != null && k.getId() != null) {
-                tm.setTModelKey(k.getId());
-            } else {
-                tm.setTModelKey("");
-            }
-
-            /*
-             * There's no reason to believe these are here either
-             */
-
-            Slot s = classificationScheme.getSlot("authorizedName");
-]]>
-</codefragment>
-</duplication>
 <duplication lines="157" tokens="732">
-<file line="763" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
                
-<file line="757" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
 +<file line="763" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
 +<file line="765" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
  <codefragment>
 <![CDATA[
        return uri;
@@ -492,8 +337,8 @@
 </codefragment>
 </duplication>
 <duplication lines="162" tokens="706">
-<file line="99" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="99" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="99" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="99" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
     public BusinessLifeCycleManagerV3Impl(RegistryService registry) {
@@ -662,8 +507,8 @@
 </codefragment>
 </duplication>
 <duplication lines="209" tokens="653">
-<file line="147" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryException.java"/>
                
-<file line="143" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Exception.java"/>
 +<file line="147" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryException.java"/>
 +<file line="143" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryV3Exception.java"/>
  <codefragment>
 <![CDATA[
   RegistryV3Exception(String fCode,int errno,String msg)
@@ -879,8 +724,8 @@
 </codefragment>
 </duplication>
 <duplication lines="103" tokens="612">
-<file line="493" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
                
-<file line="437" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
 +<file line="489" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="472" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
  <codefragment>
 <![CDATA[
 			}
@@ -990,8 +835,8 @@
 </codefragment>
 </duplication>
 <duplication lines="118" tokens="515">
-<file line="551" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
                
-<file line="543" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
 +<file line="551" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
 +<file line="551" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
  <codefragment>
 <![CDATA[
 						.getBusinessServiceFromJAXRService((Service) iter
@@ -1116,8 +961,8 @@
 </codefragment>
 </duplication>
 <duplication lines="68" tokens="501">
-<file line="171" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
                
-<file line="158" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
 +<file line="171" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
 +<file line="158" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
  <codefragment>
 <![CDATA[
                 accessPoint.setUseType(getUseType(accessuri));
@@ -1192,8 +1037,8 @@
 </codefragment>
 </duplication>
 <duplication lines="79" tokens="480">
-<file line="458" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
                
-<file line="450" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
 +<file line="458" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
 +<file line="458" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
  <codefragment>
 <![CDATA[
                 tm.getOverviewDoc().add(getOverviewDocFromExternalLink((ExternalLink)externalLinks.iterator().next()));
 @@ -1278,183 +1123,240 @@
 ]]>
 </codefragment>
 </duplication>
-<duplication lines="81" tokens="406">
-<file line="301" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
                
-<file line="259" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
 +<duplication lines="91" tokens="391">
+<file line="303" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
 +<file line="302" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
  <codefragment>
 <![CDATA[
-			}
-		}
-		//External Links
-		DiscoveryURLs durls = entity.getDiscoveryURLs();
-		if (durls != null)
-		{
-			List<DiscoveryURL> discoveryURL_List = durls.getDiscoveryURL();
-			for (DiscoveryURL discoveryURL : discoveryURL_List) {
-				ExternalLink link = new ExternalLinkImpl(lifeCycleManager);
-				link.setExternalURI(discoveryURL.getValue());
-				org.addExternalLink(link);
-			}
-		}
-
-		org.addExternalIdentifiers(getExternalIdentifiers(entity.getIdentifierBag(), \
                lifeCycleManager));
-		org.addClassifications(getClassifications(entity.getCategoryBag(), \
                lifeCycleManager));
-
-		return org;
-	}
+				if ("UUID".equalsIgnoreCase(str))
+					str += ":" + getToken(token.nextToken());
+               kr.setTModelKey(str);
+               kr.setKeyName(getToken(token.nextToken()));
+               kr.setKeyValue(getToken(token.nextToken()));
+               pa.setKeyedReference(kr);
+            }
 
-	private static PostalAddress getPostalAddress(AddressLine[] addressLineArr) throws \
                JAXRException {
-		PostalAddress pa = new PostalAddressImpl();
-		HashMap<String, String> hm = new HashMap<String, String>();
-		for (AddressLine anAddressLineArr : addressLineArr) {
-			hm.put(anAddressLineArr.getKeyName(), anAddressLineArr.getKeyValue());
-		}
+		} catch (Exception ud) {
+            throw new JAXRException("Apache JAXR Impl:", ud);
+        }
+        return pa;
+    }
 
-		if (hm.containsKey("STREET_NUMBER")) {
-			pa.setStreetNumber(hm.get("STREET_NUMBER"));
-		}
+	public static BusinessService getBusinessServiceFromJAXRService(
+			Service service) throws JAXRException {
+		BusinessService bs = objectFactory.createBusinessService();
+		try {
+			InternationalString iname = service.getName();
+						
+			addNames(bs.getName(), iname);
+	         
+            InternationalString idesc = service.getDescription();
+    
+           addDescriptions(bs.getDescription(), idesc);
 
-		if (hm.containsKey("STREET")) {
-			pa.setStreet(hm.get("STREET"));
-		}
+            Organization o = service.getProvidingOrganization();
 
-		if (hm.containsKey("CITY")) {
-			pa.setCity(hm.get("CITY"));
-		}
+            /*
+             * there may not always be a key...
+             */
+            if (o != null) {
+                Key k = o.getKey();
 
-		if (hm.containsKey("COUNTRY")) {
-			pa.setCountry(hm.get("COUNTRY"));
-		}
+				if (k != null && k.getId() != null) {
+                    bs.setBusinessKey(k.getId());
+                } 
+                    
+			} else {
+                /*
+                 * gmj - I *think* this is the right thing to do
+                 */
+				throw new JAXRException(
+						"Service has no associated organization");
+            }
 
-		if (hm.containsKey("POSTALCODE")) {
-			pa.setPostalCode(hm.get("POSTALCODE"));
-		}
+			if (service.getKey() != null && service.getKey().getId() != null) {
+                bs.setServiceKey(service.getKey().getId());
+            } else {
+                bs.setServiceKey("");
+            }
 
-		if (hm.containsKey("STATE")) {
-			pa.setStateOrProvince(hm.get("STATE"));
-		}
+            CategoryBag catBag = \
getCategoryBagFromClassifications(service.getClassifications()); +            if \
(catBag!=null) { +                bs.setCategoryBag(catBag);
+            }
 
-		return pa;
-	}
+            //Add the ServiceBinding information
+            BindingTemplates bt = getBindingTemplates(service.getServiceBindings());
+            if (bt != null) {
+                bs.setBindingTemplates(bt);
+            }
+   		    
+            log.debug("BusinessService=" + bs.toString());
+		} catch (Exception ud) {
+            throw new JAXRException("Apache JAXR Impl:", ud);
+        }
+        return bs;
+    }
 
-	private static InternationalString getIString(String lang, String str, \
                LifeCycleManager lifeCycleManager)
-	throws JAXRException
-	{
-		if (str!=null) {
-			return lifeCycleManager.createInternationalString(getLocale(lang), str);
-		} else {
-			return null;
-		}
-	}
+	public static TModel getTModelFromJAXRClassificationScheme(
+			ClassificationScheme classificationScheme) throws JAXRException {
+		TModel tm = objectFactory.createTModel();
+		try {
+            /*
+             * a fresh scheme might not have a key
+             */
 
-	public static InternationalString getIString(String str, LifeCycleManager \
                lifeCycleManager)
-	throws JAXRException
-	{
-		return lifeCycleManager.createInternationalString(str);
-	}
+            Key k = classificationScheme.getKey();
 
-	public static Service getService(BusinessService businessService, LifeCycleManager \
                lifeCycleManager)
-	throws JAXRException
-	{
-		Service serve = new ServiceImpl(lifeCycleManager);
+            if (k != null && k.getId() != null) {
+                tm.setTModelKey(k.getId());
+            } else {
+                tm.setTModelKey("");
+            }
 
-		String keystr = businessService.getServiceKey();
+            /*
+             * There's no reason to believe these are here either
+             */
 
-		if (keystr != null)
-		{
-			serve.setKey(lifeCycleManager.createKey(keystr));
-		}
+            Slot s = classificationScheme.getSlot("authorizedName");
 ]]>
 </codefragment>
 </duplication>
-<duplication lines="77" tokens="348">
-<file line="150" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
                
-<file line="153" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
 +<duplication lines="57" tokens="363">
+<file line="247" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
 +<file line="246" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
  <codefragment>
 <![CDATA[
-	public RegistryV3Impl(Properties props) {
-		super();
+			log.debug("BindingTemplate=" + bt.toString());
+		} catch (Exception ud) {
+            throw new JAXRException("Apache JAXR Impl:", ud);
+        }
+        return bt;
+    }
 
-		this.init(props);
-	}
+	public static PublisherAssertion getPubAssertionFromJAXRAssociation(
+			Association association) throws JAXRException {
+		PublisherAssertion pa = objectFactory.createPublisherAssertion();
+		try {
+			if (association.getSourceObject().getKey() != null && 
+				association.getSourceObject().getKey().getId() != null) {
+            pa.setFromKey(association.getSourceObject().getKey().getId());
+			}
+			
+			if (association.getTargetObject().getKey() != null &&
+				association.getTargetObject().getKey().getId() != null) {
+            pa.setToKey(association.getTargetObject().getKey().getId());
+			}
+            Concept c = association.getAssociationType();
+            String v = c.getValue();
+			KeyedReference kr = objectFactory.createKeyedReference();
+            Key key = c.getKey();
+			if (key == null) {
+				// TODO:Need to check this. If the concept is a predefined
+				// enumeration, the key can be the parent classification scheme
+                key = c.getClassificationScheme().getKey();
+            }
+			if (key != null && key.getId() != null) {
+				kr.setTModelKey(key.getId());
+			} 
+            kr.setKeyName("Concept");
 
-	/**
-	 * 
-	 */
-	private void init(Properties props) {
-		// We need to have a non-null Properties
-		// instance so initialization takes place.
-		if (props == null)
-			props = new Properties();
+			if (v != null) {
+				kr.setKeyValue(v);
+			}
+
+            pa.setKeyedReference(kr);
+		} catch (Exception ud) {
+            throw new JAXRException("Apache JAXR Impl:", ud);
+        }
+        return pa;
+    }
 
-		// Override defaults with specific specific values
+	public static PublisherAssertion getPubAssertionFromJAXRAssociationKey(
+			String key) throws JAXRException {
+		PublisherAssertion pa = objectFactory.createPublisherAssertion();
 		try {
-			String iURL = props.getProperty(INQUIRY_ENDPOINT_PROPERTY_NAME);
-			if (iURL != null)
-				this.setInquiryURI(new URI(iURL));
-			else
-				this.setInquiryURI(new URI(DEFAULT_INQUIRY_ENDPOINT));
-
-			String pURL = props.getProperty(PUBLISH_ENDPOINT_PROPERTY_NAME);
-			if (pURL != null)
-				this.setPublishURI(new URI(pURL));
-			else
-				this.setPublishURI(new URI(DEFAULT_PUBLISH_ENDPOINT));
-
-			String sURL = props.getProperty(SECURITY_ENDPOINT_PROPERTY_NAME);
-			if (sURL != null)
-				this.setSecurityURI(new URI(sURL));
-			else
-				this.setSecurityURI(new URI(DEFAULT_SECURITY_ENDPOINT));
-			
-			String aURL = props.getProperty(ADMIN_ENDPOINT_PROPERTY_NAME);
-			if (aURL != null)
-				this.setAdminURI(new URI(aURL));
-			else
-				this.setAdminURI(new URI(DEFAULT_ADMIN_ENDPOINT));
-		} catch (URISyntaxException muex) {
-			throw new RuntimeException(muex);
+			StringTokenizer token = new StringTokenizer(key, "|");
+			if (token.hasMoreTokens()) {
+               pa.setFromKey(getToken(token.nextToken()));
+               pa.setToKey(getToken(token.nextToken()));
+				KeyedReference kr = objectFactory.createKeyedReference();
+				// Sometimes the Key is UUID:something
+               String str = getToken(token.nextToken());
+				if ("UUID".equalsIgnoreCase(str))
+]]>
+</codefragment>
+</duplication>
+<duplication lines="59" tokens="328">
+<file line="411" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="393" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
 +<codefragment>
+<![CDATA[
 		}
+		serve.addClassifications(getClassifications(businessService.getCategoryBag(), \
lifeCycleManager));  
-		String secProvider = props.getProperty(SECURITY_PROVIDER_PROPERTY_NAME);
-		if (secProvider != null)
-			this.setSecurityProvider(secProvider);
-		else
-			this.setSecurityProvider(DEFAULT_SECURITY_PROVIDER);
+		return serve;
+	}
 
-		String protoHandler = props.getProperty(PROTOCOL_HANDLER_PROPERTY_NAME);
-		if (protoHandler != null)
-			this.setProtocolHandler(protoHandler);
-		else
-			this.setProtocolHandler(DEFAULT_PROTOCOL_HANDLER);
+	public static Service getService(ServiceInfo serviceInfo, LifeCycleManager \
lifeCycleManager) +	throws JAXRException
+	{
+		Service service = new ServiceImpl(lifeCycleManager);
 
-		String uddiVer = props.getProperty(UDDI_VERSION_PROPERTY_NAME);
-		if (uddiVer != null)
-			this.setUddiVersion(uddiVer);
-		else
-			this.setUddiVersion(DEFAULT_UDDI_VERSION);
+		String keystr = serviceInfo.getServiceKey();
 
-		String uddiNS = props.getProperty(UDDI_NAMESPACE_PROPERTY_NAME);
-		if (uddiNS != null)
-			this.setUddiNamespace(uddiNS);
-		else
-			this.setUddiNamespace(DEFAULT_UDDI_NAMESPACE);
+		if (keystr != null)
+		{
+			service.setKey(lifeCycleManager.createKey(keystr));
+		}
 
-		String transClass = props.getProperty(TRANSPORT_CLASS_PROPERTY_NAME);
-		if (transClass != null)
-			this.setTransport(this.getTransport(transClass));
-		else
-			this.setTransport(this.getTransport(DEFAULT_TRANSPORT_CLASS));
-		
-		try
+		List<Name> namesList = serviceInfo.getName();
+		InternationalString is = null;
+		for (Name n : namesList) {
+			if (is == null) {
+				is = lifeCycleManager.createInternationalString(getLocale(n.getLang()), \
n.getValue()); +			} else {
+				is.setValue(getLocale(n.getLang()), n.getValue());
+			}
+		}
+		service.setName(is);
+		return service;
+	}
+
+	public static ServiceBinding getServiceBinding(BindingTemplate businessTemplate, \
LifeCycleManager lifeCycleManager) +	throws JAXRException
+	{
+		ServiceBinding serviceBinding = new ServiceBindingImpl(lifeCycleManager);
+
+		String keystr = businessTemplate.getServiceKey();
+		if (keystr != null)
 		{
-			JAXBContext v3context = \
JAXBContextUtil.getContext(JAXBContextUtil.UDDI_V3_VERSION); +			Service svc = new \
ServiceImpl(lifeCycleManager); +			svc.setKey(lifeCycleManager.createKey(keystr));
+			((ServiceBindingImpl)serviceBinding).setService(svc);
+		}
+		String bindingKey = businessTemplate.getBindingKey();
+		if(bindingKey != null) serviceBinding.setKey(new KeyImpl(bindingKey));
+
+		//Access URI
+		AccessPoint access = businessTemplate.getAccessPoint();
+		if (access != null) serviceBinding.setAccessURI(access.getValue());
+
+		//Description
+		Description desc = null;
+		if (businessTemplate.getDescription().size()>0) desc = \
businessTemplate.getDescription().get(0); +		if (desc!=null) {
+			serviceBinding.setDescription(new InternationalStringImpl(desc.getValue()));
+		}
+		/**Section D.10 of JAXR 1.0 Specification */
+
+		TModelInstanceDetails details = businessTemplate.getTModelInstanceDetails();
 ]]>
 </codefragment>
 </duplication>
 <duplication lines="68" tokens="318">
-<file line="684" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
                
-<file line="678" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
 +<file line="684" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
 +<file line="686" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
  <codefragment>
 <![CDATA[
 				addarr[addarrPos] = ScoutJaxrUddiV3Helper.getAddress(post);
@@ -1528,192 +1430,9 @@
 ]]>
 </codefragment>
 </duplication>
-<duplication lines="73" tokens="318">
-<file line="964" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
                
-<file line="939" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
                
-<codefragment>
-<![CDATA[
-            } catch (RegistryV3Exception re) {
-            	throw new JAXRException(re);
-            }
-            return new BulkResponseImpl(orgs);
-        }
-        else if (LifeCycleManager.SERVICE.equalsIgnoreCase(id)) {
-            List<String> a = new ArrayList<String>();
-            a.add("%");
-
-            BulkResponse br = this.findServices(null,null, a, null, null);
-
-            return br;
-        }
-        else
-        {
-            throw new JAXRException("Unsupported type for getRegistryObjects() :" + \
                id);
-        }
-
-    }
-
-    static FindQualifiers mapFindQualifiers(Collection jaxrQualifiers) throws \
                UnsupportedCapabilityException
-    {
-        if (jaxrQualifiers == null)
-        {
-            return null;
-        }
-        FindQualifiers result = objectFactory.createFindQualifiers();
-        for (Iterator i = jaxrQualifiers.iterator(); i.hasNext();)
-        {
-            String jaxrQualifier = (String) i.next();
-            String juddiQualifier = jaxrQualifier;
-            if (juddiQualifier == null)
-            {
-                throw new UnsupportedCapabilityException("jUDDI does not support \
                FindQualifer: " + jaxrQualifier);
-            }
-            result.getFindQualifier().add(juddiQualifier);
-        }
-        return result;
-    }
-
-    static Name[] mapNamePatterns(Collection namePatterns)
-        throws JAXRException
-    {
-        if (namePatterns == null)
-            return null;
-        Name[] result = new Name[namePatterns.size()];
-        int currLoc = 0;
-        for (Iterator i = namePatterns.iterator(); i.hasNext();)
-        {
-            Object obj = i.next();
-            Name name = objectFactory.createName();
-            if (obj instanceof String) {
-                name.setValue((String)obj);
-            } else if (obj instanceof LocalizedString) {
-                LocalizedString ls = (LocalizedString)obj;
-                name.setValue(ls.getValue());
-                name.setLang(ls.getLocale().getLanguage());
-            }
-            result[currLoc] = name;
-            currLoc++;
-        }
-        return result;
-    }
-
-   /**
-     * Get the Auth Token from the registry
-     *
-     * @param connection
-     * @param ireg
-     * @return auth token
-     * @throws JAXRException
-     */
-    private AuthToken getAuthToken(ConnectionImpl connection, IRegistryV3 ireg)
-]]>
-</codefragment>
-</duplication>
-<duplication lines="94" tokens="317">
-<file line="1151" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
                
-<file line="1160" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
                
-<codefragment>
-<![CDATA[
-			throws RegistryV3Exception {
-		SaveTModel request = this.objectFactory.createSaveTModel();
-
-		if (authInfo != null) {
-			request.setAuthInfo(authInfo);
-		}
-
-		if (tModelArray != null) {
-			request.getTModel().addAll(Arrays.asList(tModelArray));
-		}
-
-        TModelDetail tmd;
-        JAXBElement<?> o = execute(this.objectFactory.createSaveTModel(request), 
-        		this.getPublishURI());
-        tmd = (TModelDetail) o.getValue();
-        return tmd;
-	}
-
-	/**
-	 * Returns an implementation of Transport based on the className passed in.
-	 * If a null value is passed then the default Transport implementation
-	 * "org.apache.ws.scout.transport.AxisTransport" is created and returned.
-	 * 
-	 * @return Transport
-	 */
-	public Transport getTransport(String className) {
-		Transport transport = null;
-		Class transportClass = null;
-
-		// If a Transport class name isn't supplied use
-		// the default Transport implementation.
-		if (className == null)
-			className = DEFAULT_TRANSPORT_CLASS;
-
-		try {
-			// instruct class loader to load the TransportFactory
-			transportClass = getClassForName(className);
-		} catch (ClassNotFoundException cnfex) {
-			throw new RuntimeException(cnfex);
-		}
-
-		try {
-			// try to instantiate the TransportFactory
-			transport = (Transport) transportClass.newInstance();
-		} catch (Exception ex) {
-			throw new RuntimeException(ex);
-		}
-
-		return transport;
-	}
-
-	/**
-	 * 
-	 * @param name
-	 * @return The class object for the name given
-	 * @throws ClassNotFoundException
-	 * @throws NoClassDefFoundError
-	 */
-	public static Class getClassForName(String name)
-			throws ClassNotFoundException, NoClassDefFoundError {
-		Class clazz = null;
-
-		try {
-			// log.info("Using the Context ClassLoader");
-			ClassLoader ccl = AccessController.doPrivileged(new \
                PrivilegedAction<ClassLoader>() 
-		    {
-				public ClassLoader run() {
-					return Thread.currentThread().getContextClassLoader();
-		        }
-			});
-			
-			clazz = Class.forName(name, true, ccl);
-		} catch (Exception e) {
-			 log.debug("Failed to load the class " + name + " with context class loader " + \
                e);
-		}
-
-		if (null == clazz) {
-			ClassLoader scl = AccessController.doPrivileged(new \
                PrivilegedAction<ClassLoader>()
-			{ 
-				public ClassLoader run() {
-					return ClassLoader.getSystemClassLoader();
-				}
-			});
-
-			try {
-				clazz = Class.forName(name, true, scl);
-			} catch (Exception e) {
-		          throw new RuntimeException(e);
-			}
-		}
-
-		return clazz;
-	}
-}
-]]>
-</codefragment>
-</duplication>
 <duplication lines="42" tokens="309">
-<file line="925" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="954" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="925" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="954" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         return ScoutUddiV3JaxrHelper.getOrganization(bizDetail, this);
@@ -1762,8 +1481,8 @@
 </codefragment>
 </duplication>
 <duplication lines="49" tokens="289">
-<file line="773" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="799" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="773" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="799" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
                 log.debug("Ignoring exception " + e.getMessage(),e);
@@ -1793,7 +1512,7 @@
                 keyarr[currLoc] = key.getId();
                 currLoc++;
             }
-            // Save business
+            // Delete operation
             DispositionReport bd = (DispositionReport) executeOperation(keyarr, op);
             List<Result> resultList = bd.getResult();
             keyResultArr = new Result[resultList.size()];
@@ -1819,8 +1538,8 @@
 </codefragment>
 </duplication>
 <duplication lines="43" tokens="274">
-<file line="270" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="269" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="270" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="269" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
                 catch (RegistryV3Exception e) {
@@ -1869,9 +1588,76 @@
 ]]>
 </codefragment>
 </duplication>
+<duplication lines="59" tokens="264">
+<file line="322" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="306" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
 +<codefragment>
+<![CDATA[
+			hm.put(anAddressLineArr.getKeyName(), anAddressLineArr.getValue());
+		}
+
+		if (hm.containsKey("STREET_NUMBER")) {
+			pa.setStreetNumber(hm.get("STREET_NUMBER"));
+		}
+
+		if (hm.containsKey("STREET")) {
+			pa.setStreet(hm.get("STREET"));
+		}
+
+		if (hm.containsKey("CITY")) {
+			pa.setCity(hm.get("CITY"));
+		}
+
+		if (hm.containsKey("COUNTRY")) {
+			pa.setCountry(hm.get("COUNTRY"));
+		}
+
+		if (hm.containsKey("POSTALCODE")) {
+			pa.setPostalCode(hm.get("POSTALCODE"));
+		}
+
+		if (hm.containsKey("STATE")) {
+			pa.setStateOrProvince(hm.get("STATE"));
+		}
+
+		return pa;
+	}
+
+	private static InternationalString getIString(String lang, String str, \
LifeCycleManager lifeCycleManager) +	throws JAXRException
+	{
+		if (str!=null) {
+			return lifeCycleManager.createInternationalString(getLocale(lang), str);
+		} else {
+			return null;
+		}
+	}
+
+	public static InternationalString getIString(String str, LifeCycleManager \
lifeCycleManager) +	throws JAXRException
+	{
+		return lifeCycleManager.createInternationalString(str);
+	}
+
+	public static Service getService(BusinessService businessService, LifeCycleManager \
lifeCycleManager) +	throws JAXRException
+	{
+		Service serve = new ServiceImpl(lifeCycleManager);
+
+		String keystr = businessService.getServiceKey();
+
+		if (keystr != null)
+		{
+			serve.setKey(lifeCycleManager.createKey(keystr));
+		}
+
+		List<Name> namesList = businessService.getName();
+]]>
+</codefragment>
+</duplication>
 <duplication lines="38" tokens="262">
-<file line="265" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
                
-<file line="222" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
 +<file line="261" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="245" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
  <codefragment>
 <![CDATA[
 				user.setType(contact.getUseType());
@@ -1916,8 +1702,8 @@
 </codefragment>
 </duplication>
 <duplication lines="53" tokens="252">
-<file line="34" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryException.java"/>
                
-<file line="30" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Exception.java"/>
 +<file line="34" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryException.java"/>
 +<file line="30" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryV3Exception.java"/>
  <codefragment>
 <![CDATA[
 	public static final int E_ASSERTION_NOT_FOUND = 30000;
@@ -1977,8 +1763,8 @@
 </codefragment>
 </duplication>
 <duplication lines="42" tokens="246">
-<file line="519" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="517" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="519" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="517" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         catch (RegistryV3Exception e) {
@@ -2027,11 +1813,11 @@
 </codefragment>
 </duplication>
 <duplication lines="148" tokens="240">
-<file line="397" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
                
-<file line="395" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
 +<file line="336" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
 +<file line="355" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
  <codefragment>
 <![CDATA[
-		}
+	    }
 
 		return uddiResponse;
 	}
@@ -2182,46 +1968,9 @@
 ]]>
 </codefragment>
 </duplication>
-<duplication lines="29" tokens="230">
-<file line="115" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
                
-<file line="213" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
                
-<codefragment>
-<![CDATA[
-		List<Description> descriptionList = entity.getDescription();
-
-		Organization org = new OrganizationImpl(lifeCycleManager);
-		if ((namesList != null) && (namesList.size() > 0)) {
-			InternationalString is = null;
-			for (int i = 0; i < namesList.size(); i++)  {
-				Name n = namesList.get(i);
-				if (is == null) {
-					is = getIString(n.getLang(), n.getValue(), lifeCycleManager);
-				} else {
-					is.setValue(getLocale(n.getLang()), n.getValue());
-				}
-			}
-			org.setName(is);
-		}
-		if ((descriptionList != null) && (descriptionList.size() > 0)) {
-			InternationalString is = null;
-			for (int i = 0; i < descriptionList.size(); i++)  {
-				Description desc = descriptionList.get(i);
-				if (is == null) {
-					is = getIString(desc.getLang(), desc.getValue(), lifeCycleManager);
-				} else {
-					is.setValue(getLocale(desc.getLang()), desc.getValue());
-				}
-			}
-			org.setDescription(is);
-		}
-
-		org.setKey(lifeCycleManager.createKey(entity.getBusinessKey()));
-]]>
-</codefragment>
-</duplication>
 <duplication lines="66" tokens="229">
-<file line="472" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
                
-<file line="444" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
 +<file line="472" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
 +<file line="444" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
                 } catch (RegistryV3Exception e)
@@ -2294,8 +2043,8 @@
 </codefragment>
 </duplication>
 <duplication lines="47" tokens="215">
-<file line="607" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
                
-<file line="555" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
 +<file line="603" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="590" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
  <codefragment>
 <![CDATA[
 		}
@@ -2349,51 +2098,51 @@
 </codefragment>
 </duplication>
 <duplication lines="35" tokens="215">
-<file line="329" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
                
-<file line="351" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
 +<file line="268" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
 +<file line="310" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
  <codefragment>
 <![CDATA[
-	        throw (new RegistryV3Exception(xmle));
-	    }
-
-		if (responseName.toLowerCase().equals("fault")) {
-			NodeList nodeList = null;
-			
-			// Child Elements
-			String fCode = null;
-			nodeList = response.getElementsByTagName("faultcode");
-			if (nodeList.getLength() > 0)
-				fCode = nodeList.item(0).getNodeValue();
-
-			String fString = null;
-			nodeList = response.getElementsByTagName("faultstring");
-			if (nodeList.getLength() > 0)
-				fString = nodeList.item(0).getNodeValue();
-
-			String fActor = null;
-			nodeList = response.getElementsByTagName("faultactor");
-			if (nodeList.getLength() > 0)
-				fActor = nodeList.item(0).getNodeValue();
-
-			DispositionReport dispRpt = null;
-
-			nodeList = response.getElementsByTagName("detail");
-			if (nodeList.getLength() > 0) {
-				nodeList = ((Element) nodeList.item(0))
-						.getElementsByTagName("dispositionReport");
+		        throw (new RegistryV3Exception(xmle));
+		    }
+	
+			if (responseName.toLowerCase().equals("fault")) {
+				NodeList nodeList = null;
+				
+				// Child Elements
+				String fCode = null;
+				nodeList = response.getElementsByTagName("faultcode");
+				if (nodeList.getLength() > 0)
+					fCode = nodeList.item(0).getNodeValue();
+	
+				String fString = null;
+				nodeList = response.getElementsByTagName("faultstring");
+				if (nodeList.getLength() > 0)
+					fString = nodeList.item(0).getNodeValue();
+	
+				String fActor = null;
+				nodeList = response.getElementsByTagName("faultactor");
+				if (nodeList.getLength() > 0)
+					fActor = nodeList.item(0).getNodeValue();
+	
+				DispositionReport dispRpt = null;
+	
+				nodeList = response.getElementsByTagName("detail");
 				if (nodeList.getLength() > 0) {
-					JAXBElement<DispositionReport> dispRptObj = null;
-					try {
-						dispRptObj = (JAXBElement<DispositionReport>) unmarshaller.unmarshal((Element) \
                nodeList
-								.item(0));
-					} catch (JAXBException xmle) {
-						throw (new RegistryV3Exception(xmle));
+					nodeList = ((Element) nodeList.item(0))
+							.getElementsByTagName("dispositionReport");
+					if (nodeList.getLength() > 0) {
+						JAXBElement<DispositionReport> dispRptObj = null;
+						try {
+							dispRptObj = (JAXBElement<DispositionReport>) \
unmarshaller.unmarshal((Element) nodeList +									.item(0));
+						} catch (JAXBException xmle) {
+							throw (new RegistryV3Exception(xmle));
 ]]>
 </codefragment>
 </duplication>
 <duplication lines="35" tokens="214">
-<file line="375" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="374" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="375" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="374" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         catch (RegistryV3Exception e) {
@@ -2435,8 +2184,8 @@
 </codefragment>
 </duplication>
 <duplication lines="34" tokens="214">
-<file line="327" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="326" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="327" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="326" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         catch (RegistryV3Exception e) {
@@ -2477,8 +2226,8 @@
 </codefragment>
 </duplication>
 <duplication lines="35" tokens="210">
-<file line="472" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="470" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="472" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="470" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         catch (RegistryV3Exception e) {
@@ -2511,17 +2260,101 @@
         Collection<Exception> exceptions = new ArrayList<Exception>();
 
 
-        Iterator iter = services.iterator();
-        int currLoc = 0;
-        while (iter.hasNext()) {
-            try {
-                BusinessService bs = \
ScoutJaxrUddiV3Helper.getBusinessServiceFromJAXRService((Service) iter.next()); +     \
Iterator iter = services.iterator(); +        int currLoc = 0;
+        while (iter.hasNext()) {
+            try {
+                BusinessService bs = \
ScoutJaxrUddiV3Helper.getBusinessServiceFromJAXRService((Service) iter.next()); +]]>
+</codefragment>
+</duplication>
+<duplication lines="41" tokens="202">
+<file line="129" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="103" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
 +<codefragment>
+<![CDATA[
+		if ((descriptionList != null) && (descriptionList.size() > 0)) {
+			InternationalString is = null;
+			for (Description desc : descriptionList)  {
+				if (is == null) {
+					is = getIString(desc.getLang(), desc.getValue(), lifeCycleManager);
+				} else {
+					is.setValue(getLocale(desc.getLang()), desc.getValue());
+				}
+			}
+			org.setDescription(is);
+		}
+		org.setKey(lifeCycleManager.createKey(businessEntity.getBusinessKey()));
+
+		//Set Services also
+		BusinessServices services = businessEntity.getBusinessServices();
+		if(services != null)
+		{
+			List<BusinessService> bizServiceList = services.getBusinessService();
+			for (BusinessService businessService : bizServiceList) {
+				org.addService(getService(businessService, lifeCycleManager));
+			}
+		}
+
+		/*
+		 *  Users
+		 *
+		 *  we need to take the first contact and designate as the
+		 *  'primary contact'.  Currently, the OrganizationImpl
+		 *  class does that automatically as a safety in case
+		 *  user forgets to set - lets be explicit here as to not
+		 *  depend on that behavior
+		 */
+
+		Contacts contacts = businessEntity.getContacts();
+		if(contacts != null)
+		{
+			List<Contact> contactList = contacts.getContact();
+			if (contactList!=null) {
+				boolean isFirst=true;
+				for (Contact contact : contactList) {
+					User user = new UserImpl(null);
+]]>
+</codefragment>
+</duplication>
+<duplication lines="27" tokens="194">
+<file line="115" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="211" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<codefragment>
+<![CDATA[
+		List<Description> descriptionList = entity.getDescription();
+
+		Organization org = new OrganizationImpl(lifeCycleManager);
+		if ((namesList != null) && (namesList.size() > 0)) {
+			InternationalString is = null;
+			for (Name n : namesList)  {
+				if (is == null) {
+					is = getIString(n.getLang(), n.getValue(), lifeCycleManager);
+				} else {
+					is.setValue(getLocale(n.getLang()), n.getValue());
+				}
+			}
+			org.setName(is);
+		}
+		if ((descriptionList != null) && (descriptionList.size() > 0)) {
+			InternationalString is = null;
+			for (Description desc : descriptionList)  {
+				if (is == null) {
+					is = getIString(desc.getLang(), desc.getValue(), lifeCycleManager);
+				} else {
+					is.setValue(getLocale(desc.getLang()), desc.getValue());
+				}
+			}
+			org.setDescription(is);
+		}
+
+		org.setKey(lifeCycleManager.createKey(entity.getBusinessKey()));
 ]]>
 </codefragment>
 </duplication>
 <duplication lines="33" tokens="190">
-<file line="427" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="425" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="427" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="425" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
             bulk.setStatus(JAXRResponse.STATUS_FAILURE);
@@ -2560,142 +2393,59 @@
 ]]>
 </codefragment>
 </duplication>
-<duplication lines="40" tokens="181">
-<file line="106" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
                
-<file line="109" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
                
-<codefragment>
-<![CDATA[
-public class RegistryV3Impl implements IRegistryV3 {
-
-	public static final String INQUIRY_ENDPOINT_PROPERTY_NAME = \
                "scout.proxy.inquiryURL";
-	public static final String PUBLISH_ENDPOINT_PROPERTY_NAME = \
                "scout.proxy.publishURL";
-	public static final String SECURITY_ENDPOINT_PROPERTY_NAME = \
                "scout.proxy.securityURL";
-	public static final String ADMIN_ENDPOINT_PROPERTY_NAME = "scout.proxy.adminURL";
-	public static final String TRANSPORT_CLASS_PROPERTY_NAME = \
                "scout.proxy.transportClass";
-	public static final String SECURITY_PROVIDER_PROPERTY_NAME = \
                "scout.proxy.securityProvider";
-	public static final String PROTOCOL_HANDLER_PROPERTY_NAME = \
                "scout.proxy.protocolHandler";
-	public static final String UDDI_VERSION_PROPERTY_NAME = "scout.proxy.uddiVersion";
-	public static final String UDDI_NAMESPACE_PROPERTY_NAME = \
                "scout.proxy.uddiNamespace";
-
-	public static final String DEFAULT_INQUIRY_ENDPOINT = \
                "http://localhost/juddi/inquiry";
-	public static final String DEFAULT_PUBLISH_ENDPOINT = \
                "http://localhost/juddi/publish";
-	public static final String DEFAULT_SECURITY_ENDPOINT = \
                "http://localhost/juddi/security";
-	public static final String DEFAULT_ADMIN_ENDPOINT = "http://localhost/juddi/admin";
-	public static final String DEFAULT_TRANSPORT_CLASS = \
                "org.apache.ws.scout.transport.AxisTransport";
-	public static final String DEFAULT_SECURITY_PROVIDER = \
                "com.sun.net.ssl.internal.ssl.Provider";
-	public static final String DEFAULT_PROTOCOL_HANDLER = \
                "com.sun.net.ssl.internal.www.protocol";
-	public static final String DEFAULT_UDDI_VERSION = "2.0";
-	public static final String DEFAULT_UDDI_NAMESPACE = "urn:uddi-org:api_v2";
-
-	private URI adminURI;
-	private URI inquiryURI;
-	private URI publishURI;
-	private URI securityURI;
-
-	private Transport transport;
-
-	private String securityProvider;
-	private String protocolHandler;
-	private String uddiVersion;
-	private String uddiNamespace;
-	
-	private ObjectFactory objectFactory = new ObjectFactory();
-	
-	private Marshaller marshaller = null;
-	private Unmarshaller unmarshaller = null;
-	
-	private static Log log = LogFactory.getLog(RegistryV3Impl.class);
-]]>
-</codefragment>
-</duplication>
-<duplication lines="31" tokens="179">
-<file line="444" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
                
-<file line="386" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
                
-<codefragment>
-<![CDATA[
-		return service;
-	}
-
-	public static ServiceBinding getServiceBinding(BindingTemplate businessTemplate, \
                LifeCycleManager lifeCycleManager)
-	throws JAXRException
-	{
-		ServiceBinding serviceBinding = new ServiceBindingImpl(lifeCycleManager);
-
-		String keystr = businessTemplate.getServiceKey();
-		if (keystr != null)
-		{
-			Service svc = new ServiceImpl(lifeCycleManager);
-			svc.setKey(lifeCycleManager.createKey(keystr));
-			((ServiceBindingImpl)serviceBinding).setService(svc);
-		}
-		String bindingKey = businessTemplate.getBindingKey();
-		if(bindingKey != null) serviceBinding.setKey(new KeyImpl(bindingKey));
-
-		//Access URI
-		AccessPoint access = businessTemplate.getAccessPoint();
-		if (access != null) serviceBinding.setAccessURI(access.getValue());
-
-		//Description
-		Description desc = null;
-		if (businessTemplate.getDescription().size()>0) desc = \
                businessTemplate.getDescription().get(0);
-		if (desc!=null) {
-			serviceBinding.setDescription(new InternationalStringImpl(desc.getValue()));
-		}
-		/**Section D.10 of JAXR 1.0 Specification */
-
-		TModelInstanceDetails details = businessTemplate.getTModelInstanceDetails();
-]]>
-</codefragment>
-</duplication>
-<duplication lines="38" tokens="178">
-<file line="174" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
                
-<file line="138" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
 +<duplication lines="42" tokens="177">
+<file line="995" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
 +<file line="977" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
-					if (isFirst) {
-						isFirst=false;
-						org.setPrimaryContact(user);
-					} else {
-						org.addUser(user);
-					}
-				}
-			}
-		}
-
-		//External Links
-		DiscoveryURLs durls = businessEntity.getDiscoveryURLs();
-		if (durls != null)
-		{
-			List<DiscoveryURL> discoveryURL_List = durls.getDiscoveryURL();
-			for (DiscoveryURL discoveryURL : discoveryURL_List) {
-				ExternalLink link = new ExternalLinkImpl(lifeCycleManager);
-				link.setExternalURI(discoveryURL.getValue());
-				org.addExternalLink(link);
-			}
-		}
-
-		org.addExternalIdentifiers(getExternalIdentifiers(businessEntity.getIdentifierBag(), \
                lifeCycleManager));
-		org.addClassifications(getClassifications(businessEntity.getCategoryBag(), \
                lifeCycleManager));
-
-		return org;
-	}
+            if (juddiQualifier == null)
+            {
+                throw new UnsupportedCapabilityException("jUDDI does not support \
FindQualifer: " + jaxrQualifier); +            }
+            result.getFindQualifier().add(juddiQualifier);
+        }
+        return result;
+    }
 
+    static Name[] mapNamePatterns(Collection namePatterns)
+        throws JAXRException
+    {
+        if (namePatterns == null)
+            return null;
+        Name[] result = new Name[namePatterns.size()];
+        int currLoc = 0;
+        for (Iterator i = namePatterns.iterator(); i.hasNext();)
+        {
+            Object obj = i.next();
+            Name name = objectFactory.createName();
+            if (obj instanceof String) {
+                name.setValue((String)obj);
+            } else if (obj instanceof LocalizedString) {
+                LocalizedString ls = (LocalizedString)obj;
+                name.setValue(ls.getValue());
+                name.setLang(ls.getLocale().getLanguage());
+            }
+            result[currLoc] = name;
+            currLoc++;
+        }
+        return result;
+    }
 
-	public static Organization getOrganization(BusinessDetail bizdetail,
-			LifeCycleManager lifeCycleManager)
-	throws JAXRException
-	{
-		List<BusinessEntity> bizEntityList = bizdetail.getBusinessEntity();
-		if (bizEntityList.size() != 1) {
-			throw new JAXRException("Unexpected count of organizations in BusinessDetail: " + \
                bizEntityList.size());
-		}
-		BusinessEntity entity = bizEntityList.get(0);
+   /**
+     * Get the Auth Token from the registry
+     *
+     * @param connection
+     * @param ireg
+     * @return auth token
+     * @throws JAXRException
+     */
+    private AuthToken getAuthToken(ConnectionImpl connection, IRegistryV3 ireg)
 ]]>
 </codefragment>
 </duplication>
 <duplication lines="34" tokens="174">
-<file line="405" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
                
-<file line="396" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
 +<file line="405" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
 +<file line="404" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
  <codefragment>
 <![CDATA[
 			InternationalString iname = classificationScheme.getName();
@@ -2735,9 +2485,67 @@ public class RegistryV3Impl implements I
 ]]>
 </codefragment>
 </duplication>
+<duplication lines="50" tokens="172">
+<file line="1129" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
 +<file line="1185" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
 +<codefragment>
+<![CDATA[
+		} catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
+
+		return transport;
+	}
+
+	/**
+	 * 
+	 * @param name
+	 * @return The class object for the name given
+	 * @throws ClassNotFoundException
+	 * @throws NoClassDefFoundError
+	 */
+	public static Class getClassForName(String name)
+			throws ClassNotFoundException, NoClassDefFoundError {
+		Class clazz = null;
+
+		try {
+			// log.info("Using the Context ClassLoader");
+			ClassLoader ccl = AccessController.doPrivileged(new \
PrivilegedAction<ClassLoader>()  +		    {
+				public ClassLoader run() {
+					return Thread.currentThread().getContextClassLoader();
+		        }
+			});
+			
+			clazz = Class.forName(name, true, ccl);
+		} catch (Exception e) {
+			 log.debug("Failed to load the class " + name + " with context class loader " + \
e); +		}
+
+		if (null == clazz) {
+			ClassLoader scl = AccessController.doPrivileged(new \
PrivilegedAction<ClassLoader>() +			{ 
+				public ClassLoader run() {
+					return ClassLoader.getSystemClassLoader();
+				}
+			});
+
+			try {
+				clazz = Class.forName(name, true, scl);
+			} catch (Exception e) {
+		          throw new RuntimeException(e);
+			}
+		}
+
+		return clazz;
+	}
+}
+]]>
+</codefragment>
+</duplication>
 <duplication lines="29" tokens="170">
-<file line="921" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
                
-<file line="918" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
 +<file line="921" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
 +<file line="926" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
  <codefragment>
 <![CDATA[
            InternationalString extDesc = link.getDescription();
@@ -2773,8 +2581,8 @@ public class RegistryV3Impl implements I
 </codefragment>
 </duplication>
 <duplication lines="46" tokens="163">
-<file line="784" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
                
-<file line="756" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
 +<file line="784" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
 +<file line="756" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         ServiceImpl service  = (ServiceImpl) ScoutUddiV3JaxrHelper.getService(bs, \
lcm); @@ -2826,9 +2634,53 @@ public class RegistryV3Impl implements I
 ]]>
 </codefragment>
 </duplication>
+<duplication lines="36" tokens="159">
+<file line="79" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/transport/LocalTransport.java"/>
 +<file line="87" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/transport/RMITransport.java"/>
 +<codefragment>
+<![CDATA[
+    	if (node.getFirstChild()!=null) {
+    		response = (Element) node.getFirstChild();
+    	}
+    }
+    catch (Exception ex) {
+      throw new TransportException(ex);
+    }
+    if (log.isDebugEnabled()) {
+    	log.debug("\nResponse message:\n" + XMLUtils.convertNodeToXMLString(response));
+    }
+    return response;
+  }
+  
+  /**
+   * Sends an XML, responds with an XML.
+   */
+  public String send(String request,URI endpointURI)
+    throws TransportException
+  {    
+    String response = null;
+    log.debug("\nRequest message:\n" + request);
+    try {
+    	DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder parser = factory.newDocumentBuilder();
+        Document document = parser.parse(request);
+        Element element = document.getDocumentElement();
+        response= XMLUtils.convertNodeToXMLString(send(element, endpointURI));
+    } catch (Exception ex) { 
+    	throw new TransportException(ex);
+    }
+    log.debug("\nResponse message:\n" + response);
+    return response;
+  }
+  
+  
+}
+]]>
+</codefragment>
+</duplication>
 <duplication lines="29" tokens="159">
-<file line="320" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
                
-<file line="368" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="320" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="368" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         log.debug("Method:save_concept: ENlength=" + entityarr.length);
@@ -2864,8 +2716,8 @@ public class RegistryV3Impl implements I
 </codefragment>
 </duplication>
 <duplication lines="29" tokens="159">
-<file line="321" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="369" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="321" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="369" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
  <codefragment>
 <![CDATA[
         log.debug("Method:save_concept: ENlength=" + entityarr.length);
@@ -2901,8 +2753,8 @@ public class RegistryV3Impl implements I
 </codefragment>
 </duplication>
 <duplication lines="23" tokens="158">
-<file line="450" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
                
-<file line="422" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
 +<file line="450" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
 +<file line="422" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
                 IRegistryV3 registry = (IRegistryV3) registryService.getRegistry();
@@ -2931,59 +2783,42 @@ public class RegistryV3Impl implements I
 ]]>
 </codefragment>
 </duplication>
-<duplication lines="42" tokens="154">
-<file line="764" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
                
-<file line="761" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
 +<duplication lines="25" tokens="152">
+<file line="297" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="282" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
  <codefragment>
 <![CDATA[
-			throws RegistryV3Exception {
-		FindService request = this.objectFactory.createFindService();
-
-		if (businessKey != null) {
-			request.setBusinessKey(businessKey);
-		}
-
-		if (nameArray != null) {
-			request.getName().addAll(Arrays.asList(nameArray));
-		}
-
-		if (categoryBag != null) {
-			request.setCategoryBag(categoryBag);
-		}
-
-		if (tModelBag != null) {
-			request.setTModelBag(tModelBag);
+			}
 		}
-
-		if (findQualifiers != null) {
-			request.setFindQualifiers(findQualifiers);
+		//External Links
+		DiscoveryURLs durls = entity.getDiscoveryURLs();
+		if (durls != null)
+		{
+			List<DiscoveryURL> discoveryURL_List = durls.getDiscoveryURL();
+			for (DiscoveryURL discoveryURL : discoveryURL_List) {
+				ExternalLink link = new ExternalLinkImpl(lifeCycleManager);
+				link.setExternalURI(discoveryURL.getValue());
+				org.addExternalLink(link);
+			}
 		}
 
-		request.setMaxRows(maxRows);
-
-        ServiceList sl;
-        JAXBElement<?> o = execute(this.objectFactory.createFindService(request), 
-        		this.getInquiryURI());
-        sl = (ServiceList) o.getValue();
+		org.addExternalIdentifiers(getExternalIdentifiers(entity.getIdentifierBag(), \
lifeCycleManager)); +		org.addClassifications(getClassifications(entity.getCategoryBag(), \
lifeCycleManager));  
-        return sl;
+		return org;
 	}
 
-	/**
-	 * "Used to locate one or more tModel information structures. Returns a
-	 * tModelList structure."
-	 * 
-	 * @exception RegistryV3Exception;
-	 */
-	public TModelList findTModel(String name, CategoryBag categoryBag,
-			IdentifierBag identifierBag, FindQualifiers findQualifiers,
-			int maxRows) throws RegistryV3Exception {
+	private static PostalAddress getPostalAddress(AddressLine[] addressLineArr) throws \
JAXRException { +		PostalAddress pa = new PostalAddressImpl();
+		HashMap<String, String> hm = new HashMap<String, String>();
+		for (AddressLine anAddressLineArr : addressLineArr) {
+			hm.put(anAddressLineArr.getKeyName(), anAddressLineArr.getValue());
 ]]>
 </codefragment>
 </duplication>
 <duplication lines="22" tokens="152">
-<file line="264" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
                
-<file line="236" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
 +<file line="264" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
 +<file line="236" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
                 Association asso = \
ScoutUddiV3JaxrHelper.getAssociation(bl.getCollection(), @@ -3012,8 +2847,8 @@ public \
class RegistryV3Impl implements I  </codefragment>
 </duplication>
 <duplication lines="46" tokens="152">
-<file line="821" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="847" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="821" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="847" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         catch (RegistryV3Exception regExcept) {
@@ -3065,9 +2900,95 @@ public class RegistryV3Impl implements I
 ]]>
 </codefragment>
 </duplication>
+<duplication lines="34" tokens="145">
+<file line="172" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="149" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
 +<codefragment>
+<![CDATA[
+					if (isFirst) {
+						isFirst=false;
+						org.setPrimaryContact(user);
+					} else {
+						org.addUser(user);
+					}
+				}
+			}
+		}
+
+		//External Links
+		DiscoveryURLs durls = businessEntity.getDiscoveryURLs();
+		if (durls != null)
+		{
+			List<DiscoveryURL> discoveryURL_List = durls.getDiscoveryURL();
+			for (DiscoveryURL discoveryURL : discoveryURL_List) {
+				ExternalLink link = new ExternalLinkImpl(lifeCycleManager);
+				link.setExternalURI(discoveryURL.getValue());
+				org.addExternalLink(link);
+			}
+		}
+
+		org.addExternalIdentifiers(getExternalIdentifiers(businessEntity.getIdentifierBag(), \
lifeCycleManager)); +		org.addClassifications(getClassifications(businessEntity.getCategoryBag(), \
lifeCycleManager)); +
+		return org;
+	}
+
+
+	public static Organization getOrganization(BusinessDetail bizdetail,
+			LifeCycleManager lifeCycleManager)
+	throws JAXRException
+	{
+		List<BusinessEntity> bizEntityList = bizdetail.getBusinessEntity();
+]]>
+</codefragment>
+</duplication>
+<duplication lines="36" tokens="143">
+<file line="964" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
 +<file line="938" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
 +<codefragment>
+<![CDATA[
+            } catch (RegistryV3Exception re) {
+            	throw new JAXRException(re);
+            }
+            return new BulkResponseImpl(orgs);
+        }
+        else if (LifeCycleManager.SERVICE.equalsIgnoreCase(id)) {
+            List<String> a = new ArrayList<String>();
+            a.add("%");
+
+            BulkResponse br = this.findServices(null,null, a, null, null);
+
+            return br;
+        }
+        else
+        {
+            throw new JAXRException("Unsupported type for getRegistryObjects() :" + \
id); +        }
+
+    }
+
+    static FindQualifiers mapFindQualifiers(Collection jaxrQualifiers) throws \
UnsupportedCapabilityException +    {
+        if (jaxrQualifiers == null)
+        {
+            return null;
+        }
+        FindQualifiers result = objectFactory.createFindQualifiers();
+        for (Iterator i = jaxrQualifiers.iterator(); i.hasNext();)
+        {
+            String jaxrQualifier = (String) i.next();
+            String juddiQualifier = jaxrQualifier;
+           
+            // SCOUT-111 
+            // If the JAXR qualifier is exactNameMatch, then 
+            // set the UDDI v3 qualifier to exactMatch 
+            if ("exactNameMatch".equals(jaxrQualifier)) {
+]]>
+</codefragment>
+</duplication>
 <duplication lines="20" tokens="140">
-<file line="475" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
                
-<file line="418" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
 +<file line="471" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="453" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
  <codefragment>
 <![CDATA[
 			List<TModelInstanceInfo> tmodelInstanceInfoList = \
details.getTModelInstanceInfo(); @@ -3093,97 +3014,9 @@ public class RegistryV3Impl \
implements I  ]]>
 </codefragment>
 </duplication>
-<duplication lines="34" tokens="140">
-<file line="66" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/transport/LocalTransport.java"/>
                
-<file line="87" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/transport/RMITransport.java"/>
                
-<codefragment>
-<![CDATA[
-    	response = (Element) node.getFirstChild();
-    }
-    catch (Exception ex) {
-      throw new TransportException(ex);
-    }
-    if (log.isDebugEnabled()) {
-    	log.debug("\nResponse message:\n" + XMLUtils.convertNodeToXMLString(response));
-    }
-    return response;
-  }
-  
-  /**
-   * Sends an XML, responds with an XML.
-   */
-  public String send(String request,URI endpointURI)
-    throws TransportException
-  {    
-    String response = null;
-    log.debug("\nRequest message:\n" + request);
-    try {
-    	DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder parser = factory.newDocumentBuilder();
-        Document document = parser.parse(request);
-        Element element = document.getDocumentElement();
-        response= XMLUtils.convertNodeToXMLString(send(element, endpointURI));
-    } catch (Exception ex) { 
-    	throw new TransportException(ex);
-    }
-    log.debug("\nResponse message:\n" + response);
-    return response;
-  }
-  
-  
-}
-]]>
-</codefragment>
-</duplication>
-<duplication lines="38" tokens="138">
-<file line="805" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
                
-<file line="802" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
                
-<codefragment>
-<![CDATA[
-			int maxRows) throws RegistryV3Exception {
-		FindTModel request = this.objectFactory.createFindTModel();
-
-		Name jaxbName = this.objectFactory.createName();
-
-		if (name != null) {
-			jaxbName.setValue(name);
-		}
-
-		request.setName(jaxbName);
-
-		if (categoryBag != null) {
-			request.setCategoryBag(categoryBag);
-		}
-
-		if (identifierBag != null) {
-			request.setIdentifierBag(identifierBag);
-		}
-
-		if (findQualifiers != null) {
-			request.setFindQualifiers(findQualifiers);
-		}
-
-		request.setMaxRows(maxRows);
-
-        TModelList tml;
-        JAXBElement<?> o = execute(this.objectFactory.createFindTModel(request), 
-        		this.getInquiryURI());
-        tml = (TModelList) o.getValue();
-
-        return tml;
-	}
-
-	/**
-	 * @exception RegistryV3Exception;
-	 */
-	public AssertionStatusReport getAssertionStatusReport(String authInfo,
-			String completionStatus) throws RegistryV3Exception {
-]]>
-</codefragment>
-</duplication>
 <duplication lines="23" tokens="133">
-<file line="327" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="374" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="327" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="374" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         catch (RegistryV3Exception e) {
@@ -3213,8 +3046,8 @@ public class RegistryV3Impl implements I
 </codefragment>
 </duplication>
 <duplication lines="17" tokens="124">
-<file line="249" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
                
-<file line="220" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
 +<file line="249" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
 +<file line="220" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         			AuthTokenV3Singleton.deleteAuthToken(username);
@@ -3237,78 +3070,53 @@ public class RegistryV3Impl implements I
 ]]>
 </codefragment>
 </duplication>
-<duplication lines="21" tokens="118">
-<file line="830" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
                
-<file line="802" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
 +<duplication lines="36" tokens="117">
+<file line="170" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
 +<file line="183" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
  <codefragment>
 <![CDATA[
-        IRegistryV3 registry = (IRegistryV3) registryService.getRegistry();
-        //Convert into a vector of strings
-        String[] keys = new String[objectKeys.size()];
-        int currLoc = 0;
-        for (Key key : (Collection<Key>) objectKeys) {
-            keys[currLoc] = key.getId();
-            currLoc++;
+            JAXBContext context = \
JAXBContextUtil.getContext(JAXBContextUtil.UDDI_V3_VERSION); +            \
unmarshaller = context.createUnmarshaller();  +            marshaller = \
context.createMarshaller(); +            
+        } catch (URISyntaxException muex) {
+            throw new InvalidRequestException(muex.getMessage(), muex);
+        } catch(JAXBException e) {
+           throw new RuntimeException(e);
         }
-        LinkedHashSet<RegistryObject> col = new LinkedHashSet<RegistryObject>();
-        LifeCycleManager lcm = registryService.getLifeCycleManagerImpl();
-
-        if (LifeCycleManager.CLASSIFICATION_SCHEME.equalsIgnoreCase(objectType))
-        {
-            try
-            {
-                TModelDetail tmodeldetail = registry.getTModelDetail(keys);
-                List<TModel> tmodelList = tmodeldetail.getTModel();
+	}
 
-                for (TModel tModel: tmodelList)
-                {
-                    col.add(ScoutUddiV3JaxrHelper.getConcept(tModel, lcm));
-]]>
-</codefragment>
-</duplication>
-<duplication lines="32" tokens="117">
-<file line="140" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
                
-<file line="101" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
                
-<codefragment>
-<![CDATA[
-			org.setDescription(getIString(desc.getLang(), desc.getValue(), \
                lifeCycleManager));
-		}
-		org.setKey(lifeCycleManager.createKey(businessEntity.getBusinessKey()));
+	/**
+	 * 
+	 * @param uddiRequest
+	 * @return String
+	 * @throws RegistryV3Exception
+	 */
+	public String execute(String uddiRequest, String urltype)
+			throws TransportException {
+		URI endPointURL = null;
+		if (urltype.equalsIgnoreCase("INQUIRY"))
+			endPointURL = this.getInquiryURI();
+		else
+			endPointURL = this.getPublishURI();
 
-		//Set Services also
-		BusinessServices services = businessEntity.getBusinessServices();
-		if(services != null)
-		{
-			List<BusinessService> bizServiceList = services.getBusinessService();
-			for (BusinessService businessService : bizServiceList) {
-				org.addService(getService(businessService, lifeCycleManager));
-			}
-		}
+		// A SOAP request is made and a SOAP response
+		// is returned.
 
-		/*
-		 *  Users
-		 *
-		 *  we need to take the first contact and designate as the
-		 *  'primary contact'.  Currently, the OrganizationImpl
-		 *  class does that automatically as a safety in case
-		 *  user forgets to set - lets be explicit here as to not
-		 *  depend on that behavior
-		 */
+		return transport.send(uddiRequest, endPointURL);
+	}
 
-		Contacts contacts = businessEntity.getContacts();
-		if(contacts != null)
-		{
-			List<Contact> contactList = contacts.getContact();
-			if (contactList!=null) {
-				boolean isFirst=true;
-				for (Contact contact : contactList) {
-					User user = new UserImpl(null);
+	/**
+	 * 
+	 */
+	public JAXBElement<?> execute(JAXBElement<?> uddiRequest, URI endPointURI)
+			throws RegistryV3Exception {
 ]]>
 </codefragment>
 </duplication>
 <duplication lines="12" tokens="116">
-<file line="513" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
                
-<file line="533" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="509" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="529" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
  <codefragment>
 <![CDATA[
 		concept.setKey(lifeCycleManager.createKey(tmodel.getTModelKey()));
@@ -3327,8 +3135,8 @@ public class RegistryV3Impl implements I
 </codefragment>
 </duplication>
 <duplication lines="35" tokens="115">
-<file line="891" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="920" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
 +<file line="891" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="920" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
         AuthTokenV3Singleton.addAuthToken(username, token);
@@ -3369,89 +3177,9 @@ public class RegistryV3Impl implements I
 ]]>
 </codefragment>
 </duplication>
-<duplication lines="30" tokens="114">
-<file line="643" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
                
-<file line="641" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
                
-<codefragment>
-<![CDATA[
-			String[] tModelKeyArray) throws RegistryV3Exception {
-		DeleteTModel request = this.objectFactory.createDeleteTModel();
-
-		if (authInfo != null) {
-			request.setAuthInfo(authInfo);
-		}
-
-		if (tModelKeyArray != null) {
-			request.getTModelKey().addAll(Arrays.asList(tModelKeyArray));
-		}
-
-        DispositionReport dr;
-        JAXBElement<?> o = execute(this.objectFactory.createDeleteTModel(request), 
-        		this.getPublishURI());
-        dr = (DispositionReport) o.getValue();
-
-        return dr;
-	}
-
-	/**
-	 * Used to locate information about one or more businesses. Returns a
-	 * businessList message that matches the conditions specified.
-	 * 
-	 * @exception RegistryV3Exception;
-	 */
-	public BusinessList findBusiness(Name[] nameArray,
-			DiscoveryURLs discoveryURLs, IdentifierBag identifierBag,
-			CategoryBag categoryBag, TModelBag tModelBag,
-			FindQualifiers findQualifiers, int maxRows)
-			throws RegistryV3Exception {
-]]>
-</codefragment>
-</duplication>
-<duplication lines="34" tokens="113">
-<file line="870" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java"/>
                
-<file line="868" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/RegistryV3Impl.java"/>
                
-<codefragment>
-<![CDATA[
-			throws RegistryV3Exception {
-		GetAuthToken request = this.objectFactory.createGetAuthToken();
-
-		if (userID != null) {
-			request.setUserID(userID);
-		}
-
-		if (cred != null) {
-			request.setCred(cred);
-		}
-
-		URI getAuthTokenURI = null;
-		if ("3.0".equals(uddiVersion)) {
-			getAuthTokenURI = this.getSecurityURI();
-		} else {
-			getAuthTokenURI = this.getPublishURI();
-		}
-		
-        AuthToken at;
-        JAXBElement<?> o = execute(this.objectFactory.createGetAuthToken(request), 
-        		getAuthTokenURI);
-        at = (AuthToken) o.getValue();
-
-        return at;
-	}
-
-	/**
-	 * Used to get the full businessEntity information for a particular business
-	 * entity. Returns a businessDetail message.
-	 * 
-	 * @exception RegistryV3Exception;
-	 */
-	public BusinessDetail getBusinessDetail(String businessKey)
-			throws RegistryV3Exception {
-]]>
-</codefragment>
-</duplication>
 <duplication lines="87" tokens="112">
-<file line="47" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/model/uddi/v2/AddPublisherAssertions.java"/>
                
-<file line="47" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/model/uddi/v2/DeletePublisherAssertions.java"/>
 +<file line="47" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/model/uddi/v2/AddPublisherAssertions.java"/>
 +<file line="47" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/model/uddi/v2/DeletePublisherAssertions.java"/>
  <codefragment>
 <![CDATA[
 public class DeletePublisherAssertions {
@@ -3545,8 +3273,8 @@ public class DeletePublisherAssertions {
 </codefragment>
 </duplication>
 <duplication lines="20" tokens="111">
-<file line="152" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
                
-<file line="139" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
 +<file line="152" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java"/>
 +<file line="139" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.java"/>
  <codefragment>
 <![CDATA[
 		address.getAddressLine().addAll(Arrays.asList(addarr));
@@ -3572,9 +3300,32 @@ public class DeletePublisherAssertions {
 ]]>
 </codefragment>
 </duplication>
+<duplication lines="15" tokens="110">
+<file line="225" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java"/>
 +<file line="202" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
 +<codefragment>
+<![CDATA[
+		if ((descriptionList != null) && (descriptionList.size() > 0)) {
+			InternationalString is = null;
+			for (Description desc : descriptionList)  {
+				if (is == null) {
+					is = getIString(desc.getLang(), desc.getValue(), lifeCycleManager);
+				} else {
+					is.setValue(getLocale(desc.getLang()), desc.getValue());
+				}
+			}
+			org.setDescription(is);
+		}
+		org.setKey(lifeCycleManager.createKey(entity.getBusinessKey()));
+
+		//Set Services also
+		BusinessServices services = entity.getBusinessServices();
+]]>
+</codefragment>
+</duplication>
 <duplication lines="23" tokens="107">
-<file line="668" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
                
-<file line="640" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
 +<file line="668" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java"/>
 +<file line="640" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java"/>
  <codefragment>
 <![CDATA[
                     \
ScoutJaxrUddiV3Helper.getCategoryBagFromClassifications(classifications),  @@ -3604,8 \
+3355,8 @@ public class DeletePublisherAssertions {  </codefragment>
 </duplication>
 <duplication lines="14" tokens="101">
-<file line="675" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
                
-<file line="708" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="675" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
 +<file line="708" path="/Users/kstam/osc/apache/dev/scout-1.2.5/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java"/>
  <codefragment>
 <![CDATA[
         else if (op.equalsIgnoreCase("DELETE_CLASSIFICATIONSCHEME")) {
@@ -3625,24 +3376,4 @@ public class DeletePublisherAssertions {
 ]]>
 </codefragment>
 </duplication>
-<duplication lines="12" tokens="100">
-<file line="92" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
                
-<file line="179" path="/NotBackedUp/scout/trunk/src/main/java/org/apache/ws/scout/util/ScoutUddiV3JaxrHelper.java"/>
                
-<codefragment>
-<![CDATA[
-		List<Description> descriptionList = entity.getDescription();
-		Description desc =null;
-		if (descriptionList.size()>0) desc = descriptionList.get(0);
-
-		Organization org = new OrganizationImpl(lifeCycleManager);
-		if( n != null ) {
-			org.setName(getIString(n.getLang(), n.getValue(), lifeCycleManager));
-		}
-		if( desc != null ) {
-			org.setDescription(getIString(desc.getLang(), desc.getValue(), \
                lifeCycleManager));
-		}
-		org.setKey(lifeCycleManager.createKey(entity.getBusinessKey()));
-]]>
-</codefragment>
-</duplication>
 </pmd-cpd>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic