[jbossws-commits] JBossWS SVN: r2349 - in branches/jbossws-1.2.0: build/ant-import and 11 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-13 11:37:16 -0500 (Tue, 13 Feb 2007) New Revision: 2349 Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml branches/jbossws-1.2.0/build/version.properties branches/jbossws-1.2.0/integration-jboss40/build.xml branches/jbossws-1.2.0/integration-jboss42/build.xml branches/jbossws-1.2.0/integration-jboss50/build.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml branches/jbossws-1.2.0/jbossws-tests/build.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt Log: Add jaxr tests Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-13 12:37:40 UTC (rev 2348) +++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-13 16:37:16 UTC (rev 2349) @@ -28,6 +28,7 @@ <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-scout/${apache-scout}/lib/scout.jar" dest="${thirdparty.dir}/scout.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> @@ -60,6 +61,7 @@ <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> + <get src="${jboss.repository}/juddi/${juddi}/lib/juddi.jar" dest="${thirdparty.dir}/juddi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> Modified: branches/jbossws-1.2.0/build/version.properties =================================================================== --- branches/jbossws-1.2.0/build/version.properties 2007-02-13 12:37:40 UTC (rev 2348) +++ branches/jbossws-1.2.0/build/version.properties 2007-02-13 16:37:16 UTC (rev 2349) @@ -27,6 +27,7 @@ apache-collections=3.1 apache-log4j=1.2.8 apache-logging=1.0.5.GA-jboss +apache-scout=0.7rc2 apache-tomcat=5.5.20 apache-xalan=j_2.7.0 apache-xerces=2.7.1 @@ -44,6 +45,7 @@ jbossas-core-libs=4.0.5.GA jbossws-wsconsume=2.0.0 jbpm-bpel=1.1.Beta3 +juddi=0.9RC4 junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4 Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-13 12:37:40 UTC (rev 2348) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-13 16:37:16 UTC (rev 2349) @@ -338,6 +338,13 @@ <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <!-- + [JBWS-1517] - Resolve dependency on juddi-service.sar + --> + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <copy todir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"> + <fileset dir="${jboss40.home}/server/all/deploy/juddi-service.sar"/> + </copy> </target> <!-- Deploy jbossws to jboss40 jdk1.4 --> @@ -386,6 +393,13 @@ <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <!-- + [JBWS-1517] - Resolve dependency on juddi-service.sar + --> + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <copy todir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"> + <fileset dir="${jboss40.home}/server/all/deploy/juddi-service.sar"/> + </copy> </target> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-13 12:37:40 UTC (rev 2348) +++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-13 16:37:16 UTC (rev 2349) @@ -166,6 +166,13 @@ <include name="jbossws-jboss42-integration.jar"/> </fileset> </copy> + <!-- + [JBWS-1517] - Resolve dependency on juddi-service.sar + --> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"> + <fileset dir="${jboss42.home}/server/all/deploy/juddi-service.sar"/> + </copy> </target> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-13 12:37:40 UTC (rev 2348) +++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-13 16:37:16 UTC (rev 2349) @@ -175,6 +175,13 @@ <include name="jbossws-jboss50-integration.jar"/> </fileset> </copy> + <!-- + [JBWS-1517] - Resolve dependency on juddi-service.sar + --> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"> + <fileset dir="${jboss50.home}/server/all/deploy/juddi-service.sar"/> + </copy> </target> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-13 12:37:40 UTC (rev 2348) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-13 16:37:16 UTC (rev 2349) @@ -196,6 +196,9 @@ <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddisaaj.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> <path refid="javac.classpath"/> </path> Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-13 12:37:40 UTC (rev 2348) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-13 16:37:16 UTC (rev 2349) @@ -203,6 +203,9 @@ <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddisaaj.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> <path refid="javac.classpath"/> </path> @@ -227,10 +230,7 @@ </target> <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> - <fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/> - - <!-- The test client classpath --> <path id="test.client.classpath"> <path refid="jbossws.classpath"/> <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-02-13 16:37:16 UTC (rev 2349) @@ -0,0 +1,387 @@ +/* + * 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.test.ws.JBossWSTest; +import org.jboss.ws.core.utils.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://localhost:8080/juddi/inquiry"); + String puburl = System.getProperty("jaxr.publish.url", "http://localhost: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 + * + * @param bizname + * @throws JAXRException + */ + 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("Test 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("Test 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: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java 2007-02-13 16:37:16 UTC (rev 2349) @@ -0,0 +1,92 @@ +/* + * 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.publish; + +// $Id$ + +import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; + +import javax.xml.registry.BulkResponse; +import javax.xml.registry.JAXRException; +import javax.xml.registry.JAXRResponse; +import javax.xml.registry.infomodel.Key; +import javax.xml.registry.infomodel.Organization; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +/** + * Checks Deletion of Organization + * + * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana + * @since Jan 3, 2005 + */ +public class JaxrDeleteOrganizationTestCase extends JaxrBaseTest +{ + public String saveOrg(String orgname) throws JAXRException + { + String keyid = ""; + login(); + + getJAXREssentials(); + Collection orgs = new ArrayList(); + Organization org = createOrganization("JBOSS"); + + orgs.add(org); + BulkResponse br = blm.saveOrganizations(orgs); + if (br.getStatus() == JAXRResponse.STATUS_SUCCESS) + { + log.debug("Organization Saved"); + Collection coll = br.getCollection(); + Iterator iter = coll.iterator(); + while (iter.hasNext()) + { + Key key = (Key)iter.next(); + keyid = key.getId(); + log.debug("Saved Key=" + key.getId()); + assertNotNull(keyid); + }//end while + } + else + { + log.error("JAXRExceptions " + "occurred during save:"); + Collection exceptions = br.getExceptions(); + Iterator iter = exceptions.iterator(); + while (iter.hasNext()) + { + Exception e = (Exception)iter.next(); + log.error(e.toString()); + fail(e.toString()); + } + } + + return keyid; + } + + public void testDeleteOrgs() throws Exception + { + String keyid = this.saveOrg("DELETEORG"); + assertNotNull(keyid); + Key key = blm.createKey(keyid); + this.deleteOrganization(key); + } +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java 2007-02-13 16:37:16 UTC (rev 2349) @@ -0,0 +1,103 @@ +/* + * 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.publish; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +import javax.xml.registry.BulkResponse; +import javax.xml.registry.JAXRException; +import javax.xml.registry.JAXRResponse; +import javax.xml.registry.infomodel.Key; +import javax.xml.registry.infomodel.Organization; + +import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; + +/** + * Tests Jaxr Save Organization + * + * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana + * @since Dec 29, 2004 + */ + +public class JaxrSaveOrganizationTestCase extends JaxrBaseTest +{ + private Key orgKey = null; + + public void testSaveOrg() throws JAXRException + { + String keyid = ""; + login(); + + rs = connection.getRegistryService(); + + blm = rs.getBusinessLifeCycleManager(); + Collection orgs = new ArrayList(); + Organization org = createOrganization("JBOSS"); + + orgs.add(org); + BulkResponse br = blm.saveOrganizations(orgs); + if (br.getStatus() == JAXRResponse.STATUS_SUCCESS) + { + log.debug("Organization Saved"); + Collection coll = br.getCollection(); + Iterator iter = coll.iterator(); + while (iter.hasNext()) + { + Key key = (Key)iter.next(); + keyid = key.getId(); + log.debug("Saved Key=" + key.getId()); + assertNotNull(keyid); + }//end while + } + else + { + log.error("JAXRExceptions " + "occurred during save:"); + Collection exceptions = br.getExceptions(); + Iterator iter = exceptions.iterator(); + while (iter.hasNext()) + { + Exception e = (Exception)iter.next(); + log.error(e.toString()); + fail(e.toString()); + } + } + checkBusinessExists("JBOSS"); + } + + private void checkBusinessExists(String bizname) throws JAXRException + { + String request = "<find_business generic='2.0' xmlns='urn:uddi-org:api_v2'>" + "<name xml:lang='en'>" + bizname + "</name></find_business>"; + String response = rs.makeRegistrySpecificRequest(request); + if (response == null || "".equals(response)) + fail("Find Business failed"); + + } + + protected void tearDown() throws Exception + { + super.tearDown(); + if (this.orgKey != null) + this.deleteOrganization(orgKey); + } +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java 2007-02-13 16:37:16 UTC (rev 2349) @@ -0,0 +1,94 @@ +/* + * 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.query; + +/** Tests Jaxr capability to do business queries + * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana + * @since Dec 29, 2004 + */ + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; + +import javax.xml.registry.BulkResponse; +import javax.xml.registry.JAXRException; +import javax.xml.registry.JAXRResponse; +import javax.xml.registry.infomodel.Key; +import javax.xml.registry.infomodel.Organization; + +public class JaxrBusinessQueryTestCase extends JaxrBaseTest +{ + protected String querystr = "JBOSS"; + + private Key orgKey = null; + + protected void setUp() throws Exception + { + super.setUp(); + String keyid = ""; + login(); + + getJAXREssentials(); + Collection orgs = new ArrayList(); + Organization org = createOrganization("JBOSS"); + + orgs.add(org); + BulkResponse br = blm.saveOrganizations(orgs); + if (br.getStatus() == JAXRResponse.STATUS_SUCCESS) + { + Collection coll = br.getCollection(); + Iterator iter = coll.iterator(); + while (iter.hasNext()) + { + Key key = (Key)iter.next(); + keyid = key.getId(); + assertNotNull(keyid); + orgKey = key; + }//end while + } + else + { + Collection exceptions = br.getExceptions(); + Iterator iter = exceptions.iterator(); + while (iter.hasNext()) + { + Exception e = (Exception)iter.next(); + fail(e.toString()); + } + } + } + + protected void tearDown() throws Exception + { + if (orgKey != null) + this.deleteOrganization(this.orgKey); + super.tearDown(); + } + + public void testBusinessQuery() throws JAXRException + { + searchBusiness(querystr); + } +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-13 12:37:40 UTC (rev 2348) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-13 16:37:16 UTC (rev 2349) @@ -19,6 +19,7 @@ org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* +org/jboss/test/ws/jaxws/samples/jaxr/** # TODO: Why are these excluded # [JBWS-1471] - Remove unwanted tomcat excludes