ws-scout-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ks...@apache.org
Subject svn commit: r552031 [1/2] - in /webservices/scout/trunk: ./ jaxr-api/ jaxr-api/src/ jaxr-api/src/main/java/javax/xml/registry/ jaxr-api/src/main/java/javax/xml/registry/infomodel/ modules/jaxr-api/ modules/scout/ scout/ scout/src/ scout/src/main/java/o...
Date Fri, 29 Jun 2007 20:57:02 GMT
Author: kstam
Date: Fri Jun 29 13:56:57 2007
New Revision: 552031

URL: http://svn.apache.org/viewvc?view=rev&rev=552031
Log:
SCOUT-16, SCOUT-36. Moving the code to adhere to Maven tree structure convention for multiple modules, fixing maven2 build.

Added:
    webservices/scout/trunk/jaxr-api/
      - copied from r547768, webservices/scout/trunk/modules/jaxr-api/
    webservices/scout/trunk/jaxr-api/jaxr-api.iml
      - copied unchanged from r552028, webservices/scout/trunk/modules/jaxr-api/jaxr-api.iml
    webservices/scout/trunk/jaxr-api/pom.xml
      - copied unchanged from r552028, webservices/scout/trunk/modules/jaxr-api/pom.xml
    webservices/scout/trunk/jaxr-api/project.properties
      - copied unchanged from r552028, webservices/scout/trunk/modules/jaxr-api/project.properties
    webservices/scout/trunk/jaxr-api/project.xml
      - copied unchanged from r552028, webservices/scout/trunk/modules/jaxr-api/project.xml
    webservices/scout/trunk/jaxr-api/src/
      - copied from r552028, webservices/scout/trunk/modules/jaxr-api/src/
    webservices/scout/trunk/scout/
      - copied from r547768, webservices/scout/trunk/modules/scout/
    webservices/scout/trunk/scout/pom.xml
      - copied, changed from r552028, webservices/scout/trunk/modules/scout/pom.xml
    webservices/scout/trunk/scout/project.properties
      - copied unchanged from r552028, webservices/scout/trunk/modules/scout/project.properties
    webservices/scout/trunk/scout/project.xml
      - copied unchanged from r552028, webservices/scout/trunk/modules/scout/project.xml
    webservices/scout/trunk/scout/scout.iml
      - copied unchanged from r552028, webservices/scout/trunk/modules/scout/scout.iml
    webservices/scout/trunk/scout/src/
      - copied from r552028, webservices/scout/trunk/modules/scout/src/
    webservices/scout/trunk/src/test/
    webservices/scout/trunk/src/test/resources/
    webservices/scout/trunk/src/test/resources/juddi.properties   (with props)
Removed:
    webservices/scout/trunk/modules/jaxr-api/
    webservices/scout/trunk/modules/scout/
Modified:
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessLifeCycleManager.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessQueryManager.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/DeleteException.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/FindException.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/InvalidRequestException.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/JAXRException.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/QueryManager.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/RegistryException.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/SaveException.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/UnexpectedObjectException.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/UnsupportedCapabilityException.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/AuditableEvent.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ClassificationScheme.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Concept.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExtensibleObject.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExternalLink.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/InternationalString.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/LocalizedString.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Organization.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryEntry.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryObject.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryPackage.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Service.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ServiceBinding.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Slot.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/SpecificationLink.java
    webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/User.java
    webservices/scout/trunk/pom.xml
    webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR01PublishOrgTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR02QueryOrgTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR03DeleteOrgTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXRQueryTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JaxrPublishOrgTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/BusinessQueryManagerImplTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/InternationalStringTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/SlotTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR01PublishClassificationSchemeTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR01PublishConceptTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR02DeleteClassificationSchemeTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR02DeleteConceptTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteAssociationsTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteServiceBindingTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteServiceTest.java
    webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/query/JAXRQueryTest.java

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessLifeCycleManager.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessLifeCycleManager.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessLifeCycleManager.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessLifeCycleManager.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry;
 
-import javax.xml.registry.infomodel.Association;
 import java.util.Collection;
+
+import javax.xml.registry.infomodel.Association;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessQueryManager.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessQueryManager.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessQueryManager.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/BusinessQueryManager.java Fri Jun 29 13:56:57 2007
@@ -22,10 +22,11 @@
 //
 package javax.xml.registry;
 
+import java.util.Collection;
+
 import javax.xml.registry.infomodel.ClassificationScheme;
 import javax.xml.registry.infomodel.Concept;
 import javax.xml.registry.infomodel.Key;
