SCOUT-82 resolving PMD reported issues and organizing imports.

git-svn-id: https://svn.apache.org/repos/asf/webservices/scout/branches/scout-1.1@798378 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/AddPublisherAssertions.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/AddPublisherAssertions.java
index 31fd62b..787a76d 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/AddPublisherAssertions.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/AddPublisherAssertions.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/Address.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/Address.java
index 8d32ff1..5f277ca 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/Address.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/Address.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/AssertionStatusReport.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/AssertionStatusReport.java
index c15b40d..f4d88f4 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/AssertionStatusReport.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/AssertionStatusReport.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingDetail.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingDetail.java
index 1497e0e..607d57a 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingDetail.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingDetail.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingTemplate.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingTemplate.java
index 4da9945..8291389 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingTemplate.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingTemplate.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingTemplates.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingTemplates.java
index 3e0468f..5637bb4 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingTemplates.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/BindingTemplates.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessDetail.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessDetail.java
index 1f89b48..89f5cee 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessDetail.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessDetail.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessDetailExt.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessDetailExt.java
index 521c9ef..cc9b578 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessDetailExt.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessDetailExt.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessEntity.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessEntity.java
index 03bcdef..d23caef 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessEntity.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessEntity.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessEntityExt.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessEntityExt.java
index 436ea2f..d260693 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessEntityExt.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessEntityExt.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyElement;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessInfo.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessInfo.java
index cd90422..c63e4c3 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessInfo.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessInfo.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessInfos.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessInfos.java
index 825f9e3..4ed8a67 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessInfos.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessInfos.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessService.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessService.java
index c502589..37bb813 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessService.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessService.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessServices.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessServices.java
index 813f4e4..128c2eb 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessServices.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/BusinessServices.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/CategoryBag.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/CategoryBag.java
index a676f0f..88c2cca 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/CategoryBag.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/CategoryBag.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/Contact.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/Contact.java
index 2217a57..cd07fbe 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/Contact.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/Contact.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/Contacts.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/Contacts.java
index 8c90170..46c6cd3 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/Contacts.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/Contacts.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteBinding.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteBinding.java
index c38378f..6bde3d8 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteBinding.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteBinding.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteBusiness.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteBusiness.java
index 04a141c..d841f6c 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteBusiness.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteBusiness.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/DeletePublisherAssertions.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/DeletePublisherAssertions.java
index 76eb000..3dd5870 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/DeletePublisherAssertions.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/DeletePublisherAssertions.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteService.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteService.java
index 85a1747..2e2e868 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteService.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteService.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteTModel.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteTModel.java
index 3146fa4..e79959f 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteTModel.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/DeleteTModel.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/DiscoveryURLs.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/DiscoveryURLs.java
index 9d267f9..61f4a4f 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/DiscoveryURLs.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/DiscoveryURLs.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/DispositionReport.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/DispositionReport.java
index 8944d91..c7fed99 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/DispositionReport.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/DispositionReport.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/FindBusiness.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/FindBusiness.java
index fae82f2..cfef79b 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/FindBusiness.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/FindBusiness.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/FindQualifiers.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/FindQualifiers.java
index 81cbcd6..cf86307 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/FindQualifiers.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/FindQualifiers.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/FindService.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/FindService.java
index 3848ee7..12d82ff 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/FindService.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/FindService.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBindingDetail.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBindingDetail.java
index 5713248..710a603 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBindingDetail.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBindingDetail.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBusinessDetail.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBusinessDetail.java
index 25fe2ba..ebbed24 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBusinessDetail.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBusinessDetail.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBusinessDetailExt.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBusinessDetailExt.java
index e1f2dcd..c48f4cf 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBusinessDetailExt.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/GetBusinessDetailExt.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/GetServiceDetail.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/GetServiceDetail.java
index b9fd377..ad44a60 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/GetServiceDetail.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/GetServiceDetail.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/GetTModelDetail.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/GetTModelDetail.java
index b3589c5..dddc249 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/GetTModelDetail.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/GetTModelDetail.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/IdentifierBag.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/IdentifierBag.java
index 262975c..a3a6d14 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/IdentifierBag.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/IdentifierBag.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/InstanceDetails.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/InstanceDetails.java
index b28cd92..50d3fe6 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/InstanceDetails.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/InstanceDetails.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/OverviewDoc.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/OverviewDoc.java
index ee20f94..12c611d 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/OverviewDoc.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/OverviewDoc.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/PublisherAssertions.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/PublisherAssertions.java
index 3565f80..a5139a5 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/PublisherAssertions.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/PublisherAssertions.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/RelatedBusinessInfo.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/RelatedBusinessInfo.java
index 82ee009..83e76f9 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/RelatedBusinessInfo.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/RelatedBusinessInfo.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/RelatedBusinessInfos.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/RelatedBusinessInfos.java
index 235d65a..cd5ccb6 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/RelatedBusinessInfos.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/RelatedBusinessInfos.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveBinding.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveBinding.java
index 21c228e..58d371e 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveBinding.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveBinding.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveBusiness.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveBusiness.java
index 922ea86..d9c0e8e 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveBusiness.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveBusiness.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveService.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveService.java
index fce7271..2652385 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveService.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveService.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveTModel.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveTModel.java
index 43b244b..762870c 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveTModel.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/SaveTModel.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceDetail.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceDetail.java
index 68b4c72..d26fae4 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceDetail.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceDetail.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceInfo.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceInfo.java
index ce91d32..face7f4 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceInfo.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceInfo.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceInfos.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceInfos.java
index 2e85800..75a0ab0 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceInfos.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/ServiceInfos.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/SetPublisherAssertions.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/SetPublisherAssertions.java
index d33532e..0411a5e 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/SetPublisherAssertions.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/SetPublisherAssertions.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/SharedRelationships.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/SharedRelationships.java
index e56ea83..6916780 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/SharedRelationships.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/SharedRelationships.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModel.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModel.java
index 3e80060..fbbb3d3 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModel.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModel.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelBag.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelBag.java
index 3b510cb..c655900 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelBag.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelBag.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelDetail.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelDetail.java
index 6e178ca..b778af4 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelDetail.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelDetail.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInfos.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInfos.java
index fdd3276..129b447 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInfos.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInfos.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInstanceDetails.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInstanceDetails.java
index 9c4aae8..2c49862 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInstanceDetails.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInstanceDetails.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInstanceInfo.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInstanceInfo.java
index 95cc9d7..dfcd032 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInstanceInfo.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/TModelInstanceInfo.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/model/uddi/v2/ValidateValues.java b/src/main/java/org/apache/ws/scout/model/uddi/v2/ValidateValues.java
index 6025d5a..e192e3a 100644
--- a/src/main/java/org/apache/ws/scout/model/uddi/v2/ValidateValues.java
+++ b/src/main/java/org/apache/ws/scout/model/uddi/v2/ValidateValues.java
@@ -10,6 +10,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java b/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
index 9667e6b..b658128 100644
--- a/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
+++ b/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
@@ -577,7 +577,7 @@
             regobj = ireg.saveTModel(token.getAuthInfo(), (TModel[]) dataarray);
         }
         else if (op.equalsIgnoreCase("DELETE_ORG")) {
-            clearPublisherAssertions(token.getAuthInfo(), (String[]) dataarray,ireg);
+            clearPublisherAssertions(token.getAuthInfo(), ireg);
             regobj = ireg.deleteBusiness(token.getAuthInfo(), (String[]) dataarray);
         }
         else if (op.equalsIgnoreCase("DELETE_SERVICE")) {
@@ -609,7 +609,7 @@
         return regobj;
     }
 
