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

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

Author: kevin.conner at jboss.com
Date: 2009-09-14 09:34:05 -0400 (Mon, 14 Sep 2009)
New Revision: 29334

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
Log:
Remove system properties from jUDDI service: JBESB-2826

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java	2009-09-14 13:27:50 UTC (rev 29333)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java	2009-09-14 13:34:05 UTC (rev 29334)
@@ -46,9 +46,6 @@
 public class JuddiRMIService extends ServiceMBeanSupport implements JuddiRMIServiceMBean
 {
    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 static final String DEFAULT_PROPERTIES_RESOURCE_FILE = "esb.juddi.xml";
    private static final String JUDDI_PROPERTIES_RESOURCE_FILE = "esb.juddi.properties";
@@ -125,20 +122,6 @@
         }
         System.setProperty("juddi.propertiesFile", juddiPropertyFile.getAbsolutePath());
         System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
-        
-        // Read properties from file and if they exist - pass them on to juddi as system properties
-        String factoryInitial =  xmlProperties.getProperty(PROPNAME_JAVA_NAMING_FACTORY_INITIAL, null);
-        String providerURL = xmlProperties.getProperty(PROPNAME_JAVA_NAMING_PROVIDER_URL, null); 
-        String factoryURLPkgs = xmlProperties.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);
-        }
         JNDIRegistration.register();
 	}