Author: kstam
Date: Thu Jul  5 18:48:59 2007
New Revision: 553695

URL: http://svn.apache.org/viewvc?view=rev&rev=553695
Log:
SCOUT-39, Integrated all sample code in the unittests. Now we can delete the 
sample code since it's the same thing as the unittests.

Removed:
    webservices/scout/trunk/src/
Modified:
    webservices/scout/trunk/pom.xml
    
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/BaseTestCase.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/JAXR03DeleteOrgTest.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/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

Modified: webservices/scout/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/scout/trunk/pom.xml?view=diff&rev=553695&r1=553694&r2=553695
==============================================================================
--- webservices/scout/trunk/pom.xml (original)
+++ webservices/scout/trunk/pom.xml Thu Jul  5 18:48:59 2007
@@ -217,14 +217,14 @@
   </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>
+     <repository>
+      <id>maven2</id>
+      <name>Maven Central Development Repository</name>
+      <url>http://repo1.maven.org/maven2</url>
     </repository>
   </repositories>
   <pluginRepositories>

Modified: 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/BaseTestCase.java
URL: 
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/BaseTestCase.java?view=diff&rev=553695&r1=553694&r2=553695
==============================================================================
--- 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/BaseTestCase.java
 (original)
+++ 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/BaseTestCase.java
 Thu Jul  5 18:48:59 2007
@@ -16,10 +16,14 @@
  */
 package org.apache.ws.scout;
 
+import java.net.PasswordAuthentication;
+import java.util.HashSet;
 import java.util.Properties;
+import java.util.Set;
 
 import javax.xml.registry.Connection;
 import javax.xml.registry.ConnectionFactory;
+import javax.xml.registry.JAXRException;
 
 import junit.framework.TestCase;
 
@@ -106,6 +110,25 @@
         } catch (Exception e)
         {
 
+        }
+    }
+    
+    /**
+     * Does authentication with the uddi registry
+     */
+    public void login()
+    {
+        PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
+                passwd.toCharArray());
+        Set<PasswordAuthentication> creds = new 
HashSet<PasswordAuthentication>();
+        creds.add(passwdAuth);
+
+        try
+        {
+            connection.setCredentials(creds);
+        } catch (JAXRException e)
+        {
+            e.printStackTrace();
         }
     }
 

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=553695&r1=553694&r2=553695
==============================================================================
--- 
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
 Thu Jul  5 18:48:59 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.BusinessLifeCycleManager;
@@ -189,24 +186,7 @@
         return org;
     }
 
-    /**
-     * Does authentication with the uddi registry
-     */
-    private void login()
-    {
-        PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
-                passwd.toCharArray());
-        Set<PasswordAuthentication> creds = new 
HashSet<PasswordAuthentication>();
-        creds.add(passwdAuth);
-
-        try
-        {
-            connection.setCredentials(creds);
-        } catch (JAXRException e)
-        {
-            e.printStackTrace();
-        }
-    }
+    
 
     private InternationalString getIString(String str)
             throws JAXRException

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=553695&r1=553694&r2=553695
==============================================================================
--- 
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
 Thu Jul  5 18:48:59 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.BusinessLifeCycleManager;
@@ -94,25 +91,6 @@
                        fail(e.getMessage());
         }
 
-    }
-    
-    /**
-     * Does authentication with the uddi registry
-     */
-    private void login()
-    {
-        PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
-                passwd.toCharArray());
-        Set<PasswordAuthentication> creds = new 
HashSet<PasswordAuthentication>();
-        creds.add(passwdAuth);
-
-        try
-        {
-            connection.setCredentials(creds);
-        } catch (JAXRException e)
-        {
-            e.printStackTrace();
-        }
     }
 
     private Collection findOrganizationsByName(String queryStr) throws 
JAXRException {

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=553695&r1=553694&r2=553695
==============================================================================
--- 
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
 Thu Jul  5 18:48:59 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.BusinessLifeCycleManager;
@@ -157,25 +154,6 @@
         org.addExternalIdentifier(ei);
         org.addService(service);
         return org;
-    }
-
-    /**
-     * Does authentication with the uddi registry
-     */
-    private void login()
-    {
-        PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
-                passwd.toCharArray());
-        Set<PasswordAuthentication> creds = new 
HashSet<PasswordAuthentication>();
-        creds.add(passwdAuth);
-
-        try
-        {
-            connection.setCredentials(creds);
-        } catch (JAXRException e)
-        {
-            e.printStackTrace();
-        }
     }
 
     private InternationalString getIString(String str)

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=553695&r1=553694&r2=553695
==============================================================================
--- 
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
 Thu Jul  5 18:48:59 2007
@@ -16,12 +16,9 @@
  */
 package org.apache.ws.scout.registry.publish;
 
-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.BusinessLifeCycleManager;
@@ -123,22 +120,4 @@
         return cl;
     }
 
-    /**
-     * Does authentication with the uddi registry
-     */
-    private void login()
-    {
-        PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
-                passwd.toCharArray());
-        Set<PasswordAuthentication> creds = new 
HashSet<PasswordAuthentication>();
-        creds.add(passwdAuth);
-
-        try
-        {
-            connection.setCredentials(creds);
-        } catch (JAXRException e)
-        {
-            e.printStackTrace();
-        }
-    }
 }

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=553695&r1=553694&r2=553695
==============================================================================
--- 
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
 Thu Jul  5 18:48:59 2007
@@ -16,12 +16,9 @@
  */
 package org.apache.ws.scout.registry.publish;
 
-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.BusinessLifeCycleManager;
@@ -131,25 +128,6 @@
 
         Classification cl = blm.createClassification(udditmodel, "wsdl", 
"wsdl");
         return cl;
