Author: richard.opalka(a)jboss.com Date: 2008-05-29 03:09:24 -0400 (Thu, 29 May 2008) New Revision: 7196 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrAbstractBase.java Removed: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java Log: refactoring - no functional change Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrAbstractBase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrAbstractBase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrAbstractBase.java 2008-05-29 07:09:24 UTC (rev 7196) @@ -0,0 +1,383 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.jaxr.scout; + +import java.net.PasswordAuthentication; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Locale; +import java.util.Properties; +import java.util.Set; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +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; +import javax.xml.registry.infomodel.Classification; +import javax.xml.registry.infomodel.ClassificationScheme; +import javax.xml.registry.infomodel.EmailAddress; +import javax.xml.registry.infomodel.ExternalIdentifier; +import javax.xml.registry.infomodel.InternationalString; +import javax.xml.registry.infomodel.Key; +import javax.xml.registry.infomodel.LocalizedString; +import javax.xml.registry.infomodel.Organization; +import javax.xml.registry.infomodel.PersonName; +import javax.xml.registry.infomodel.PostalAddress; +import javax.xml.registry.infomodel.RegistryObject; +import javax.xml.registry.infomodel.Service; +import javax.xml.registry.infomodel.ServiceBinding; +import javax.xml.registry.infomodel.TelephoneNumber; +import javax.xml.registry.infomodel.User; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.common.ObjectNameFactory; + +/** + * Acts as the base class for Jaxr Test Cases + * + * @author Anil.Saldhana(a)jboss.org + * @author Thomas.Diesler(a)jboss.com + * @since 29-Dec-2004 + */ +public class JaxrAbstractBase extends JBossWSTest +{ + protected String userid = "jboss"; + protected String passwd = "jboss"; + protected BusinessLifeCycleManager blm = null; + protected RegistryService rs = null; + protected BusinessQueryManager bqm = null; + protected Connection connection = null; + protected BulkResponse br = null; + protected MBeanServerConnection server = null; + + protected ConnectionFactory factory = null; + + protected static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss:service=juddi"); + + /** + * Setup of the JUnit test + * We create the juddi tables on startup + * + * @throws Exception + */ + protected void setUp() throws Exception + { + //Change the createonstart setting for juddi service and restart it + server = getServer(); + server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.TRUE }, new String[] { Boolean.TYPE.getName() }); + server.invoke(OBJECT_NAME, "stop", null, null); + server.invoke(OBJECT_NAME, "start", null, null); + + //Ensure that the Jaxr Connection Factory class is setup + String factoryString = "javax.xml.registry.ConnectionFactoryClass"; + String factoryClass = System.getProperty(factoryString); + if (factoryClass == null || factoryClass.length() == 0) + System.setProperty(factoryString, "org.apache.ws.scout.registry.ConnectionFactoryImpl"); + + String queryurl = System.getProperty("jaxr.query.url", "http://" + getServerHost() + ":8080/juddi/inquiry"); + String puburl = System.getProperty("jaxr.publish.url", "http://" + getServerHost() + ":8080/juddi/publish"); + + Properties props = new Properties(); + props.setProperty("javax.xml.registry.queryManagerURL", queryurl); + props.setProperty("javax.xml.registry.lifeCycleManagerURL", puburl); + + String transportClass = System.getProperty("juddi.proxy.transportClass", "org.jboss.jaxr.juddi.transport.SaajTransport"); + System.setProperty("juddi.proxy.transportClass", transportClass); + + // Create the connection, passing it the configuration properties + factory = ConnectionFactory.newInstance(); + factory.setProperties(props); + connection = factory.createConnection(); + } + + /** + * Teardown of the junit test + * We discard all the tables created by the juddi service + * + * @throws Exception + */ + protected void tearDown() throws Exception + { + if (connection != null) + connection.close(); + + //stop the juddi service so that all the tables are dropped + server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.FALSE }, new String[] { Boolean.TYPE.getName() }); + server.invoke(OBJECT_NAME, "stop", null, null); + } + + /** + * Does authentication with the uddi registry + */ + protected void login() throws JAXRException + { + PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray()); + Set creds = new HashSet(); + creds.add(passwdAuth); + + connection.setCredentials(creds); + } + + protected void getJAXREssentials() throws JAXRException + { + rs = connection.getRegistryService(); + blm = rs.getBusinessLifeCycleManager(); + bqm = rs.getBusinessQueryManager(); + } + + public InternationalString getIString(String str) throws JAXRException + { + return blm.createInternationalString(str); + } + + /** + * Locale aware Search a business in the registry + */ + public void searchBusiness(String bizname) throws JAXRException + { + try + { + // Get registry service and business query manager + this.getJAXREssentials(); + + // Define find qualifiers and name patterns + Collection findQualifiers = new ArrayList(); + findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC); + Collection namePatterns = new ArrayList(); + String pattern = "%" + bizname + "%"; + LocalizedString ls = blm.createLocalizedString(Locale.getDefault(), pattern); + namePatterns.add(ls); + + // Find based upon qualifier type and values + BulkResponse response = bqm.findOrganizations(findQualifiers, namePatterns, null, null, null, null); + + // check how many organisation we have matched + Collection orgs = response.getCollection(); + if (orgs == null) + { + log.debug(" -- Matched 0 orgs"); + + } + else + { + log.debug(" -- Matched " + orgs.size() + " organizations -- "); + + // then step through them + for (Iterator orgIter = orgs.iterator(); orgIter.hasNext();) + { + Organization org = (Organization)orgIter.next(); + log.debug("Org name: " + getName(org)); + log.debug("Org description: " + getDescription(org)); + log.debug("Org key id: " + getKey(org)); + checkUser(org); + checkServices(org); + } + } + } + finally + { + connection.close(); + } + + } + + protected RegistryService getRegistryService() throws JAXRException + { + assertNotNull(connection); + return connection.getRegistryService(); + } + + protected BusinessQueryManager getBusinessQueryManager() throws JAXRException + { + assertNotNull(connection); + if (rs == null) + rs = this.getRegistryService(); + return rs.getBusinessQueryManager(); + } + + protected BusinessLifeCycleManager getBusinessLifeCycleManager() throws JAXRException + { + assertNotNull(connection); + if (rs == null) + rs = this.getRegistryService(); + return rs.getBusinessLifeCycleManager(); + } + + private void checkServices(Organization org) throws JAXRException + { + // Display service and binding information + Collection services = org.getServices(); + for (Iterator svcIter = services.iterator(); svcIter.hasNext();) + { + Service svc = (Service)svcIter.next(); + log.debug(" Service name: " + getName(svc)); + log.debug(" Service description: " + getDescription(svc)); + + assertEquals("JBOSS JAXR Service", getName(svc)); + assertEquals("Services of XML Registry", getDescription(svc)); + + Collection serviceBindings = svc.getServiceBindings(); + for (Iterator sbIter = serviceBindings.iterator(); sbIter.hasNext();) + { + ServiceBinding sb = (ServiceBinding)sbIter.next(); + log.debug(" Binding Description: " + getDescription(sb)); + log.debug(" Access URI: " + sb.getAccessURI()); + assertEquals("http://testjboss.org", sb.getAccessURI()); + assertEquals("Service Binding", getDescription(sb)); + } + } + } + + private void checkUser(Organization org) throws JAXRException + { + // Display primary contact information + User pc = org.getPrimaryContact(); + if (pc != null) + { + PersonName pcName = pc.getPersonName(); + log.debug(" Contact name: " + pcName.getFullName()); + assertEquals("Anil S", pcName.getFullName()); + Collection phNums = pc.getTelephoneNumbers(pc.getType()); + for (Iterator phIter = phNums.iterator(); phIter.hasNext();) + { + TelephoneNumber num = (TelephoneNumber)phIter.next(); + log.debug(" Phone number: " + num.getNumber()); + } + Collection eAddrs = pc.getEmailAddresses(); + for (Iterator eaIter = eAddrs.iterator(); eaIter.hasNext();) + { + log.debug(" Email Address: " + (EmailAddress)eaIter.next()); + } + } + } + + private static String getName(RegistryObject ro) throws JAXRException + { + if (ro != null && ro.getName() != null) + { + return ro.getName().getValue(); + } + return ""; + } + + private static String getDescription(RegistryObject ro) throws JAXRException + { + if (ro != null && ro.getDescription() != null) + { + return ro.getDescription().getValue(); + } + return ""; + } + + private static String getKey(RegistryObject ro) throws JAXRException + { + if (ro != null && ro.getKey() != null) + { + return ro.getKey().getId(); + } + return ""; + } + + /** + * Creates a Jaxr Organization with 1 or more services + */ + protected Organization createOrganization(String orgname) throws JAXRException + { + Organization org = blm.createOrganization(getIString(orgname)); + org.setDescription(getIString("JBoss Inc")); + Service service = blm.createService(getIString("JBOSS JAXR Service")); + service.setDescription(getIString("Services of XML Registry")); + //Create serviceBinding + ServiceBinding serviceBinding = blm.createServiceBinding(); + serviceBinding.setDescription(blm.createInternationalString("Service Binding")); + + //Turn validation of URI off + serviceBinding.setValidateURI(false); + serviceBinding.setAccessURI("http://testjboss.org"); + + // Add the serviceBinding to the service + service.addServiceBinding(serviceBinding); + + User user = blm.createUser(); + org.setPrimaryContact(user); + PersonName personName = blm.createPersonName("Anil S"); + TelephoneNumber telephoneNumber = blm.createTelephoneNumber(); + telephoneNumber.setNumber("111-111-7777"); + telephoneNumber.setType(null); + PostalAddress address = blm.createPostalAddress("111", "My Drive", "BuckHead", "GA", "USA", "1111-111", ""); + Collection postalAddresses = new ArrayList(); + postalAddresses.add(address); + Collection emailAddresses = new ArrayList(); + EmailAddress emailAddress = blm.createEmailAddress(&quot;anil(a)apache.org&quot;); + emailAddresses.add(emailAddress); + + Collection numbers = new ArrayList(); + numbers.add(telephoneNumber); + user.setPersonName(personName); + user.setPostalAddresses(postalAddresses); + user.setEmailAddresses(emailAddresses); + user.setTelephoneNumbers(numbers); + + ClassificationScheme cScheme = getClassificationScheme("ntis-gov:naics", ""); + Key cKey = blm.createKey("uuid:C0B9FE13-324F-413D-5A5B-2004DB8E5CC2"); + cScheme.setKey(cKey); + Classification classification = blm.createClassification(cScheme, "Computer Systems Design and Related Services", "5415"); + org.addClassification(classification); + ClassificationScheme cScheme1 = getClassificationScheme("D-U-N-S", ""); + Key cKey1 = blm.createKey("uuid:3367C81E-FF1F-4D5A-B202-3EB13AD02423"); + cScheme1.setKey(cKey1); + ExternalIdentifier ei = blm.createExternalIdentifier(cScheme1, "D-U-N-S number", "08-146-6849"); + org.addExternalIdentifier(ei); + org.addService(service); + return org; + } + + /** + * Delete an Organization with a given key + */ + protected void deleteOrganization(Key orgkey) throws Exception + { + assertNotNull("Org Key is null?", orgkey); + if (blm == null) + blm = this.getBusinessLifeCycleManager(); + Collection keys = new ArrayList(); + keys.add(orgkey); + + BulkResponse response = blm.deleteOrganizations(keys); + Collection exceptions = response.getExceptions(); + assertNull("Deleting Org with Key=" + orgkey, exceptions); + } + + private ClassificationScheme getClassificationScheme(String str1, String str2) throws JAXRException + { + ClassificationScheme cs = blm.createClassificationScheme(getIString(str1), getIString(str2)); + return cs; + } +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrAbstractBase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2008-05-28 14:36:10 UTC (rev 7195) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2008-05-29 07:09:24 UTC (rev 7196) @@ -1,383 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.jaxr.scout; - -import java.net.PasswordAuthentication; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Locale; -import java.util.Properties; -import java.util.Set; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -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; -import javax.xml.registry.infomodel.Classification; -import javax.xml.registry.infomodel.ClassificationScheme; -import javax.xml.registry.infomodel.EmailAddress; -import javax.xml.registry.infomodel.ExternalIdentifier; -import javax.xml.registry.infomodel.InternationalString; -import javax.xml.registry.infomodel.Key; -import javax.xml.registry.infomodel.LocalizedString; -import javax.xml.registry.infomodel.Organization; -import javax.xml.registry.infomodel.PersonName; -import javax.xml.registry.infomodel.PostalAddress; -import javax.xml.registry.infomodel.RegistryObject; -import javax.xml.registry.infomodel.Service; -import javax.xml.registry.infomodel.ServiceBinding; -import javax.xml.registry.infomodel.TelephoneNumber; -import javax.xml.registry.infomodel.User; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.common.ObjectNameFactory; - -/** - * Acts as the base class for Jaxr Test Cases - * - * @author Anil.Saldhana(a)jboss.org - * @author Thomas.Diesler(a)jboss.com - * @since 29-Dec-2004 - */ -public class JaxrBaseTest extends JBossWSTest -{ - protected String userid = "jboss"; - protected String passwd = "jboss"; - protected BusinessLifeCycleManager blm = null; - protected RegistryService rs = null; - protected BusinessQueryManager bqm = null; - protected Connection connection = null; - protected BulkResponse br = null; - protected MBeanServerConnection server = null; - - protected ConnectionFactory factory = null; - - protected static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss:service=juddi"); - - /** - * Setup of the JUnit test - * We create the juddi tables on startup - * - * @throws Exception - */ - protected void setUp() throws Exception - { - //Change the createonstart setting for juddi service and restart it - server = getServer(); - server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.TRUE }, new String[] { Boolean.TYPE.getName() }); - server.invoke(OBJECT_NAME, "stop", null, null); - server.invoke(OBJECT_NAME, "start", null, null); - - //Ensure that the Jaxr Connection Factory class is setup - String factoryString = "javax.xml.registry.ConnectionFactoryClass"; - String factoryClass = System.getProperty(factoryString); - if (factoryClass == null || factoryClass.length() == 0) - System.setProperty(factoryString, "org.apache.ws.scout.registry.ConnectionFactoryImpl"); - - String queryurl = System.getProperty("jaxr.query.url", "http://" + getServerHost() + ":8080/juddi/inquiry"); - String puburl = System.getProperty("jaxr.publish.url", "http://" + getServerHost() + ":8080/juddi/publish"); - - Properties props = new Properties(); - props.setProperty("javax.xml.registry.queryManagerURL", queryurl); - props.setProperty("javax.xml.registry.lifeCycleManagerURL", puburl); - - String transportClass = System.getProperty("juddi.proxy.transportClass", "org.jboss.jaxr.juddi.transport.SaajTransport"); - System.setProperty("juddi.proxy.transportClass", transportClass); - - // Create the connection, passing it the configuration properties - factory = ConnectionFactory.newInstance(); - factory.setProperties(props); - connection = factory.createConnection(); - } - - /** - * Teardown of the junit test - * We discard all the tables created by the juddi service - * - * @throws Exception - */ - protected void tearDown() throws Exception - { - if (connection != null) - connection.close(); - - //stop the juddi service so that all the tables are dropped - server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.FALSE }, new String[] { Boolean.TYPE.getName() }); - server.invoke(OBJECT_NAME, "stop", null, null); - } - - /** - * Does authentication with the uddi registry - */ - protected void login() throws JAXRException - { - PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray()); - Set creds = new HashSet(); - creds.add(passwdAuth); - - connection.setCredentials(creds); - } - - protected void getJAXREssentials() throws JAXRException - { - rs = connection.getRegistryService(); - blm = rs.getBusinessLifeCycleManager(); - bqm = rs.getBusinessQueryManager(); - } - - public InternationalString getIString(String str) throws JAXRException - { - return blm.createInternationalString(str); - } - - /** - * Locale aware Search a business in the registry - */ - public void searchBusiness(String bizname) throws JAXRException - { - try - { - // Get registry service and business query manager - this.getJAXREssentials(); - - // Define find qualifiers and name patterns - Collection findQualifiers = new ArrayList(); - findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC); - Collection namePatterns = new ArrayList(); - String pattern = "%" + bizname + "%"; - LocalizedString ls = blm.createLocalizedString(Locale.getDefault(), pattern); - namePatterns.add(ls); - - // Find based upon qualifier type and values - BulkResponse response = bqm.findOrganizations(findQualifiers, namePatterns, null, null, null, null); - - // check how many organisation we have matched - Collection orgs = response.getCollection(); - if (orgs == null) - { - log.debug(" -- Matched 0 orgs"); - - } - else - { - log.debug(" -- Matched " + orgs.size() + " organizations -- "); - - // then step through them - for (Iterator orgIter = orgs.iterator(); orgIter.hasNext();) - { - Organization org = (Organization)orgIter.next(); - log.debug("Org name: " + getName(org)); - log.debug("Org description: " + getDescription(org)); - log.debug("Org key id: " + getKey(org)); - checkUser(org); - checkServices(org); - } - } - } - finally - { - connection.close(); - } - - } - - protected RegistryService getRegistryService() throws JAXRException - { - assertNotNull(connection); - return connection.getRegistryService(); - } - - protected BusinessQueryManager getBusinessQueryManager() throws JAXRException - { - assertNotNull(connection); - if (rs == null) - rs = this.getRegistryService(); - return rs.getBusinessQueryManager(); - } - - protected BusinessLifeCycleManager getBusinessLifeCycleManager() throws JAXRException - { - assertNotNull(connection); - if (rs == null) - rs = this.getRegistryService(); - return rs.getBusinessLifeCycleManager(); - } - - private void checkServices(Organization org) throws JAXRException - { - // Display service and binding information - Collection services = org.getServices(); - for (Iterator svcIter = services.iterator(); svcIter.hasNext();) - { - Service svc = (Service)svcIter.next(); - log.debug(" Service name: " + getName(svc)); - log.debug(" Service description: " + getDescription(svc)); - - assertEquals("JBOSS JAXR Service", getName(svc)); - assertEquals("Services of XML Registry", getDescription(svc)); - - Collection serviceBindings = svc.getServiceBindings(); - for (Iterator sbIter = serviceBindings.iterator(); sbIter.hasNext();) - { - ServiceBinding sb = (ServiceBinding)sbIter.next(); - log.debug(" Binding Description: " + getDescription(sb)); - log.debug(" Access URI: " + sb.getAccessURI()); - assertEquals("http://testjboss.org", sb.getAccessURI()); - assertEquals("Service Binding", getDescription(sb)); - } - } - } - - private void checkUser(Organization org) throws JAXRException - { - // Display primary contact information - User pc = org.getPrimaryContact(); - if (pc != null) - { - PersonName pcName = pc.getPersonName(); - log.debug(" Contact name: " + pcName.getFullName()); - assertEquals("Anil S", pcName.getFullName()); - Collection phNums = pc.getTelephoneNumbers(pc.getType()); - for (Iterator phIter = phNums.iterator(); phIter.hasNext();) - { - TelephoneNumber num = (TelephoneNumber)phIter.next(); - log.debug(" Phone number: " + num.getNumber()); - } - Collection eAddrs = pc.getEmailAddresses(); - for (Iterator eaIter = eAddrs.iterator(); eaIter.hasNext();) - { - log.debug(" Email Address: " + (EmailAddress)eaIter.next()); - } - } - } - - private static String getName(RegistryObject ro) throws JAXRException - { - if (ro != null && ro.getName() != null) - { - return ro.getName().getValue(); - } - return ""; - } - - private static String getDescription(RegistryObject ro) throws JAXRException - { - if (ro != null && ro.getDescription() != null) - { - return ro.getDescription().getValue(); - } - return ""; - } - - private static String getKey(RegistryObject ro) throws JAXRException - { - if (ro != null && ro.getKey() != null) - { - return ro.getKey().getId(); - } - return ""; - } - - /** - * Creates a Jaxr Organization with 1 or more services - */ - protected Organization createOrganization(String orgname) throws JAXRException - { - Organization org = blm.createOrganization(getIString(orgname)); - org.setDescription(getIString("JBoss Inc")); - Service service = blm.createService(getIString("JBOSS JAXR Service")); - service.setDescription(getIString("Services of XML Registry")); - //Create serviceBinding - ServiceBinding serviceBinding = blm.createServiceBinding(); - serviceBinding.setDescription(blm.createInternationalString("Service Binding")); - - //Turn validation of URI off - serviceBinding.setValidateURI(false); - serviceBinding.setAccessURI("http://testjboss.org"); - - // Add the serviceBinding to the service - service.addServiceBinding(serviceBinding); - - User user = blm.createUser(); - org.setPrimaryContact(user); - PersonName personName = blm.createPersonName("Anil S"); - TelephoneNumber telephoneNumber = blm.createTelephoneNumber(); - telephoneNumber.setNumber("111-111-7777"); - telephoneNumber.setType(null); - PostalAddress address = blm.createPostalAddress("111", "My Drive", "BuckHead", "GA", "USA", "1111-111", ""); - Collection postalAddresses = new ArrayList(); - postalAddresses.add(address); - Collection emailAddresses = new ArrayList(); - EmailAddress emailAddress = blm.createEmailAddress(&quot;anil(a)apache.org&quot;); - emailAddresses.add(emailAddress); - - Collection numbers = new ArrayList(); - numbers.add(telephoneNumber); - user.setPersonName(personName); - user.setPostalAddresses(postalAddresses); - user.setEmailAddresses(emailAddresses); - user.setTelephoneNumbers(numbers); - - ClassificationScheme cScheme = getClassificationScheme("ntis-gov:naics", ""); - Key cKey = blm.createKey("uuid:C0B9FE13-324F-413D-5A5B-2004DB8E5CC2"); - cScheme.setKey(cKey); - Classification classification = blm.createClassification(cScheme, "Computer Systems Design and Related Services", "5415"); - org.addClassification(classification); - ClassificationScheme cScheme1 = getClassificationScheme("D-U-N-S", ""); - Key cKey1 = blm.createKey("uuid:3367C81E-FF1F-4D5A-B202-3EB13AD02423"); - cScheme1.setKey(cKey1); - ExternalIdentifier ei = blm.createExternalIdentifier(cScheme1, "D-U-N-S number", "08-146-6849"); - org.addExternalIdentifier(ei); - org.addService(service); - return org; - } - - /** - * Delete an Organization with a given key - */ - protected void deleteOrganization(Key orgkey) throws Exception - { - assertNotNull("Org Key is null?", orgkey); - if (blm == null) - blm = this.getBusinessLifeCycleManager(); - Collection keys = new ArrayList(); - keys.add(orgkey); - - BulkResponse response = blm.deleteOrganizations(keys); - Collection exceptions = response.getExceptions(); - assertNull("Deleting Org with Key=" + orgkey, exceptions); - } - - private ClassificationScheme getClassificationScheme(String str1, String str2) throws JAXRException - { - ClassificationScheme cs = blm.createClassificationScheme(getIString(str1), getIString(str2)); - return cs; - } -} Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java 2008-05-28 14:36:10 UTC (rev 7195) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java 2008-05-29 07:09:24 UTC (rev 7196) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; +import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrAbstractBase; import javax.xml.registry.BulkResponse; import javax.xml.registry.JAXRException; @@ -40,7 +40,7 @@ * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since Jan 3, 2005 */ -public class JaxrDeleteOrganizationTestCase extends JaxrBaseTest +public class JaxrDeleteOrganizationTestCase extends JaxrAbstractBase { public String saveOrg(String orgname) throws JAXRException { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java 2008-05-28 14:36:10 UTC (rev 7195) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java 2008-05-29 07:09:24 UTC (rev 7196) @@ -31,7 +31,7 @@ import javax.xml.registry.infomodel.Key; import javax.xml.registry.infomodel.Organization; -import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; +import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrAbstractBase; /** * Tests Jaxr Save Organization @@ -40,7 +40,7 @@ * @since Dec 29, 2004 */ -public class JaxrSaveOrganizationTestCase extends JaxrBaseTest +public class JaxrSaveOrganizationTestCase extends JaxrAbstractBase { private Key orgKey = null; Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java 2008-05-28 14:36:10 UTC (rev 7195) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java 2008-05-29 07:09:24 UTC (rev 7196) @@ -30,7 +30,7 @@ import java.util.Collection; import java.util.Iterator; -import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; +import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrAbstractBase; import javax.xml.registry.BulkResponse; import javax.xml.registry.JAXRException; @@ -38,7 +38,7 @@ import javax.xml.registry.infomodel.Key; import javax.xml.registry.infomodel.Organization; -public class JaxrBusinessQueryTestCase extends JaxrBaseTest +public class JaxrBusinessQueryTestCase extends JaxrAbstractBase { protected String querystr = "JBOSS";