-    private void clearPublisherAssertions( String authinfo,String[] orgkeys,IRegistry ireg)
+    private void clearPublisherAssertions( String authinfo,IRegistry ireg)
     {
        Vector<PublisherAssertion> pasvect  = null;
        PublisherAssertion[] pasarr  = null;
@@ -683,7 +683,7 @@
              }
              catch (RegistryException e)
              { 
-                //IGNORE
+                log.debug("Ignoring exception " + e.getMessage(),e);
              }
        }
 
diff --git a/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java b/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
index 614bea0..c58f5f4 100644
--- a/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
+++ b/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerImpl.java
@@ -42,6 +42,8 @@
 import javax.xml.registry.infomodel.Service;

 import javax.xml.registry.infomodel.ServiceBinding;

 

+import org.apache.commons.logging.Log;

+import org.apache.commons.logging.LogFactory;

 import org.apache.ws.scout.model.uddi.v2.AssertionStatusItem;

 import org.apache.ws.scout.model.uddi.v2.AssertionStatusReport;

 import org.apache.ws.scout.model.uddi.v2.AuthToken;

@@ -91,6 +93,7 @@
 public class BusinessQueryManagerImpl implements BusinessQueryManager

 {

     private final RegistryServiceImpl registryService;

+    private Log log = LogFactory.getLog(this.getClass());

 

     private static ObjectFactory objectFactory = new ObjectFactory();

 

@@ -785,9 +788,8 @@
                 if (bk.getCollection() != null) {

                     c.addAll(bk.getCollection());

                 }

-            }