-import java.util.Collection;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/DeleteException.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/DeleteException.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/DeleteException.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/DeleteException.java Fri Jun 29 13:56:57 2007
@@ -26,6 +26,11 @@
  * @version $Revision$ $Date$
  */
 public class DeleteException extends RegistryException {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
     public DeleteException() {
     }
 

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/FindException.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/FindException.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/FindException.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/FindException.java Fri Jun 29 13:56:57 2007
@@ -26,6 +26,11 @@
  * @version $Revision$ $Date$
  */
 public class FindException extends RegistryException {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
     public FindException() {
     }
 

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/InvalidRequestException.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/InvalidRequestException.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/InvalidRequestException.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/InvalidRequestException.java Fri Jun 29 13:56:57 2007
@@ -26,6 +26,11 @@
  * @version $Revision$ $Date$
  */
 public class InvalidRequestException extends JAXRException {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
     public InvalidRequestException() {
     }
 

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/JAXRException.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/JAXRException.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/JAXRException.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/JAXRException.java Fri Jun 29 13:56:57 2007
@@ -30,6 +30,10 @@
  */
 public class JAXRException extends Exception implements JAXRResponse {
 
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
     protected Throwable cause = null;
 
     public JAXRException() {

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java Fri Jun 29 13:56:57 2007
@@ -22,6 +22,9 @@
 //
 package javax.xml.registry;
 
+import java.util.Collection;
+import java.util.Locale;
+
 import javax.activation.DataHandler;
 import javax.xml.registry.infomodel.Association;
 import javax.xml.registry.infomodel.Classification;
@@ -45,8 +48,6 @@
 import javax.xml.registry.infomodel.SpecificationLink;
 import javax.xml.registry.infomodel.TelephoneNumber;
 import javax.xml.registry.infomodel.User;
-import java.util.Collection;
-import java.util.Locale;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/QueryManager.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/QueryManager.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/QueryManager.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/QueryManager.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry;
 
-import javax.xml.registry.infomodel.RegistryObject;
 import java.util.Collection;
+
+import javax.xml.registry.infomodel.RegistryObject;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/RegistryException.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/RegistryException.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/RegistryException.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/RegistryException.java Fri Jun 29 13:56:57 2007
@@ -28,6 +28,10 @@
  * @version $Revision$ $Date$
  */
 public class RegistryException extends JAXRException {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
     private Key errorObjectKey;
 
     public RegistryException() {

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/SaveException.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/SaveException.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/SaveException.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/SaveException.java Fri Jun 29 13:56:57 2007
@@ -26,6 +26,11 @@
  * @version $Revision$ $Date$
  */
 public class SaveException extends RegistryException {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
     public SaveException() {
     }
 

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/UnexpectedObjectException.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/UnexpectedObjectException.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/UnexpectedObjectException.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/UnexpectedObjectException.java Fri Jun 29 13:56:57 2007
@@ -26,6 +26,11 @@
  * @version $Revision$ $Date$
  */
 public class UnexpectedObjectException extends JAXRException {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
     public UnexpectedObjectException() {
     }
 

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/UnsupportedCapabilityException.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/UnsupportedCapabilityException.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/UnsupportedCapabilityException.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/UnsupportedCapabilityException.java Fri Jun 29 13:56:57 2007
@@ -26,6 +26,11 @@
  * @version $Revision$ $Date$
  */
 public class UnsupportedCapabilityException extends JAXRException {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
     public UnsupportedCapabilityException() {
     }
 

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/AuditableEvent.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/AuditableEvent.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/AuditableEvent.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/AuditableEvent.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.sql.Timestamp;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ClassificationScheme.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ClassificationScheme.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ClassificationScheme.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ClassificationScheme.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Collection;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Concept.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Concept.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Concept.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Concept.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Collection;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExtensibleObject.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExtensibleObject.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExtensibleObject.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExtensibleObject.java Fri Jun 29 13:56:57 2007
@@ -22,9 +22,10 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Collection;
 
+import javax.xml.registry.JAXRException;
+
 /**
  * @version $Revision$ $Date$
  */
@@ -35,9 +36,9 @@
 
     Slot getSlot(String slotName) throws JAXRException;
 
-    Collection getSlots() throws JAXRException;
+    Collection<Slot> getSlots() throws JAXRException;
 
     void removeSlot(String slotName) throws JAXRException;
 
-    void removeSlots(Collection soltNames) throws JAXRException;
+    void removeSlots(Collection slotNames) throws JAXRException;
 }

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExternalLink.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExternalLink.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExternalLink.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExternalLink.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Collection;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/InternationalString.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/InternationalString.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/InternationalString.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/InternationalString.java Fri Jun 29 13:56:57 2007
@@ -22,10 +22,11 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Collection;
 import java.util.Locale;
 
+import javax.xml.registry.JAXRException;
+
 /**
  * @version $Revision$ $Date$
  */
@@ -36,7 +37,7 @@
 
     LocalizedString getLocalizedString(Locale locale, String charsetName) throws JAXRException;
 
-    Collection getLocalizedStrings() throws JAXRException;
+    Collection<LocalizedString> getLocalizedStrings() throws JAXRException;
 
     String getValue() throws JAXRException;
 

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/LocalizedString.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/LocalizedString.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/LocalizedString.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/LocalizedString.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Locale;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Organization.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Organization.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Organization.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Organization.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Collection;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryEntry.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryEntry.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryEntry.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryEntry.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Date;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryObject.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryObject.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryObject.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryObject.java Fri Jun 29 13:56:57 2007
@@ -22,9 +22,10 @@
 //
 package javax.xml.registry.infomodel;
 
+import java.util.Collection;
+
 import javax.xml.registry.JAXRException;
 import javax.xml.registry.LifeCycleManager;
-import java.util.Collection;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryPackage.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryPackage.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryPackage.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryPackage.java Fri Jun 29 13:56:57 2007
@@ -22,9 +22,10 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Collection;
 import java.util.Set;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Service.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Service.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Service.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Service.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Collection;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ServiceBinding.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ServiceBinding.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ServiceBinding.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ServiceBinding.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Collection;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Slot.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Slot.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Slot.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Slot.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Collection;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/SpecificationLink.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/SpecificationLink.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/SpecificationLink.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/SpecificationLink.java Fri Jun 29 13:56:57 2007
@@ -22,8 +22,9 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.util.Collection;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/User.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/User.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/User.java (original)
+++ webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/User.java Fri Jun 29 13:56:57 2007
@@ -22,9 +22,10 @@
 //
 package javax.xml.registry.infomodel;
 
-import javax.xml.registry.JAXRException;
 import java.net.URL;
 import java.util.Collection;
+
+import javax.xml.registry.JAXRException;
 
 /**
  * @version $Revision$ $Date$

Modified: webservices/scout/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/pom.xml?view=diff&rev=552031&r1=552030&r2=552031
==============================================================================
--- webservices/scout/trunk/pom.xml (original)
+++ webservices/scout/trunk/pom.xml Fri Jun 29 13:56:57 2007
@@ -1,439 +1,476 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-        xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.ws.scout</groupId>
-    <artifactId>scout-parent</artifactId>
-    <packaging>pom</packaging>
-    <name>Scout</name>
-    <version>SNAPSHOT</version>
-    <description>Scout API</description>
-    <url>http://ws.apache.org/scout/</url>
-    <issueManagement>
-        <system>JIRA</system>
-        <url>http://issues.apache.org/jira/browse/SCOUT</url>
-    </issueManagement>
-    <ciManagement>
-        <system>Continuum</system>
-        <url>unknown</url>
-        <notifiers>
-            <notifier>
-                <sendOnError>false</sendOnError>
-                <sendOnFailure>false</sendOnFailure>
-                <sendOnSuccess>false</sendOnSuccess>
-                <sendOnWarning>false</sendOnWarning>
-                <configuration>
-                    <address>scout-dev@ws.apache.org</address>
-                </configuration>
-            </notifier>
-        </notifiers>
-    </ciManagement>
-    <mailingLists>
-        <mailingList>
-            <name>WS Scout Developers</name>
-            <subscribe>scout-dev-subscribe@ws.apache.org</subscribe>
-            <unsubscribe>scout-dev-unsubscribe@ws.apache.org</unsubscribe>
-            <post>scout-dev@ws.apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/ws-scout-dev/</archive>
-        </mailingList>
-    </mailingLists>
-    <inceptionYear>2004</inceptionYear>
-    <developers>
-        <developer>
-            <name>Saminda Abeyruwan</name>
-            <id>saminda</id>
-            <email>saminda AT wso2.com</email>
-            <organization>WSO2</organization>
-        </developer>
-        <developer>
-            <name>Afkham Azeez</name>
-            <id>azeez</id>
-            <email>azeez AT wso2.com</email>
-            <organization>WSO2</organization>
-        </developer>
-        <developer>
-            <name>Eran Chinthaka</name>
-            <id>chinthaka</id>
-            <email>chinthaka AT wso2.com</email>
-            <organization>WSO2</organization>
-            <url>http://www.apache.org/~chinthaka</url>
-        </developer>
-        <developer>
-            <name>Glen Daniels</name>
-            <id>gdaniels</id>
-            <email>gdaniels AT apache.org</email>
-            <organization>Sonic Software</organization>
-        </developer>
-        <developer>
-            <name>Jaliya Ekanayake</name>
-            <id>jaliya</id>
-            <email>jaliya AT opensource.lk</email>
-            <organization>Virtusa / Lanka Software Foundation</organization>
-            <url>http://www.apache.org/~jaliya</url>
-        </developer>
-        <developer>
-            <name>Ruchith Fernando</name>
-            <id>ruchith</id>
-            <email>ruchith AT wso2.com</email>
-            <organization>WSO2</organization>
-        </developer>
-     <developer>
-           <id>thilina</id>
-            <name>Thilina Gunarathne</name>
-            <email>thilina AT wso2.com</email>
-            <url>http://www.apache.org/~thilina</url>
-            <organization>WSO2</organization>
-        </developer>
-        <developer>
-            <name>Chathura Herath</name>
-            <id>chathura</id>
-            <email>chathura AT opensource.lk</email>
-            <organization>LSF/MIT</organization>
-            <url>www.apache.org/~chathura</url>
-        </developer>
-        <developer>
-            <name>Deepal Jayasinghe</name>
-            <id>deepal</id>
-            <email>deepal AT wso2.com</email>
-            <organization>WSO2</organization>
-            <url>http://www.apache.org/~deepal</url>
-        </developer>
-        <developer>
-            <name>Chatra Nakkawita</name>
-            <id>chatra</id>
-            <email>chatra AT WSO2.com</email>
-            <organization>WSO2</organization>
-        </developer>
-        <developer>
-            <name>Srinath Perera</name>
-            <id>hemapani</id>
-            <email>hemapani AT apache.org</email>
-            <organization>Lanka Software Foundation</organization>
-            <url>http://www.apache.org/~hemapani</url>
-        </developer>
-        <developer>
-            <name>Ajith Ranabahu</name>
-            <id>ajith</id>
-            <email>ajith AT wso2.com</email>
-            <organization>WSO2</organization>
-            <url>http://www.apache.org/~ajith</url>
-        </developer>
-        <developer>
-            <name>Venkat Reddy</name>
-            <id>venkat</id>
-            <email>vreddyp AT gmail.com</email>
-            <organization>Computer Associates</organization>
-        </developer>
-        <developer>
-            <name>Ashutosh Shahi</name>
-            <id>ashu</id>
-            <email>Ashutosh.Shahi AT ca.com</email>
-            <organization>Computer Associates</organization>
-        </developer>
-        <developer>
-            <name>Aleksander Slominski</name>
-            <id>alek</id>
-            <email>aslom AT cs.indiana.edu</email>
-            <organization>Indiana University Extreme! Computing Lab</organization>
-        </developer>
-        <developer>
-            <name>Davanum Srinivas</name>
-            <id>dims</id>
-            <email>dims AT wso2.com</email>
-            <organization>WSO2</organization>
-        </developer>
-        <developer>
-            <name>Jayachandra Sekhara Rao Sunkara</name>
-            <id>jaya</id>
-            <email>jayachandra AT gmail.com</email>
-            <organization>Computer Associates</organization>
-        </developer>
-        <developer>
-            <name>Dasarath Weerathunga</name>
-            <id>dasarath</id>
-            <email>dasarath AT opensource.lk</email>
-            <organization>Lanka Software Foundation</organization>
-        </developer>
-        <developer>
-            <name>Sanjiva Weerawarana</name>
-            <id>sanjiva</id>
-            <email>sanjiva AT wso2.com</email>
-            <organization>WSO2</organization>
-        </developer>
-    </developers>
-    <contributors>
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.ws.scout</groupId>
+  <artifactId>scout-parent</artifactId>
+  <packaging>pom</packaging>
+  <name>Scout</name>
+  <version>SNAPSHOT</version>
+  <description>Scout API</description>
+  <url>http://ws.apache.org/scout/</url>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>http://issues.apache.org/jira/browse/SCOUT</url>
+  </issueManagement>
+  <ciManagement>
+    <system>Continuum</system>
+    <url>unknown</url>
+    <notifiers>
+      <notifier>
+        <sendOnError>false</sendOnError>
+        <sendOnFailure>false</sendOnFailure>
+        <sendOnSuccess>false</sendOnSuccess>
+        <sendOnWarning>false</sendOnWarning>
+        <configuration>
+          <address>scout-dev@ws.apache.org</address>
+        </configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+  <inceptionYear>2004</inceptionYear>
+  <mailingLists>
+    <mailingList>
+      <name>WS Scout Developers</name>
+      <subscribe>scout-dev-subscribe@ws.apache.org</subscribe>
+      <unsubscribe>scout-dev-unsubscribe@ws.apache.org</unsubscribe>
+      <post>scout-dev@ws.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/ws-scout-dev/</archive>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <id>saminda</id>
+      <name>Saminda Abeyruwan</name>
+      <email>saminda AT wso2.com</email>
+      <organization>WSO2</organization>
+    </developer>
+    <developer>
+      <id>azeez</id>
+      <name>Afkham Azeez</name>
+      <email>azeez AT wso2.com</email>
+      <organization>WSO2</organization>
+    </developer>
+    <developer>
+      <id>chinthaka</id>
+      <name>Eran Chinthaka</name>
+      <email>chinthaka AT wso2.com</email>
+      <url>http://www.apache.org/~chinthaka</url>
+      <organization>WSO2</organization>
+    </developer>
+    <developer>
+      <id>gdaniels</id>
+      <name>Glen Daniels</name>
+      <email>gdaniels AT apache.org</email>
+      <organization>Sonic Software</organization>
+    </developer>
+    <developer>
+      <id>jaliya</id>
+      <name>Jaliya Ekanayake</name>
+      <email>jaliya AT opensource.lk</email>
+      <url>http://www.apache.org/~jaliya</url>
+      <organization>Virtusa / Lanka Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>ruchith</id>
+      <name>Ruchith Fernando</name>
+      <email>ruchith AT wso2.com</email>
+      <organization>WSO2</organization>
+    </developer>
+    <developer>
+      <id>thilina</id>
+      <name>Thilina Gunarathne</name>
+      <email>thilina AT wso2.com</email>
+      <url>http://www.apache.org/~thilina</url>
+      <organization>WSO2</organization>
+    </developer>
+    <developer>
+      <id>chathura</id>
+      <name>Chathura Herath</name>
+      <email>chathura AT opensource.lk</email>
+      <url>www.apache.org/~chathura</url>
+      <organization>LSF/MIT</organization>
+    </developer>
+    <developer>
+      <id>deepal</id>
+      <name>Deepal Jayasinghe</name>
+      <email>deepal AT wso2.com</email>
+      <url>http://www.apache.org/~deepal</url>
+      <organization>WSO2</organization>
+    </developer>
+    <developer>
+      <id>chatra</id>
+      <name>Chatra Nakkawita</name>
+      <email>chatra AT WSO2.com</email>
+      <organization>WSO2</organization>
+    </developer>
+    <developer>
+      <id>hemapani</id>
+      <name>Srinath Perera</name>
+      <email>hemapani AT apache.org</email>
+      <url>http://www.apache.org/~hemapani</url>
+      <organization>Lanka Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>ajith</id>
+      <name>Ajith Ranabahu</name>
+      <email>ajith AT wso2.com</email>
+      <url>http://www.apache.org/~ajith</url>
+      <organization>WSO2</organization>
+    </developer>
+    <developer>
+      <id>venkat</id>
+      <name>Venkat Reddy</name>
+      <email>vreddyp AT gmail.com</email>
+      <organization>Computer Associates</organization>
+    </developer>
+    <developer>
+      <id>ashu</id>
+      <name>Ashutosh Shahi</name>
+      <email>Ashutosh.Shahi AT ca.com</email>
+      <organization>Computer Associates</organization>
+    </developer>
+    <developer>
+      <id>alek</id>
+      <name>Aleksander Slominski</name>
+      <email>aslom AT cs.indiana.edu</email>
+      <organization>Indiana University Extreme! Computing Lab</organization>
+    </developer>
+    <developer>
+      <id>dims</id>
+      <name>Davanum Srinivas</name>
+      <email>dims AT wso2.com</email>
+      <organization>WSO2</organization>
+    </developer>
+    <developer>
+      <id>jaya</id>
+      <name>Jayachandra Sekhara Rao Sunkara</name>
+      <email>jayachandra AT gmail.com</email>
+      <organization>Computer Associates</organization>
+    </developer>
+    <developer>
+      <id>dasarath</id>
+      <name>Dasarath Weerathunga</name>
+      <email>dasarath AT opensource.lk</email>
+      <organization>Lanka Software Foundation</organization>
+    </developer>
+    <developer>
+      <id>sanjiva</id>
+      <name>Sanjiva Weerawarana</name>
+      <email>sanjiva AT wso2.com</email>
+      <organization>WSO2</organization>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Dharshana Dias</name>
+      <email></email>
+      <organization>Lanka Software Foundation / University of Moratuwa</organization>
+    </contributor>
+    <contributor>
+      <name>Anushka Kumara</name>
+      <email>anushkakumar AT gmail.com</email>
+      <organization>Lanka Software Foundation / University of Moratuwa</organization>
+    </contributor>
+    <contributor>
+      <name>Chinthaka Thilakarathne</name>
+      <email></email>
+      <organization>Lanka Software Foundation / University of Moratuwa</organization>
+    </contributor>
+    <contributor>
+      <name>Jochen Wiedmann</name>
+      <email>jochen.wiedmann AT gmail.com</email>
+    </contributor>
+  </contributors>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/scout/trunk/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/scout/trunk/</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/webservices/scout/trunk/</url>
+  </scm>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/bin.xml</descriptor>
+            <descriptor>src/main/assembly/src.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <attach>true</attach>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>release</id>
+      <activation>
+        <property>
+          <name>release</name>
+          <value></value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <attach>true</attach>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-one-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>install-maven-one-repository</goal>
+                  <goal>deploy-maven-one-repository</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <remoteRepositoryId>apache-snapshots</remoteRepositoryId>
+              <remoteRepositoryUrl>scp://people.apache.org/www/people.apache.org/repo/m1-ibiblio-rsync-repository</remoteRepositoryUrl>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-release-plugin</artifactId>
+            <configuration>
+              <tagBase>http://svn.apache.org/repos/asf/webservices/scout/tags/</tagBase>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>rc</id>
+      <activation>
+        <property>
+          <name>rc</name>
+          <value></value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <attach>true</attach>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-one-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>install-maven-one-repository</goal>
+                  <goal>deploy-maven-one-repository</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <remoteRepositoryId>apache-snapshots</remoteRepositoryId>
+              <remoteRepositoryUrl>scp://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository</remoteRepositoryUrl>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <modules>
+    <module>jaxr-api</module>
+    <module>scout</module>
+  </modules>
+  <repositories>
+    <repository>
+      <id>maven2</id>
+      <name>Maven Central Development Repository</name>
+      <url>http://repo1.maven.org/maven2</url>
+    </repository>
+    <repository>
+      <id>snapshot-apache</id>
+      <name>Apache Snapshot repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots />
+      <id>snapshot</id>
+      <name>Snapshot repository</name>
+      <url>http://snapshots.maven.codehaus.org/maven2/</url>
+    </pluginRepository>
+    <pluginRepository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots />
+      <id>snapshot-apache</id>
+      <name>Apache Snapshot repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+    </pluginRepository>
+  </pluginRepositories>
+  <dependencies>
+          <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-activation</artifactId>
+            <version>1.0.2-rc4</version>
+        </dependency>
+        <dependency>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>1.0</version>
+        </dependency>
 
-        <contributor>
-            <name>Dharshana Dias</name>
-            <email/>
-            <organization>Lanka Software Foundation / University of Moratuwa</organization>
-        </contributor>
-        <contributor>
-            <name>Anushka Kumara</name>
-            <email>anushkakumar AT gmail.com</email>
-            <organization>Lanka Software Foundation / University of Moratuwa</organization>
-        </contributor>
-        <contributor>
-            <name>Chinthaka Thilakarathne</name>
-            <email/>
-            <organization>Lanka Software Foundation / University of Moratuwa</organization>
-        </contributor>
-        <contributor>
-            <name>Jochen Wiedmann</name>
-            <email>jochen.wiedmann AT gmail.com</email>
-        </contributor>
-    </contributors>
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/scout/trunk/</connection>
-        <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/webservices/scout/trunk/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/webservices/scout/trunk/</url>
-    </scm>
-    <organization>
-        <name>Apache Software Foundation</name>
-        <url>http://www.apache.org/</url>
-    </organization>
-    <profiles>
-        <profile>
-            <id>release</id>
-            <activation>
-                <property>
-                    <name>release</name>
-                    <value></value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <attach>true</attach>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-one-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>install-maven-one-repository</goal>
-                                    <goal>deploy-maven-one-repository</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <remoteRepositoryId>apache-snapshots</remoteRepositoryId>
-                            <remoteRepositoryUrl>scp://people.apache.org/www/people.apache.org/repo/m1-ibiblio-rsync-repository</remoteRepositoryUrl>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-release-plugin</artifactId>
-                        <configuration>
-                            <tagBase>http://svn.apache.org/repos/asf/webservices/scout/tags/</tagBase>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>rc</id>
-            <activation>
-                <property>
-                    <name>rc</name>
-                    <value></value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <attach>true</attach>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-one-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>install-maven-one-repository</goal>
-                                    <goal>deploy-maven-one-repository</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <remoteRepositoryId>apache-snapshots</remoteRepositoryId>
-                            <remoteRepositoryUrl>scp://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository</remoteRepositoryUrl>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                        <descriptor>src/main/assembly/src.xml</descriptor>
-                    </descriptors>
-                    <tarLongFileMode>gnu</tarLongFileMode>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <attach>true</attach>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>snapshot</id>
-            <name>Snapshot repository</name>
-            <url>http://snapshots.maven.codehaus.org/maven2/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-        <pluginRepository>
-            <id>snapshot-apache</id>
-            <name>Apache Snapshot repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
-    <dependencyManagement>
-        <dependencies>
-         <dependency>
-          <groupId>xmlbeans</groupId>
-          <artifactId>xbean</artifactId>
-          <version>2.2.0</version>
-         </dependency>
-         <dependency>
-          <groupId>stax</groupId>
-          <artifactId>stax-api</artifactId>
-          <version>1.0.1</version>
-         </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <reporting>
-        <plugins>
-            <!--<plugin>-->
-                <!--<inherited>false</inherited>-->
-                <!--<artifactId>maven-javadoc-plugin</artifactId>-->
-                <!--<configuration>-->
-                    <!--<aggregate>true</aggregate>-->
-                <!--</configuration>-->
-            <!--</plugin>-->
-            <!--<plugin>-->
-                <!--<artifactId>maven-changes-plugin</artifactId>-->
-                <!--<reportSets>-->
-                    <!--<reportSet>-->
-                        <!--<reports>-->
-                            <!--<report>changes-report</report>-->
-                        <!--</reports>-->
-                    <!--</reportSet>-->
-                <!--</reportSets>-->
-            <!--</plugin>-->
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jdepend-maven-plugin</artifactId>
-            </plugin>
-            <!--<plugin>-->
-                <!--<groupId>org.codehaus.mojo</groupId>-->
-                <!--<artifactId>jxr-maven-plugin</artifactId>-->
-                <!--<version>2.0-beta-2-SNAPSHOT</version>-->
-            <!--</plugin>-->
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-            </plugin>
-        </plugins>
-    </reporting>
-    <distributionManagement>
-        <repository>
-            <id>apache-repo</id>
-            <name>Maven Central Repository</name>
-            <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-        </repository>
-        <snapshotRepository>
-            <id>apache-snapshots</id>
-            <name>Apache Development Repository</name>
-            <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
-        </snapshotRepository>
-        <site>
-            <id>website</id>
-            <url>scpexe://people.apache.org/www/ws.apache.org/scout</url>
-        </site>
-    </distributionManagement>
-
-    <!-- maven download repositry -->
-    <repositories>
-        <repository>
-            <id>maven2</id>
-            <name>Maven Central Development Repository</name>
-            <url>http://repo1.maven.org/maven2</url>
-        </repository>
-    </repositories>
-
-    <modules>
-        <module>modules/jaxr-api</module>
-        <module>modules/scout</module>
-    </modules>
-    <properties>
-        <scout.version>${pom.version}</scout.version>
-    </properties>
-</project>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-discovery</groupId>
+            <artifactId>commons-discovery</artifactId>
+            <version>0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis-saaj</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis-jaxrpc</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.8.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>juddi</artifactId>
+			<version>SNAPSHOT</version>
+		</dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>3.1.12</version>
+    </dependency>
+  </dependencies>
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jdepend-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <inherited>false</inherited>
+      </plugin>
+    </plugins>
+  </reporting>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>xmlbeans</groupId>
+        <artifactId>xbean</artifactId>
+        <version>2.2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
+        <version>1.0.1</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <distributionManagement>
+    <repository>
+      <id>apache-repo</id>
+      <name>Maven Central Repository</name>
+      <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+    </repository>
+    <snapshotRepository>
+      <id>apache-snapshots</id>
+      <name>Apache Development Repository</name>
+      <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
+    </snapshotRepository>
+    <site>
+      <id>website</id>
+      <url>scpexe://people.apache.org/www/ws.apache.org/scout</url>
+    </site>
+  </distributionManagement>
+  <properties>
+    <scout.version>${pom.version}</scout.version>
+  </properties>
+</project>

Copied: webservices/scout/trunk/scout/pom.xml (from r552028, webservices/scout/trunk/modules/scout/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/pom.xml?view=diff&rev=552031&p1=webservices/scout/trunk/modules/scout/pom.xml&r1=552028&p2=webservices/scout/trunk/scout/pom.xml&r2=552031
==============================================================================
--- webservices/scout/trunk/modules/scout/pom.xml (original)
+++ webservices/scout/trunk/scout/pom.xml Fri Jun 29 13:56:57 2007
@@ -22,67 +22,7 @@
         </dependency>
 
         <!-- external JARs -->
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-activation</artifactId>
-            <version>1.0.2-rc4</version>
-        </dependency>
-        <dependency>
-            <groupId>jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <version>1.0</version>
-        </dependency>
 
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-discovery</groupId>
-            <artifactId>commons-discovery</artifactId>
-            <version>0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-saaj</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-jaxrpc</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
-		</dependency>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<version>2.8.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.juddi</groupId>
-			<artifactId>juddi</artifactId>
-			<version>1.0-SNAPSHOT</version>
-		</dependency>
     </dependencies>
   <build>
     <plugins>
@@ -131,7 +71,7 @@
                                     classgendir="${compiled.classes.dir}"
                                     srcgendir="${schema.generated.src.dir}" 
                                     classpathref="maven.runtime.classpath">
-                                    <fileset dir="${basedir}/../../etc/" includes="uddi_v2.xsd,uddi_v2.xsdconfig"/>
+                                    <fileset dir="${basedir}/../etc/" includes="uddi_v2.xsd,uddi_v2.xsdconfig"/>
                                 </xmlbean>
 							</tasks>
 						</configuration>

Modified: webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java (original)
+++ webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java Fri Jun 29 13:56:57 2007
@@ -61,8 +61,8 @@
         slots.remove(slotName);
     }
 
-    public void removeSlots(Collection soltNames)
+    public void removeSlots(Collection slotNames)
     {
-        slots.keySet().removeAll(soltNames);
+        slots.keySet().removeAll(slotNames);
     }
 }

Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR01PublishOrgTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR01PublishOrgTest.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR01PublishOrgTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR01PublishOrgTest.java Fri Jun 29 13:56:57 2007
@@ -68,13 +68,14 @@
 
     public void testPublish()
     {
+        BulkResponse response = null;
         login();
         try
         {
             RegistryService rs = connection.getRegistryService();
 
             blm = rs.getBusinessLifeCycleManager();
-            Collection orgs = new ArrayList();
+            Collection<Organization> orgs = new ArrayList<Organization>();
             Organization org = createOrganization();
 
             orgs.add(org);
@@ -106,29 +107,26 @@
             System.out.println("We have the Business Query Manager");
 
             // Define find qualifiers and name patterns
-            Collection findQualifiers = new ArrayList();
+            Collection<String> findQualifiers = new ArrayList<String>();
             findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
-            Collection namePatterns = new ArrayList();
+            Collection<String> namePatterns = new ArrayList<String>();
             namePatterns.add("%Kurt%");
 
             // Find based upon qualifier type and values
             System.out.println("\n-- searching the registry --\n");
-            BulkResponse response =
+            response =
                     bqm.findOrganizations(findQualifiers,
                             namePatterns,
                             null,
                             null,
                             null,
                             null);
-
-            // check how many organisation we have matched
-            Collection org2s = response.getCollection();
             
-        } catch (JAXRException e)
-        {
+        } catch (JAXRException e) {
             e.printStackTrace();
 			fail(e.getMessage());
         }
+        assertNotNull(response);
     }
 
     /**
@@ -160,13 +158,13 @@
                 = blm.createPostalAddress("1901",
                         "Munsey Drive", "Forest Hill",
                         "MD", "USA", "21050-2747", "");
-        Collection postalAddresses = new ArrayList();
+        Collection<PostalAddress> postalAddresses = new ArrayList<PostalAddress>();
         postalAddresses.add(address);
-        Collection emailAddresses = new ArrayList();
+        Collection<EmailAddress> emailAddresses = new ArrayList<EmailAddress>();
         EmailAddress emailAddress = blm.createEmailAddress("anil@apache.org");
         emailAddresses.add(emailAddress);
 
-        Collection numbers = new ArrayList();
+        Collection<TelephoneNumber> numbers = new ArrayList<TelephoneNumber>();
         numbers.add(telephoneNumber);
         user.setPersonName(personName);
         user.setPostalAddresses(postalAddresses);
@@ -198,7 +196,7 @@
     {
         PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
                 passwd.toCharArray());
-        Set creds = new HashSet();
+        Set<PasswordAuthentication> creds = new HashSet<PasswordAuthentication>();
         creds.add(passwdAuth);
 
         try

Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR02QueryOrgTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR02QueryOrgTest.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR02QueryOrgTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR02QueryOrgTest.java Fri Jun 29 13:56:57 2007
@@ -16,12 +16,9 @@
  */
 package org.apache.ws.scout;
 
-import java.net.PasswordAuthentication;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Set;
 
 import javax.xml.registry.BulkResponse;
 import javax.xml.registry.BusinessQueryManager;
@@ -66,9 +63,9 @@
             System.out.println("We have the Business Query Manager");
 
             // Define find qualifiers and name patterns
-            Collection findQualifiers = new ArrayList();
+            Collection<String> findQualifiers = new ArrayList<String>();
             findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
-            Collection namePatterns = new ArrayList();
+            Collection<String> namePatterns = new ArrayList<String>();
             namePatterns.add("%" + queryString + "%");
 
             // Find based upon qualifier type and values
@@ -155,25 +152,6 @@
             {
                 System.out.println("  Email Address: " + (EmailAddress) eaIter.next());
             }
-        }
-    }
-
-    /**
-     * Does authentication with the uddi registry
-     */
-    private void login()
-    {
-        PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
-                passwd.toCharArray());
-        Set creds = new HashSet();
-        creds.add(passwdAuth);
-
-        try
-        {
-            connection.setCredentials(creds);
-        } catch (JAXRException e)
-        {
-            e.printStackTrace();
         }
     }
 

Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR03DeleteOrgTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR03DeleteOrgTest.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR03DeleteOrgTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXR03DeleteOrgTest.java Fri Jun 29 13:56:57 2007
@@ -103,7 +103,7 @@
     {
         PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
                 passwd.toCharArray());
-        Set creds = new HashSet();
+        Set<PasswordAuthentication> creds = new HashSet<PasswordAuthentication>();
         creds.add(passwdAuth);
 
         try
@@ -117,9 +117,9 @@
 
     private Collection findOrganizationsByName(String queryStr) throws JAXRException {
     	// Define find qualifiers and name patterns
-    	Collection findQualifiers = new ArrayList();
+    	Collection<String> findQualifiers = new ArrayList<String>();
     	findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
-    	Collection namePatterns = new ArrayList();
+    	Collection<String> namePatterns = new ArrayList<String>();
     	namePatterns.add("%" + queryStr + "%");
     	
     	BulkResponse response;
@@ -143,7 +143,7 @@
     	
     	String id = key.getId();
     	System.out.println("Deleting organization with id " + id);
-    	Collection keys = new ArrayList();
+    	Collection<Key> keys = new ArrayList<Key>();
     	keys.add(key);
     	BulkResponse response = blm.deleteOrganizations(keys);
     	Collection exceptions = response.getExceptions();

Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXRQueryTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXRQueryTest.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXRQueryTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JAXRQueryTest.java Fri Jun 29 13:56:57 2007
@@ -64,9 +64,9 @@
             System.out.println("We have the Business Query Manager");
 
             // Define find qualifiers and name patterns
-            Collection findQualifiers = new ArrayList();
+            Collection<String> findQualifiers = new ArrayList<String>();
             findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
-            Collection namePatterns = new ArrayList();
+            Collection<String> namePatterns = new ArrayList<String>();
             namePatterns.add("%" + queryString + "%");
 
             // Find based upon qualifier type and values

Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JaxrPublishOrgTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JaxrPublishOrgTest.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JaxrPublishOrgTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/JaxrPublishOrgTest.java Fri Jun 29 13:56:57 2007
@@ -73,7 +73,7 @@
             RegistryService rs = connection.getRegistryService();
 
             blm = rs.getBusinessLifeCycleManager();
-            Collection orgs = new ArrayList();
+            Collection<Organization> orgs = new ArrayList<Organization>();
             Organization org = createOrganization();
 
             orgs.add(org);
@@ -128,13 +128,13 @@
                 = blm.createPostalAddress("1901",
                         "Munsey Drive", "Forest Hill",
                         "MD", "USA", "21050-2747", "");
-        Collection postalAddresses = new ArrayList();
+        Collection<PostalAddress> postalAddresses = new ArrayList<PostalAddress>();
         postalAddresses.add(address);
-        Collection emailAddresses = new ArrayList();
+        Collection<EmailAddress> emailAddresses = new ArrayList<EmailAddress>();
         EmailAddress emailAddress = blm.createEmailAddress("anil@apache.org");
         emailAddresses.add(emailAddress);
 
-        Collection numbers = new ArrayList();
+        Collection<TelephoneNumber> numbers = new ArrayList<TelephoneNumber>();
         numbers.add(telephoneNumber);
         user.setPersonName(personName);
         user.setPostalAddresses(postalAddresses);
@@ -166,7 +166,7 @@
     {
         PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
                 passwd.toCharArray());
-        Set creds = new HashSet();
+        Set<PasswordAuthentication> creds = new HashSet<PasswordAuthentication>();
         creds.add(passwdAuth);
 
         try

Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/BusinessQueryManagerImplTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/BusinessQueryManagerImplTest.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/BusinessQueryManagerImplTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/BusinessQueryManagerImplTest.java Fri Jun 29 13:56:57 2007
@@ -4,8 +4,6 @@
 import javax.xml.registry.JAXRException;
 import javax.xml.registry.infomodel.ClassificationScheme;
 
-import org.apache.ws.scout.BaseTestCase;
-
 import junit.framework.TestCase;
 
 /**

Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectTest.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectTest.java Fri Jun 29 13:56:57 2007
@@ -42,11 +42,11 @@
     }
 
     public void testAddSlots() throws JAXRException {
-        Set slots = new HashSet();
+        Set<Slot> slots = new HashSet<Slot>();
         slots.add(slot);
         slots.add(slot2);
         eo.addSlots(slots);
-        assertEquals(slots, new HashSet(eo.getSlots()));
+        assertEquals(slots, new HashSet<Slot>(eo.getSlots()));
     }
 
     public void testGetSlot() throws JAXRException {
@@ -77,11 +77,11 @@
         MockSlot slot3 = new MockSlot("MockSlot3");
         eo.addSlot(slot2);
         eo.addSlot(slot3);
-        Collection slots = new HashSet();
-        slots.add(slot2.getName());
-        slots.add("MockSlot4");
-        eo.removeSlots(slots);
-        slots = eo.getSlots();
+        Collection<String> slotNames = new HashSet<String>();
+        slotNames.add(slot2.getName());
+        slotNames.add("MockSlot4");
+        eo.removeSlots(slotNames);
+        Collection<Slot> slots = eo.getSlots();
         assertEquals(2, slots.size());
         assertTrue(slots.contains(slot));
         assertFalse(slots.contains(slot2));

Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/InternationalStringTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/InternationalStringTest.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/InternationalStringTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/InternationalStringTest.java Fri Jun 29 13:56:57 2007
@@ -60,7 +60,7 @@
         Collection localizedStrings = is.getLocalizedStrings();
         assertEquals(1, localizedStrings.size());
         assertTrue(localizedStrings.contains(usString));
-        ArrayList strings = new ArrayList(2);
+        ArrayList<LocalizedString> strings = new ArrayList<LocalizedString>(2);
         strings.add(ukString);
         strings.add(caString);
         is.addLocalizedStrings(strings);
@@ -129,7 +129,7 @@
         is.addLocalizedString(ukString);
         is.addLocalizedString(caString);
         assertEquals(3, is.getLocalizedStrings().size());
-        Collection localizedStrings = new ArrayList();
+        Collection<LocalizedString> localizedStrings = new ArrayList<LocalizedString>();
         localizedStrings.add(usString);
         localizedStrings.add(caString);
         is.removeLocalizedStrings(localizedStrings);

Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/SlotTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/SlotTest.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/SlotTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/SlotTest.java Fri Jun 29 13:56:57 2007
@@ -51,13 +51,13 @@
 
     public void testValues() throws JAXRException {
         // check duplicate values are removed
-        Collection values = new ArrayList();
+        Collection<String> values = new ArrayList<String>();
         values.add("Value 1");
         values.add("Value 2");
         values.add("Value 2");
         slot.setValues(values);
 
-        values = new HashSet();
+        values = new HashSet<String>();
         values.add("Value 1");
         values.add("Value 2");
         assertEquals(values, slot.getValues());

Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR01PublishClassificationSchemeTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR01PublishClassificationSchemeTest.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR01PublishClassificationSchemeTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR01PublishClassificationSchemeTest.java Fri Jun 29 13:56:57 2007
@@ -21,14 +21,11 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Properties;
 import java.util.Set;
 
 import javax.xml.registry.BulkResponse;
 import javax.xml.registry.BusinessLifeCycleManager;
 import javax.xml.registry.BusinessQueryManager;
-import javax.xml.registry.Connection;
-import javax.xml.registry.ConnectionFactory;
 import javax.xml.registry.JAXRException;
 import javax.xml.registry.JAXRResponse;
 import javax.xml.registry.RegistryService;
@@ -38,8 +35,6 @@
 
 import org.apache.ws.scout.BaseTestCase;
 
-import junit.framework.TestCase;
-
 /**
  * Tests publish classification schemes.
  * 
@@ -82,7 +77,7 @@
             Classification classification = createClassificationForUDDI(bqm);
             cScheme.addClassification(classification);
 
-            ArrayList cSchemes = new ArrayList();
+            ArrayList<ClassificationScheme> cSchemes = new ArrayList<ClassificationScheme>();
             cSchemes.add(cScheme);
 
             BulkResponse br = blm.saveClassificationSchemes(cSchemes);
@@ -135,7 +130,7 @@
     {
         PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
                 passwd.toCharArray());
-        Set creds = new HashSet();
+        Set<PasswordAuthentication> creds = new HashSet<PasswordAuthentication>();
         creds.add(passwdAuth);
 
         try

Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR01PublishConceptTest.java
URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR01PublishConceptTest.java?view=diff&rev=552031&r1=552028&r2=552031
==============================================================================
--- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR01PublishConceptTest.java (original)
+++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR01PublishConceptTest.java Fri Jun 29 13:56:57 2007
@@ -21,14 +21,11 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Properties;
 import java.util.Set;
 
 import javax.xml.registry.BulkResponse;
 import javax.xml.registry.BusinessLifeCycleManager;
 import javax.xml.registry.BusinessQueryManager;
-import javax.xml.registry.Connection;
-import javax.xml.registry.ConnectionFactory;
 import javax.xml.registry.JAXRException;
 import javax.xml.registry.JAXRResponse;
 import javax.xml.registry.RegistryService;
@@ -41,8 +38,6 @@
 
 import org.apache.ws.scout.BaseTestCase;
 
-import junit.framework.TestCase;
-
 /**
  * Tests publish concepts.
  * 
@@ -94,7 +89,7 @@
 
             concept.addClassification(cl);
 
-            Collection concepts = new ArrayList();
+            Collection<Concept> concepts = new ArrayList<Concept>();
             concepts.add(concept);
 
             BulkResponse br = blm.saveConcepts(concepts);
@@ -145,7 +140,7 @@
     {
         PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
                 passwd.toCharArray());
-        Set creds = new HashSet();
+        Set<PasswordAuthentication> creds = new HashSet<PasswordAuthentication>();
         creds.add(passwdAuth);
 
         try



---------------------------------------------------------------------
To unsubscribe, e-mail: scout-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: scout-dev-help@ws.apache.org


Mime
View raw message