[jboss-svn-commits] JBL Code SVN: r7713 - in labs/jbossesb/trunk/product/core/services: src/org/jboss/internal/soa/esb/services/registry tests/src/org/jboss/soa/esb/services/registry

[jboss-svn-commits at lists.jboss.org]

Author: kurt.stam at jboss.com
Date: 2006-11-19 17:27:41 -0500 (Sun, 19 Nov 2006)
New Revision: 7713

Modified:
   labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
   labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
Log:
Synchronizing the registry

Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java	2006-11-19 18:35:10 UTC (rev 7712)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java	2006-11-19 22:27:41 UTC (rev 7713)
@@ -72,7 +72,7 @@
 	private static Properties props = new Properties();
 	private static Organization jbossESBOrganization;
 	
-	private static void init() 
+	private synchronized static void init() 
 	{
 	    props = new Properties();
 	    props.setProperty("javax.xml.registry.queryManagerURL", Configuration.getRegistryQueryManageURI());
@@ -90,7 +90,7 @@
 	 * 
 	 * @return Connection to a Registry using JAXR. 
 	 */
-	protected static Connection getConnection() 
+	protected synchronized static Connection getConnection() 
 	{
 		Connection connection = null;
 		init();
@@ -107,7 +107,7 @@
 	/**
 	 * Closes the connection to the Registry
 	 */
-	protected static void closeConnection(Connection connection)
+	protected synchronized static void closeConnection(Connection connection)
 	{
 		try {
 			if (connection!=null && !connection.isClosed()) {
@@ -332,7 +332,7 @@
 	 * @param organizationName used to match with the name of the organization.
 	 * @return the Organization.
 	 */
-	protected static Organization findOrganization(String organizationName) throws JAXRException
+	protected synchronized static Organization findOrganization(String organizationName) throws JAXRException
 	{
 	    if (organizationName==null) {
 	    	organizationName="";
@@ -346,7 +346,7 @@
 			Collection<String> findQualifiers = new ArrayList<String>();
 			findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC);
 			Collection<String> namePatterns = new ArrayList<String>();
-			namePatterns.add(organizationName);
+			namePatterns.add("%" + organizationName + "%");
 	        //Find based upon qualifier type and values
 			System.out.println("Going to query the registry for name pattern " + namePatterns);
 			BulkResponse response = bqm.findOrganizations(findQualifiers,
@@ -378,7 +378,7 @@
 	 * @param serviceName
 	 * @return Service
 	 */
-	protected static Service findService(String category, String serviceName) throws JAXRException
+	protected synchronized static Service findService(String category, String serviceName) throws JAXRException
 	{
 		if (category==null) {
 			category="";
@@ -431,7 +431,7 @@
 	 * @return Service
 	 */
 	@SuppressWarnings("unchecked")
-	protected static Collection<Service> findServicesForCategory(String category) throws JAXRException
+	protected synchronized static Collection<Service> findServicesForCategory(String category) throws JAXRException
 	{
 		Collection<Service> services = new ArrayList<Service>();
 		if (category==null) {
@@ -447,7 +447,7 @@
 			findQualifiers.add(FindQualifier.AND_ALL_KEYS);
 			findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
 			Collection<String> namePatterns = new ArrayList<String>();
-			namePatterns.add("%" + category + "%");
+			namePatterns.add(category);
 	        //Find based upon qualifier type and values
 			logger.log(Priority.DEBUG, "Going to query the registry for name pattern " + namePatterns);
 			BulkResponse response = bqm.findServices(null, findQualifiers,
@@ -467,7 +467,7 @@
 	 * @return
 	 * @throws JAXRException
 	 */
-	protected static Organization createJBossESBOrganization()
+	protected synchronized static Organization createJBossESBOrganization()
 			throws JAXRException 
 	{
 //		Getting the connection to the Registry (reading config)
@@ -520,7 +520,7 @@
 	/**
 	 * Save Registry Object
 	 */
-	protected static void saveRegistryObject(RegistryObject registryObject) throws JAXRException
+	protected synchronized static void saveRegistryObject(RegistryObject registryObject) throws JAXRException
 	{
 //		Getting the connection to the Registry (reading config)
 		Connection connection = JAXRRegistryImpl.getConnection();

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-11-19 18:35:10 UTC (rev 7712)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java	2006-11-19 22:27:41 UTC (rev 7713)
@@ -56,7 +56,7 @@
 	private static String mDbUrl;
 	private static String mDbUsername;
 	private static String mDbPassword;
-	private static final String SERVICE_NAME = "Kurt's Travel Agency";
+	private static final String SERVICE_NAME = "Kurts Travel Agency";
 	private static final String CATEGORY = "travel";
 	
 	private Logger logger = Logger.getLogger(this.getClass());
@@ -146,6 +146,7 @@
 		try {
 			Registry registry = RegistryFactory.getRegistry();
 			registry.unRegisterService(CATEGORY, SERVICE_NAME);
+			registry.unRegisterService(null, SERVICE_NAME);
 			//Make sure it's really gone
 			Collection<String> services = registry.findAllServices();
 			logger.log(Priority.INFO, "Number of Services left should be 0, and is: " + services.size());