-            catch(JAXRException e) {

-                // ignore - just a problem with that type?

+            } catch(JAXRException e) {

+            	log.debug("ignore - just a problem with that type? " + e.getMessage(), e);

             }

         }

 

diff --git a/src/main/java/org/apache/ws/scout/registry/IRegistry.java b/src/main/java/org/apache/ws/scout/registry/IRegistry.java
index 22fc400..84a3077 100644
--- a/src/main/java/org/apache/ws/scout/registry/IRegistry.java
+++ b/src/main/java/org/apache/ws/scout/registry/IRegistry.java
@@ -17,8 +17,30 @@
 
 import java.net.URI;
 
-import org.apache.ws.scout.model.uddi.v2.*;
-import org.apache.ws.scout.transport.Transport; 
+import org.apache.ws.scout.model.uddi.v2.AssertionStatusReport;
+import org.apache.ws.scout.model.uddi.v2.AuthToken;
+import org.apache.ws.scout.model.uddi.v2.BindingDetail;
+import org.apache.ws.scout.model.uddi.v2.BindingTemplate;
+import org.apache.ws.scout.model.uddi.v2.BusinessDetail;
+import org.apache.ws.scout.model.uddi.v2.BusinessEntity;
+import org.apache.ws.scout.model.uddi.v2.BusinessList;
+import org.apache.ws.scout.model.uddi.v2.BusinessService;
+import org.apache.ws.scout.model.uddi.v2.CategoryBag;
+import org.apache.ws.scout.model.uddi.v2.DiscoveryURLs;
+import org.apache.ws.scout.model.uddi.v2.DispositionReport;
+import org.apache.ws.scout.model.uddi.v2.FindQualifiers;
+import org.apache.ws.scout.model.uddi.v2.IdentifierBag;
+import org.apache.ws.scout.model.uddi.v2.Name;
+import org.apache.ws.scout.model.uddi.v2.PublisherAssertion;
+import org.apache.ws.scout.model.uddi.v2.PublisherAssertions;
+import org.apache.ws.scout.model.uddi.v2.RegisteredInfo;
+import org.apache.ws.scout.model.uddi.v2.ServiceDetail;
+import org.apache.ws.scout.model.uddi.v2.ServiceList;
+import org.apache.ws.scout.model.uddi.v2.TModel;
+import org.apache.ws.scout.model.uddi.v2.TModelBag;
+import org.apache.ws.scout.model.uddi.v2.TModelDetail;
+import org.apache.ws.scout.model.uddi.v2.TModelList;
+import org.apache.ws.scout.transport.Transport;
 
 /**
  * 
diff --git a/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java b/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java
index c531e8b..d11b223 100644
--- a/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java
+++ b/src/main/java/org/apache/ws/scout/registry/RegistryImpl.java
@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Arrays;
@@ -35,6 +34,8 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.ws.scout.model.uddi.v2.AssertionStatusReport;
 import org.apache.ws.scout.model.uddi.v2.AuthToken;
 import org.apache.ws.scout.model.uddi.v2.BindingDetail;
@@ -133,6 +134,8 @@
 	
 	private Marshaller marshaller = null;
 	private Unmarshaller unmarshaller = null;
+	
+	private static Log log = LogFactory.getLog(RegistryImpl.class);
 
 	/**
 	 * Creates a new instance of RegistryImpl.
@@ -485,7 +488,7 @@
 
         DispositionReport dr;
         JAXBElement<?> o = execute(this.objectFactory.createDeleteBinding(request), this.getPublishURI());
-        dr = (DispositionReport) o.getValue();;
+        dr = (DispositionReport) o.getValue();
 
         return dr;
 	}
@@ -1145,8 +1148,7 @@
 			
 			clazz = Class.forName(name, true, ccl);
 		} catch (Exception e) {
-			 //log.warn("Failed to load the class " + name + " with context
-			 //class loader " + e);
+			 log.debug("Failed to load the class " + name + " with context class loader " + e);
 		}
 
 		if (null == clazz) {
diff --git a/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java b/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java
index 8f4784a..594c626 100644
--- a/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java
+++ b/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java
@@ -17,7 +17,6 @@
 
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import javax.xml.registry.JAXRException;
diff --git a/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java b/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java
index f641f9b..1f20983 100644
--- a/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java
+++ b/src/main/java/org/apache/ws/scout/registry/infomodel/ServiceImpl.java
@@ -25,7 +25,6 @@
 import javax.xml.registry.LifeCycleManager;

 import javax.xml.registry.RegistryService;

 import javax.xml.registry.UnexpectedObjectException;

-import javax.xml.registry.infomodel.Key;

 import javax.xml.registry.infomodel.Organization;

 import javax.xml.registry.infomodel.Service;

 import javax.xml.registry.infomodel.ServiceBinding;

diff --git a/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java b/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java
index 9ffc7dd..5da899e 100644
--- a/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java
+++ b/src/main/java/org/apache/ws/scout/util/ScoutJaxrUddiHelper.java
@@ -16,7 +16,11 @@
  */
 package org.apache.ws.scout.util;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
 
 import javax.xml.registry.JAXRException;
 import javax.xml.registry.infomodel.Association;
