Author: kstam
Date: Tue Mar  6 15:35:15 2012
New Revision: 1297531

URL: http://svn.apache.org/viewvc?rev=1297531&view=rev
Log:
JUDDI-543 allow using tokens in name, managername, description, proxytransport, 
and jndi settings.

Modified:
    
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java

Modified: 
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=1297531&r1=1297530&r2=1297531&view=diff
==============================================================================
--- 
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
 (original)
+++ 
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
 Tue Mar  6 15:35:15 2012
@@ -162,10 +162,10 @@ public class ClientConfig 
                                uddiNode.setProperties(properties);
                        }
                        uddiNode.setHomeJUDDI(              
config.getBoolean("manager.nodes.node(" + i +")[@isHomeJUDDI]",false));
-                       uddiNode.setName(                   
config.getString("manager.nodes.node(" + i +").name"));
-                       uddiNode.setManagerName(            
config.getString("manager[@name]"));
-                       uddiNode.setDescription(            
config.getString("manager.nodes.node(" + i +").description"));
-                       uddiNode.setProxyTransport(         
config.getString("manager.nodes.node(" + i +").proxyTransport"));
+                       uddiNode.setName(                   
TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i 
+").name"),properties));
+                       uddiNode.setManagerName(            
TokenResolver.replaceTokens(config.getString("manager[@name]"),properties));
+                       uddiNode.setDescription(            
TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i 
+").description"),properties));
+                       uddiNode.setProxyTransport(         
TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i 
+").proxyTransport"),properties));
                        uddiNode.setInquiryUrl(             
TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i 
+").inquiryUrl"),properties));
                        uddiNode.setPublishUrl(             
TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i 
+").publishUrl"),properties));
                        uddiNode.setCustodyTransferUrl(     
TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i 
+").custodyTransferUrl"),properties));
@@ -173,8 +173,8 @@ public class ClientConfig 
                        uddiNode.setSubscriptionUrl(        
TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i 
+").subscriptionUrl"),properties));
                        
uddiNode.setSubscriptionListenerUrl(TokenResolver.replaceTokens(config.getString("manager.nodes.node("
 + i +").subscriptionListenerUrl"),properties));
                        uddiNode.setJuddiApiUrl(            
TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i 
+").juddiApiUrl"),properties));
-                       uddiNode.setFactoryInitial(         
config.getString("manager.nodes.node(" + i +").javaNamingFactoryInitial"));
-                       uddiNode.setFactoryURLPkgs(         
config.getString("manager.nodes.node(" + i +").javaNamingFactoryUrlPkgs"));
+                       uddiNode.setFactoryInitial(         
TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i 
+").javaNamingFactoryInitial"),properties));
+                       uddiNode.setFactoryURLPkgs(         
TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i 
+").javaNamingFactoryUrlPkgs"),properties));
                        uddiNode.setFactoryNamingProvider(  
TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i 
+").javaNamingProviderUrl"),properties));
                        nodes.put(nodeName,uddiNode);
                }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to