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

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

Author: beve
Date: 2009-10-08 01:46:07 -0400 (Thu, 08 Oct 2009)
New Revision: 29550

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
Log:
Just readding the changes that I had reverted to try to verify https://jira.jboss.org/jira/browse/JBESB-2787.
This had to do with us setting JNDI system properties forceing all JNDI commutnication to go over RMI.


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-10-08 05:38:25 UTC (rev 29549)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java	2009-10-08 05:46:07 UTC (rev 29550)
@@ -51,10 +51,6 @@
    private static final String JUDDI_PROPERTIES_RESOURCE_FILE = "esb.juddi.properties";
    private static final String JUDDI_PROPERTY_FILE_COMMENTS = "Auto generated property file, do not edit" ;
    
-   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 propertiesResourceFile ;
    private String propertiesFileDir;
 
@@ -126,19 +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();
 	}