@@ -269,22 +273,13 @@
 				// enumeration, the key can be the parent classification scheme
                 key = c.getClassificationScheme().getKey();
             }
-			if (key == null || key.getId() == null) {
-				// The parent classification scheme may not always contain the
-				// key. It is okay if it doesn't, since the UDDI v2 spec allows
-				// TModelKey to be absent.
-
-				// TODO: This setting to "" should not be needed at all.
-				// However, a bug in jUDDI needs it to be there. See:
-				// http://issues.apache.org/jira/browse/JUDDI-78
-				//kr.setTModelKey("");
-			} else {
-                kr.setTModelKey(key.getId());
-			}
+			if (key != null && key.getId() != null) {
+				kr.setTModelKey(key.getId());
+			} 
             kr.setKeyName("Concept");
 
 			if (v != null) {
-            kr.setKeyValue(v);
+				kr.setKeyValue(v);
 			}
 
             pa.setKeyedReference(kr);
@@ -862,8 +857,7 @@
 						}
 					}
 				} else {
-					// ebXML case - the RegistryObject is an ExtrinsicObject
-					// Not implemented
+					log.info("ebXML case - the RegistryObject is an ExtrinsicObject, Not implemented");
 				}
 			}
 			return tbag;
diff --git a/src/main/java/org/apache/ws/scout/util/XMLUtils.java b/src/main/java/org/apache/ws/scout/util/XMLUtils.java
index 5ee68ff..d65e2aa 100644
--- a/src/main/java/org/apache/ws/scout/util/XMLUtils.java
+++ b/src/main/java/org/apache/ws/scout/util/XMLUtils.java
@@ -40,7 +40,7 @@
 		  } catch (TransformerConfigurationException e) {

 		      log.error("Could not obtain the XML. ", e);

 		  } catch (TransformerException e) {

-			  log.error("Could not obtain the XML. ",e);;

+			  log.error("Could not obtain the XML. ",e);

 		  }

 		  return xml;

 	  }

diff --git a/src/test/java/org/apache/ws/scout/registry/BusinessQueryManager2Test.java b/src/test/java/org/apache/ws/scout/registry/BusinessQueryManager2Test.java
index 1c03291..d86ab17 100644
--- a/src/test/java/org/apache/ws/scout/registry/BusinessQueryManager2Test.java
+++ b/src/test/java/org/apache/ws/scout/registry/BusinessQueryManager2Test.java
@@ -1,9 +1,8 @@
 package org.apache.ws.scout.registry;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,12 +21,12 @@
 import javax.xml.registry.infomodel.Organization;
 import javax.xml.registry.infomodel.RegistryPackage;
 