-    }
-
-    /**
-     * Does authentication with the uddi registry
-     */
-    private void login()
-    {
-        PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
-                passwd.toCharArray());
-        Set<PasswordAuthentication> creds = new 
HashSet<PasswordAuthentication>();
-        creds.add(passwdAuth);
-
-        try
-        {
-            connection.setCredentials(creds);
-        } catch (JAXRException e)
-        {
-            e.printStackTrace();
-        }
     }
 
     private InternationalString getIString(String str)

Modified: 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR02DeleteClassificationSchemeTest.java
URL: 
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR02DeleteClassificationSchemeTest.java?view=diff&rev=553695&r1=553694&r2=553695
==============================================================================
--- 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR02DeleteClassificationSchemeTest.java
 (original)
+++ 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR02DeleteClassificationSchemeTest.java
 Thu Jul  5 18:48:59 2007
@@ -16,12 +16,9 @@
  */
 package org.apache.ws.scout.registry.publish;
 
-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.BusinessLifeCycleManager;
@@ -111,25 +108,6 @@
         {
             e.printStackTrace();
             fail(e.getMessage());
-        }
-    }
-
-    /**
-     * Does authentication with the uddi registry
-     */
-    private void login()
-    {
-        PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
-                passwd.toCharArray());
-        Set<PasswordAuthentication> creds = new 
HashSet<PasswordAuthentication>();
-        creds.add(passwdAuth);
-
-        try
-        {
-            connection.setCredentials(creds);
-        } catch (JAXRException e)
-        {
-            e.printStackTrace();
         }
     }
 

Modified: 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR02DeleteConceptTest.java
URL: 
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR02DeleteConceptTest.java?view=diff&rev=553695&r1=553694&r2=553695
==============================================================================
--- 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR02DeleteConceptTest.java
 (original)
+++ 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXR02DeleteConceptTest.java
 Thu Jul  5 18:48:59 2007
@@ -16,12 +16,9 @@
  */
 package org.apache.ws.scout.registry.publish;
 
-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.BusinessLifeCycleManager;
@@ -116,25 +113,6 @@
         {
             e.printStackTrace();
             fail(e.getMessage());
-        }
-    }
-
-    /**
-     * Does authentication with the uddi registry
-     */
-    private void login()
-    {
-        PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
-                passwd.toCharArray());
-        Set<PasswordAuthentication> creds = new 
HashSet<PasswordAuthentication>();
-        creds.add(passwdAuth);
-
-        try
-        {
-            connection.setCredentials(creds);
-        } catch (JAXRException e)
-        {
-            e.printStackTrace();
         }
     }
 

Modified: 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteAssociationsTest.java
URL: 
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteAssociationsTest.java?view=diff&rev=553695&r1=553694&r2=553695
==============================================================================
--- 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteAssociationsTest.java
 (original)
+++ 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteAssociationsTest.java
 Thu Jul  5 18:48:59 2007
@@ -16,12 +16,9 @@
  */
 package org.apache.ws.scout.registry.publish;
 
-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.BusinessLifeCycleManager;
@@ -110,22 +107,6 @@
                        fail(e.getMessage());
                } finally {
 
-               }
-       }
-
-       /**
-        * Does authentication with the uddi registry
-        */
-       private void login() {
-               PasswordAuthentication passwdAuth = new 
PasswordAuthentication(userid,
-                               passwd.toCharArray());
-               Set<PasswordAuthentication> creds = new 
HashSet<PasswordAuthentication>();
-               creds.add(passwdAuth);
-
-               try {
-                       connection.setCredentials(creds);
-               } catch (JAXRException e) {
-                       e.printStackTrace();
                }
        }
 

Modified: 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteServiceBindingTest.java
URL: 
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteServiceBindingTest.java?view=diff&rev=553695&r1=553694&r2=553695
==============================================================================
--- 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteServiceBindingTest.java
 (original)
+++ 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteServiceBindingTest.java
 Thu Jul  5 18:48:59 2007
@@ -16,12 +16,9 @@
  */
 package org.apache.ws.scout.registry.publish;
 
-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.BusinessLifeCycleManager;
@@ -110,26 +107,6 @@
         {
             e.printStackTrace();
             fail(e.getMessage());
-        }
-    }
-
-    
-    /**
-     * Does authentication with the uddi registry
-     */
-    private void login()
-    {
-        PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
-                passwd.toCharArray());
-        Set<PasswordAuthentication> creds = new 
HashSet<PasswordAuthentication>();
-        creds.add(passwdAuth);
-
-        try
-        {
-            connection.setCredentials(creds);
-        } catch (JAXRException e)
-        {
-            e.printStackTrace();
         }
     }
 

Modified: 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteServiceTest.java
URL: 
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteServiceTest.java?view=diff&rev=553695&r1=553694&r2=553695
==============================================================================
--- 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteServiceTest.java
 (original)
+++ 
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/publish/JAXRPublishAndDeleteServiceTest.java
 Thu Jul  5 18:48:59 2007
@@ -16,12 +16,9 @@
  */
 package org.apache.ws.scout.registry.publish;
 
-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.BusinessLifeCycleManager;
@@ -103,25 +100,6 @@
         {
             e.printStackTrace();
             fail(e.getMessage());
-        }
-    }
-
-    /**
-     * Does authentication with the uddi registry
-     */
-    private void login()
-    {
-        PasswordAuthentication passwdAuth = new PasswordAuthentication(userid,
-                passwd.toCharArray());
-        Set<PasswordAuthentication> creds = new 
HashSet<PasswordAuthentication>();
-        creds.add(passwdAuth);
-
-        try
-        {
-            connection.setCredentials(creds);
-        } catch (JAXRException e)
-        {
-            e.printStackTrace();
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to