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=552031&r1=552028&r2=552031 ============================================================================== --- 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 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.FindQualifier; import javax.xml.registry.JAXRException; import javax.xml.registry.RegistryService; @@ -37,8 +34,6 @@ import org.apache.ws.scout.BaseTestCase; -import junit.framework.TestCase; - /** * Tests delete (and indirectly, find) classification schemes. * @@ -78,9 +73,9 @@ BusinessQueryManager bqm = rs.getBusinessQueryManager(); blm = rs.getBusinessLifeCycleManager(); - 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 + "%"); BulkResponse br = bqm.findClassificationSchemes(findQualifiers, namePatterns, null, null); @@ -126,7 +121,7 @@ { PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray()); - Set creds = new HashSet(); + Set<PasswordAuthentication> creds = new HashSet<PasswordAuthentication>(); creds.add(passwdAuth); try @@ -146,7 +141,7 @@ System.out.println("Deleting concept with id " + id); - Collection keys = new ArrayList(); + Collection<Key> keys = new ArrayList<Key>(); keys.add(key); BulkResponse response = blm.deleteConcepts(keys);
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=552031&r1=552028&r2=552031 ============================================================================== --- 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 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.FindQualifier; import javax.xml.registry.JAXRException; import javax.xml.registry.RegistryService; @@ -38,8 +35,6 @@ import org.apache.ws.scout.BaseTestCase; -import junit.framework.TestCase; - /** * Tests delete (and indirectly, find) concepts. * @@ -79,9 +74,9 @@ BusinessQueryManager bqm = rs.getBusinessQueryManager(); blm = rs.getBusinessLifeCycleManager(); - 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 + "%"); BulkResponse br = bqm.findConcepts(findQualifiers, namePatterns, null, null, null); @@ -131,7 +126,7 @@ { PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray()); - Set creds = new HashSet(); + Set<PasswordAuthentication> creds = new HashSet<PasswordAuthentication>(); creds.add(passwdAuth); try @@ -151,7 +146,7 @@ System.out.println("Deleting concept with id " + id); - Collection keys = new ArrayList(); + Collection<Key> keys = new ArrayList<Key>(); keys.add(key); BulkResponse response = blm.deleteConcepts(keys); 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=552031&r1=552028&r2=552031 ============================================================================== --- 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 Fri Jun 29 13:56:57 2007 @@ -94,10 +94,10 @@ System.out .println("\nSearching for newly created organizations...\n"); - ArrayList orgs = findTempOrgs(); + ArrayList<Organization> orgs = findTempOrgs(); - sOrg = (Organization) orgs.get(0); - tOrg = (Organization) orgs.get(1); + sOrg = orgs.get(0); + tOrg = orgs.get(1); System.out.println("\nCreating association...\n"); createAssociation(sOrg, tOrg); @@ -119,7 +119,7 @@ private void login() { PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray()); - Set creds = new HashSet(); + Set<PasswordAuthentication> creds = new HashSet<PasswordAuthentication>(); creds.add(passwdAuth); try { @@ -140,7 +140,7 @@ Association association = blm.createAssociation(tOrg, type); sOrg.addAssociation(association); - ArrayList associations = new ArrayList(); + ArrayList<Association> associations = new ArrayList<Association>(); associations.add(association); BulkResponse br = blm.saveAssociations(associations, true); @@ -168,11 +168,11 @@ String sOrgID = sOrg.getKey().getId(); String tOrgID = tOrg.getKey().getId(); - Collection findQualifiers = new ArrayList(); + Collection<String> findQualifiers = new ArrayList<String>(); findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC); Concept type = bqm.findConceptByPath(associationType); - ArrayList conceptTypes = new ArrayList(1); + ArrayList<Concept> conceptTypes = new ArrayList<Concept>(1); conceptTypes.add(type); BulkResponse br = bqm.findAssociations(findQualifiers, sOrgID, tOrgID, @@ -210,7 +210,7 @@ System.out.println("\nDeleting association with id " + id + "\n"); - Collection keys = new ArrayList(); + Collection<Key> keys = new ArrayList<Key>(); keys.add(key); BulkResponse response = blm.deleteAssociations(keys); @@ -238,7 +238,7 @@ tOrg .setDescription(getIString("Temporary target organization to test saveAssociations()")); - Collection orgs = new ArrayList(); + Collection<Organization> orgs = new ArrayList<Organization>(); orgs.add(sOrg); orgs.add(tOrg); BulkResponse br = blm.saveOrganizations(orgs); @@ -264,16 +264,16 @@ } } - private ArrayList findTempOrgs() throws JAXRException { + private ArrayList<Organization> findTempOrgs() throws JAXRException { - ArrayList toReturn = new ArrayList(2); + ArrayList<Organization> toReturn = new ArrayList<Organization>(2); toReturn.add(null); toReturn.add(null); // 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("%" + tempSrcOrgName + "%"); namePatterns.add("%" + tempTgtOrgName + "%"); @@ -323,7 +323,7 @@ System.out.println("\nDeleting temporary organizations with ids " + sOrgKey + " and " + tOrgKey + "\n"); - Collection keys = new ArrayList(); + Collection<Key> keys = new ArrayList<Key>(); keys.add(sOrgKey); keys.add(tOrgKey); BulkResponse response = blm.deleteOrganizations(keys); 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=552031&r1=552028&r2=552031 ============================================================================== --- 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 Fri Jun 29 13:56:57 2007 @@ -21,13 +21,10 @@ 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.Connection; -import javax.xml.registry.ConnectionFactory; import javax.xml.registry.JAXRException; import javax.xml.registry.JAXRResponse; import javax.xml.registry.RegistryService; @@ -39,8 +36,6 @@ import org.apache.ws.scout.BaseTestCase; -import junit.framework.TestCase; - /** Tests Publish, Delete (and indirectly, find) for service bindings. * @@ -64,10 +59,6 @@ String serviceBindingName = "Apache JAXR Service Binding -- APACHE SCOUT TEST"; String serviceName = "Apache JAXR Service -- APACHE SCOUT TEST"; String tempOrgName = "Apache JAXR Service Org -- APACHE SCOUT TEST"; - - Service tmpSvc = null; - Organization tmpOrg = null; - public void setUp() { @@ -97,16 +88,20 @@ blm = rs.getBusinessLifeCycleManager(); System.out.println("\nCreating temporary organization...\n"); - tmpOrg = createTempOrg(); + Organization tmpOrg = createTempOrg(); + Key tmpOrgKey = tmpOrg.getKey(); System.out.println("\nCreating service...\n"); - tmpSvc = createTempService(); + Service tmpSvc = createTempService(tmpOrg); + Key tmpSvcKey = tmpSvc.getKey(); System.out.println("\nCreating service binding...\n"); - Key sbKey = createServiceBinding(); + Key sbKey = createServiceBinding(tmpSvc); // All created ... now try to delete. - + deleteServiceBinding(sbKey); + deleteTempService(tmpSvcKey); + deleteTempOrg(tmpOrgKey); // No find service binding.. search by name is not currently supported. deleteServiceBinding(sbKey); @@ -126,7 +121,7 @@ { PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray()); - Set creds = new HashSet(); + Set<PasswordAuthentication> creds = new HashSet<PasswordAuthentication>(); creds.add(passwdAuth); try @@ -144,14 +139,14 @@ return blm.createInternationalString(str); } - private Key createServiceBinding() throws JAXRException { + private Key createServiceBinding(Service tmpSvc) throws JAXRException { Key key = null; ServiceBinding serviceBinding = blm.createServiceBinding(); serviceBinding.setName(getIString(serviceBindingName)); serviceBinding.setDescription(getIString("UDDI service binding")); tmpSvc.addServiceBinding(serviceBinding); - ArrayList serviceBindings = new ArrayList(); + ArrayList<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>(); serviceBindings.add(serviceBinding); BulkResponse br = blm.saveServiceBindings(serviceBindings); @@ -183,7 +178,7 @@ System.out.println("\nDeleting service binding with id " + id + "\n"); - Collection keys = new ArrayList(); + Collection<Key> keys = new ArrayList<Key>(); keys.add(key); BulkResponse response = blm.deleteServiceBindings(keys); @@ -201,13 +196,13 @@ } } - private Service createTempService() throws JAXRException { + private Service createTempService(Organization tmpOrg) throws JAXRException { Service service = blm.createService(getIString(serviceName)); service.setDescription(getIString("Services in UDDI Registry")); service.setProvidingOrganization(tmpOrg); - ArrayList services = new ArrayList(); + ArrayList<Service> services = new ArrayList<Service>(); services.add(service); BulkResponse br = blm.saveServices(services); @@ -233,18 +228,14 @@ return service; } - private void deleteTempService() throws JAXRException { - - if (tmpSvc == null) { - return; - } + private void deleteTempService(Key key) throws JAXRException { - String id = tmpSvc.getKey().getId(); + String id = key.getId(); System.out.println("\nDeleting service with id " + id + "\n"); - Collection keys = new ArrayList(); - keys.add(tmpSvc.getKey()); + Collection<Key> keys = new ArrayList<Key>(); + keys.add(key); BulkResponse response = blm.deleteServices(keys); Collection exceptions = response.getExceptions(); @@ -267,7 +258,7 @@ Organization org = blm.createOrganization(getIString(tempOrgName)); org.setDescription(getIString("Temporary organization to test saveService()")); - Collection orgs = new ArrayList(); + Collection<Organization> orgs = new ArrayList<Organization>(); orgs.add(org); BulkResponse br = blm.saveOrganizations(orgs); @@ -294,18 +285,18 @@ return org; } - private void deleteTempOrg() throws JAXRException { + private void deleteTempOrg(Key key) throws JAXRException { - if (tmpOrg == null) { + if (key == null) { return; } - String id = tmpOrg.getKey().getId(); + String id = key.getId(); System.out.println("\nDeleting temporary organization with id " + id + "\n"); - Collection keys = new ArrayList(); - keys.add(tmpOrg.getKey()); + 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/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=552031&r1=552028&r2=552031 ============================================================================== --- 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 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.FindQualifier; import javax.xml.registry.JAXRException; import javax.xml.registry.JAXRResponse; @@ -40,8 +37,6 @@ import org.apache.ws.scout.BaseTestCase; -import junit.framework.TestCase; - /** * Tests Publish, Delete (and indirectly, find) for service bindings. * @@ -118,7 +113,7 @@ { PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray()); - Set creds = new HashSet(); + Set<PasswordAuthentication> creds = new HashSet<PasswordAuthentication>(); creds.add(passwdAuth); try @@ -141,7 +136,7 @@ service.setDescription(getIString("Services in UDDI Registry")); service.setProvidingOrganization(org); - ArrayList services = new ArrayList(); + ArrayList<Service> services = new ArrayList<Service>(); services.add(service); BulkResponse br = blm.saveServices(services); @@ -171,9 +166,9 @@ } private void findAndDeleteService(Key orgKey) throws JAXRException { - 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("%" + serviceName + "%"); BulkResponse br = bqm.findServices(orgKey, findQualifiers, namePatterns, null, null); @@ -211,7 +206,7 @@ System.out.println("\nDeleting service with id " + id + "\n"); - Collection keys = new ArrayList(); + Collection<Key> keys = new ArrayList<Key>(); keys.add(key); BulkResponse response = blm.deleteServices(keys); @@ -235,7 +230,7 @@ Organization org = blm.createOrganization(getIString(tempOrgName)); org.setDescription(getIString("Temporary organization to test saveService()")); - Collection orgs = new ArrayList(); + Collection<Organization> orgs = new ArrayList<Organization>(); orgs.add(org); BulkResponse br = blm.saveOrganizations(orgs); @@ -268,7 +263,7 @@ System.out.println("\nDeleting temporary organization with id " + id + "\n"); - Collection keys = new ArrayList(); + Collection<Key> keys = new ArrayList<Key>(); keys.add(orgKey); BulkResponse response = blm.deleteOrganizations(keys); Modified: webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/query/JAXRQueryTest.java URL: http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/query/JAXRQueryTest.java?view=diff&rev=552031&r1=552028&r2=552031 ============================================================================== --- webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/query/JAXRQueryTest.java (original) +++ webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/query/JAXRQueryTest.java Fri Jun 29 13:56:57 2007 @@ -19,12 +19,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import java.util.Properties; import javax.xml.registry.BulkResponse; import javax.xml.registry.BusinessQueryManager; -import javax.xml.registry.Connection; -import javax.xml.registry.ConnectionFactory; import javax.xml.registry.FindQualifier; import javax.xml.registry.JAXRException; import javax.xml.registry.RegistryService; @@ -39,8 +36,6 @@ import org.apache.ws.scout.BaseTestCase; -import junit.framework.TestCase; - /** * Testcase for JaxrQuery * @author <mailto:[EMAIL PROTECTED]>Davanum Srinivas @@ -72,9 +67,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 Added: webservices/scout/trunk/src/test/resources/juddi.properties URL: http://svn.apache.org/viewvc/webservices/scout/trunk/src/test/resources/juddi.properties?view=auto&rev=552031 ============================================================================== --- webservices/scout/trunk/src/test/resources/juddi.properties (added) +++ webservices/scout/trunk/src/test/resources/juddi.properties Fri Jun 29 13:56:57 2007 @@ -0,0 +1,69 @@ +# jUDDI Registry Properties (used by RegistryServer) +# see http://www.juddi.org for more information + +# The UDDI Operator Name +juddi.operatorName = jUDDI.org + +# The i18n locale default codes +juddi.i18n.languageCode = en +juddi.i18n.countryCode = US + +# The UDDI DiscoveryURL Prefix +juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp? + +# The UDDI Operator Contact Email Address +juddi.operatorEmailAddress = [EMAIL PROTECTED] + +# The maximum name size and maximum number +# of name elements allows in several of the +# FindXxxx and SaveXxxx UDDI functions. +juddi.maxNameLength=255 +juddi.maxNameElementsAllowed=5 + +# The maximum number of UDDI artifacts allowed +# per publisher. A value of '-1' indicates any +# number of artifacts is valid (These values can be +# overridden at the individual publisher level). +juddi.maxBusinessesPerPublisher=25 +juddi.maxServicesPerBusiness=20 +juddi.maxBindingsPerService=10 +juddi.maxTModelsPerPublisher=100 + +# jUDDI Authentication module to use +juddi.auth = org.apache.juddi.auth.DefaultAuthenticator + +# jUDDI DataStore module currently to use +juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore + +# use a dataSource (if set to false a direct +# jdbc connection will be used. +juddi.isUseDataSource=false +juddi.jdbcDriver=com.mysql.jdbc.Driver +juddi.jdbcUrl=jdbc:mysql://localhost/juddi +juddi.jdbcUsername=juddi +juddi.jdbcPassword=juddi +# jUDDI DataSource to use +juddi.dataSource=java:comp/env/jdbc/juddiDB + +# jUDDI UUIDGen implementation to use +juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen + +# jUDDI Cryptor implementation to use +juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor + +# jUDDI Validator to use +juddi.validator=org.apache.juddi.validator.DefaultValidator + +# jUDDI Proxy Properties (used by RegistryProxy) +juddi.proxy.adminURL = http://localhost:8080/juddi/admin +juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry +juddi.proxy.publishURL = http://localhost:8080/juddi/publish +juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport +juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider +juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol + +# JNDI settings (used by RMITransport) +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.provider.url=jnp://localhost:1099 +java.naming.factory.url.pkgs=org.jboss.naming + Propchange: webservices/scout/trunk/src/test/resources/juddi.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: webservices/scout/trunk/src/test/resources/juddi.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