+import org.apache.ws.scout.BaseTestCase;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
-import org.apache.ws.scout.BaseTestCase;
-
 /**
  * Additional BusinessQueryManager test methods.
  * 
@@ -70,15 +69,16 @@
         	RegistryService rs = connection.getRegistryService();
 
         	BusinessQueryManager bqm = rs.getBusinessQueryManager();
-        	BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
-        	BulkResponse br = bqm.getRegistryObjects();
+        	@SuppressWarnings("unused")
+			BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
+        	@SuppressWarnings("unused")
+			BulkResponse br = bqm.getRegistryObjects();
 		} catch (JAXRException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
 	
-    //@Test
+    @Test @Ignore
 	public void testFindCallerAssociations() {
         BulkResponse br = null;
     	try {
@@ -195,7 +195,7 @@
 		}		
 	}
 	
-    @Test
+    @Test @Ignore
 	public void testFindRegistryPackages() {
         login();
         try {
@@ -214,7 +214,7 @@
         	
         	BulkResponse br = bqm.findRegistryPackages(null, namePatterns, classifications, null);
         	fail("findRegistryPackages is currently unsupported");
-        	/*
+        	
         	assertEquals(null, br.getExceptions());
         	assertEquals(br.getCollection().size(), 0);
         	
@@ -231,8 +231,9 @@
         	br = bqm.findRegistryPackages(null, namePatterns, classifications, null);
         	assertEquals(null, br.getExceptions());
         	assertEquals(br.getCollection(), 1);
-        */
+        
         } catch (JAXRException e) {
+        	e.printStackTrace();
 		}				
 	}
 }
diff --git a/src/test/java/org/apache/ws/scout/registry/OwnershipTest.java b/src/test/java/org/apache/ws/scout/registry/OwnershipTest.java
index 025c412..cc93dd8 100644
--- a/src/test/java/org/apache/ws/scout/registry/OwnershipTest.java
+++ b/src/test/java/org/apache/ws/scout/registry/OwnershipTest.java
@@ -15,9 +15,6 @@
  */
 package org.apache.ws.scout.registry;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
@@ -32,20 +29,15 @@
 import javax.xml.registry.JAXRResponse;
 import javax.xml.registry.LifeCycleManager;
 import javax.xml.registry.RegistryService;
-import javax.xml.registry.infomodel.Association;
-import javax.xml.registry.infomodel.ClassificationScheme;
-import javax.xml.registry.infomodel.Concept;
 import javax.xml.registry.infomodel.InternationalString;
 import javax.xml.registry.infomodel.Key;
 import javax.xml.registry.infomodel.Organization;
-import javax.xml.registry.infomodel.RegistryPackage;
-import javax.xml.registry.infomodel.User;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
 import org.apache.ws.scout.BaseTestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
 
 /**
  *
@@ -58,6 +50,7 @@
 public class OwnershipTest extends BaseTestCase {
 	RegistryService rs, rs2;
 	private BusinessQueryManager bqm, bqm2;
+	@SuppressWarnings("unused")
 	private BusinessLifeCycleManager blm, blm2;
 	Collection associationKeys = null;
 	
@@ -152,9 +145,9 @@
         }
     }
     
-    @Test
+    @Test @Ignore
 	public void testGetRegistryObjects() {
-/*
+
     	login();
         try {
 
@@ -197,9 +190,8 @@
         	deleteTempOrg(org2.getKey());
         
 		} catch (JAXRException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		*/
+		
 	}
 }
diff --git a/src/test/java/org/apache/ws/scout/registry/qa/JAXR030AssociationsTest.java b/src/test/java/org/apache/ws/scout/registry/qa/JAXR030AssociationsTest.java
index a89a3d4..2660b47 100644
--- a/src/test/java/org/apache/ws/scout/registry/qa/JAXR030AssociationsTest.java
+++ b/src/test/java/org/apache/ws/scout/registry/qa/JAXR030AssociationsTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.ws.scout.registry.qa;
 
-import static org.junit.Assert.fail;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/test/java/org/apache/ws/scout/registry/qa/JAXR050ServiceBindingTest.java b/src/test/java/org/apache/ws/scout/registry/qa/JAXR050ServiceBindingTest.java
index 74c4d71..b69c6bc 100644
--- a/src/test/java/org/apache/ws/scout/registry/qa/JAXR050ServiceBindingTest.java
+++ b/src/test/java/org/apache/ws/scout/registry/qa/JAXR050ServiceBindingTest.java
@@ -109,7 +109,8 @@
             
             //find serviceBinding
             Collection<ServiceBinding> serviceBindings2 = finder.findServiceBindings(tmpSvcKey );
-            ServiceBinding serviceBinding2 = serviceBindings2.iterator().next();
+            @SuppressWarnings("unused")
+			ServiceBinding serviceBinding2 = serviceBindings2.iterator().next();
             
             // All created ... now try to delete.
             deleteServiceBinding(sbKey);