[jboss-svn-commits] JBL Code SVN: r7154 - in labs/jbossesb/trunk/product/core/services: src/org/jboss/soa/esb/services/registry tests/src/org/jboss/soa/esb/services/registry
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 26 17:29:43 EDT 2006
Author: kurt.stam at jboss.com
Date: 2006-10-26 17:29:41 -0400 (Thu, 26 Oct 2006)
New Revision: 7154
Modified:
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/registry/JAXRRegistryImpl.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/JAXRRegistryUnitTest.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
Log:
Working on Registry
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/registry/JAXRRegistryImpl.java 2006-10-26 21:17:17 UTC (rev 7153)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/registry/JAXRRegistryImpl.java 2006-10-26 21:29:41 UTC (rev 7154)
@@ -164,7 +164,7 @@
ServiceBinding serviceBinding = blm.createServiceBinding();
serviceBinding.setDescription(blm.createInternationalString(eprDescription));
//For now storing the EPR XML in the URI until I fill in the holes in scout.
- serviceBinding.setAccessURI("<EPR XML>");
+ serviceBinding.setAccessURI("<EPR_XML>");
// Concept specConcept = blm.createConcept(null, "HelloConcept", "");
// String schemeName = "uddi-org:types";
@@ -207,7 +207,27 @@
* Remove an EPR from the Registry
*/
public void unRegisterEPR(String category, String serviceName, EPR epr) throws RegistryException{
-
+ //first find the ServiceBindings for this service
+ try {
+ String eprXML = "<EPR_XML>"; //epr.toXML()
+ Service service = findService(category, serviceName);
+ if (service.getServiceBindings().size()==0) {
+ throw new RegistryException("No bindings found for service with name = " + serviceName);
+ }
+ for (Iterator i=service.getServiceBindings().iterator();i.hasNext();) {
+ ServiceBinding serviceBinding = (ServiceBinding) i.next();
+ if (serviceBinding.getAccessURI().equals(eprXML)) {
+ logger.log(Priority.INFO, "Removing EPR: " + epr);
+ service.removeServiceBinding(serviceBinding);
+ return;
+ }
+ }
+ //We should not end up here or else we did not match any EPRs
+ throw new RegistryException("No such EPR found for service with name = "
+ + serviceName + " and EPR=" + epr);
+ } catch (JAXRException je) {
+ throw new RegistryException(je.getLocalizedMessage(), je);
+ }
}
/**
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/JAXRRegistryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/JAXRRegistryUnitTest.java 2006-10-26 21:17:17 UTC (rev 7153)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/JAXRRegistryUnitTest.java 2006-10-26 21:29:41 UTC (rev 7154)
@@ -37,9 +37,7 @@
import javax.xml.registry.BusinessLifeCycleManager;
import javax.xml.registry.BusinessQueryManager;
import javax.xml.registry.Connection;
-import javax.xml.registry.FindQualifier;
import javax.xml.registry.JAXRException;
-import javax.xml.registry.JAXRResponse;
import javax.xml.registry.RegistryService;
import javax.xml.registry.infomodel.Classification;
import javax.xml.registry.infomodel.ClassificationScheme;
@@ -163,7 +161,7 @@
ServiceBinding serviceBinding = (ServiceBinding) serviceBindingIter.next();
logger.log(Priority.INFO, " ServiceBinding Description: " + serviceBinding.getDescription().getValue());
logger.log(Priority.INFO, " ServiceBinding URI: " + serviceBinding.getAccessURI());
- assertEquals("<EPR XML>",serviceBinding.getAccessURI());
+ assertEquals("<EPR_XML>",serviceBinding.getAccessURI());
}
}
logger.log(Priority.INFO, "-------------------------------------------------");
@@ -205,70 +203,6 @@
finally{}
}
/**
- *
- */
- @SuppressWarnings("unchecked")
- @Test
- public void publishAnEPR() {
-// String EPR_XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-// + "<EPR>"
-// + " <wsa:Address>jms://queue</wsa:Address>"
-// + " <wsa:ReferenceProperties>"
-// + " <wsarjaddr:specification-version xmlns:wsarjaddr=\"http://schemas.arjuna.com/ws/2004/06/wsarjaddr\">1.1</wsarjaddr:specification-version>"
-// + " <wsarjaddr:destination-name xmlns:wsarjaddr=\"http://schemas.arjuna.com/ws/2004/06/wsarjaddr\">queue/A</wsarjaddr:destination-name>"
-// + " <wsarjaddr:connection-factory xmlns:wsarjaddr=\"http://schemas.arjuna.com/ws/2004/06/wsarjaddr\">ConnectionFactory</wsarjaddr:connection-factory>"
-// + " <wsarjaddr:jndi-type xmlns:wsarjaddr=\"http://schemas.arjuna.com/ws/2004/06/wsarjaddr\">jboss</wsarjaddr:jndi-type>"
-// + " <wsarjaddr:jndi-URL xmlns:wsarjaddr=\"http://schemas.arjuna.com/ws/2004/06/wsarjaddr\">localhost</wsarjaddr:jndi-URL>"
-// + " <wsarjaddr:message-selector xmlns:wsarjaddr=\"http://schemas.arjuna.com/ws/2004/06/wsarjaddr\">listener='maradona'</wsarjaddr:message-selector>"
-// + " </wsa:ReferenceProperties>"
-// + "</EPR>";
-// String serviceName="Kurt's Travel Agency";
-// String serviceURI="epr:jbossesb:version:1.0:logicalname:KurtsTravelAgency";
-
- Connection connection = JAXRRegistryImpl.getConnection();
- try {
- //Logging in
- connection.setCredentials(JAXRRegistryImpl.creds);
- RegistryService rs = connection.getRegistryService();
- BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
- BusinessQueryManager bqm = rs.getBusinessQueryManager();
- // Define find qualifiers and name patterns
- Collection<String> findQualifiers = new ArrayList<String>();
- findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
- Collection<String> namePatterns = new ArrayList<String>();
- namePatterns.add("%JBOSS%");
-// Find based upon qualifier type and values
- System.out.println("Going to query the registry for name pattern " + namePatterns);
- BulkResponse response = bqm.findOrganizations(findQualifiers,
- namePatterns, null, null, null, null);
-
- System.out.println("Found " + response.getCollection().size() + " organization.");
- for (Iterator orgIter = response.getCollection().iterator(); orgIter.hasNext();)
- {
- Organization org = (Organization) orgIter.next();
- Service service = blm.createService(blm.createInternationalString("JBossESB TEST Service"));
- service.setDescription(blm.createInternationalString("Services of the ESB UDDI Registry"));
- org.addService(service);
- Collection services = new ArrayList();
- services.add(service);
- BulkResponse br=blm.saveServices(services);
- if (br.getStatus() == JAXRResponse.STATUS_SUCCESS) {
- br.getCollection();
- //ServiceBinding serviceBinding =
- //service.addServiceBinding(serviceBinding);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- assertTrue(false);
- } finally {
- JAXRRegistryImpl.closeConnection(connection);
- }
-
-
-
- }
- /**
* Setup the database.
* @throws Exception
*/
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2006-10-26 21:17:17 UTC (rev 7153)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java 2006-10-26 21:29:41 UTC (rev 7154)
@@ -26,6 +26,7 @@
import java.io.File;
import java.io.InputStream;
+import java.net.URI;
import java.sql.DriverManager;
import java.sql.Statement;
import java.util.Collection;
@@ -113,10 +114,17 @@
assertTrue(false);
}
}
- @Test
+
public void unregisterEPR()
{
-
+ Registry registry = RegistryFactory.getRegistry();
+ try {
+ EPR eprToBeRemoved = new EPR(new URI("EPR_XML"));
+ registry.unRegisterEPR(CATEGORY, SERVICE_NAME, eprToBeRemoved);
+ } catch (Exception re) {
+ logger.log(Priority.ERROR, re.getLocalizedMessage(), re);
+ assertTrue(false);
+ }
}
/**
* Setup the database.
More information about the jboss-svn-commits
mailing list