[jboss-svn-commits] JBL Code SVN: r11551 - labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies.

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

Author: tcunning
Date: 2007-05-01 08:32:34 -0400 (Tue, 01 May 2007)
New Revision: 11551

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
Log:
bug:JBESB-507
Send juddi.properties for JNDI over as system properties.


Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java	2007-05-01 12:11:18 UTC (rev 11550)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java	2007-05-01 12:32:34 UTC (rev 11551)
@@ -23,9 +23,14 @@
 package org.jboss.internal.soa.esb.dependencies;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
 import java.net.URI;
 import java.net.URL;
 
+import java.util.Properties;
+
 import javax.naming.InitialContext;
 
 import org.apache.juddi.registry.rmi.JNDIRegistration;
@@ -34,11 +39,13 @@
 
 public class JuddiRMIService extends ServiceMBeanSupport implements JuddiRMIServiceMBean
 {
-	private Logger logger = Logger.getLogger(this.getClass());
+   private Logger logger = Logger.getLogger(this.getClass());
+   public static final String PROPNAME_JAVA_NAMING_FACTORY_INITIAL = "java.naming.factory.initial";
+   public static final String PROPNAME_JAVA_NAMING_PROVIDER_URL = "java.naming.provider.url";
+   public static final String PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS = "java.naming.factory.url.pkgs";
 
    private String propertiesResourcePath = "esb.juddi.properties";
 
-
    public String getPropertiesResourcePath()
    {
       return propertiesResourcePath;
@@ -57,7 +64,27 @@
         File confFile = new File(uri);
 		System.setProperty("juddi.propertiesFile", confFile.toString());
         System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
-		JNDIRegistration.register();
+        
+        // Read properties from file and if they exist - pass them on to juddi as system properties
+        Properties properties = new Properties();
+        try {
+            properties.load(new FileInputStream(confFile));
+            String factoryInitial =  properties.getProperty(PROPNAME_JAVA_NAMING_FACTORY_INITIAL, null);
+            String providerURL = properties.getProperty(PROPNAME_JAVA_NAMING_PROVIDER_URL, null); 
+            String factoryURLPkgs = properties.getProperty(PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS, null);
+            if (factoryInitial != null) {
+            	System.setProperty(PROPNAME_JAVA_NAMING_FACTORY_INITIAL, factoryInitial);
+	    }
+	    if (providerURL != null) {
+            	System.setProperty(PROPNAME_JAVA_NAMING_PROVIDER_URL, providerURL);
+	    }
+            if (factoryURLPkgs != null) {
+            	System.setProperty(PROPNAME_JAVA_NAMING_FACTORY_URL_PKGS, factoryURLPkgs);
+            }
+        } catch (IOException e) {
+        	logger.error(e);
+        }
+        JNDIRegistration.register();
 	}