Changeset 29695

Timestamp:

01/28/08 09:55:17 (10 months ago)

Author:

bstefanescu

Message:

working on autoconfig

Files:

• org.nuxeo.runtime/branches/autoconfig/src/main/java/org/nuxeo/runtime/config/v1/ConfigurationFactory1.java (modified) (1 diff)

org.nuxeo.runtime/branches/autoconfig/src/main/java/org/nuxeo/runtime/config/v1/ConfigurationFactory1.java

@@ -100 +100 @@
-            String h = shost.getHost();
-            int p = shost.getPort();
+            Properties props = shost.getProperties();
-            // we need to update jndi props of local server so that the lcient use the right config
-            if (h == null) {
-                shost.setAddress(host, p); // TODO: 1099?
-                updateLocalHostJndiProps(shost);
-            } else {
-                String newHost = ConfigurationHelper.getNormalizedHost(h, host);
-                if (newHost != null) {
-                    shost.setAddress(newHost, shost.getPort());
-                    updateLocalHostJndiProps(shost);
-                }
+            }
+            // if no jndi props specified - use the global ones (the ones in nuxeo.properties)
+            if (props == null || props.isEmpty()) {
+                updateLocalHostJndiProps(shost);
-            }
-        }