You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by si...@apache.org on 2011/01/14 10:14:43 UTC
svn commit: r1058907 - in
/incubator/river/jtsk/trunk/src/org/apache/river/config/builder:
Example.java TextConfigurationBuilder.java
VelocityConfigurationBuilder.java template.config
Author: sijskes
Date: Fri Jan 14 09:14:43 2011
New Revision: 1058907
URL: http://svn.apache.org/viewvc?rev=1058907&view=rev
Log:
removed old approach. fixed string literal processing.
Removed:
incubator/river/jtsk/trunk/src/org/apache/river/config/builder/TextConfigurationBuilder.java
incubator/river/jtsk/trunk/src/org/apache/river/config/builder/template.config
Modified:
incubator/river/jtsk/trunk/src/org/apache/river/config/builder/Example.java
incubator/river/jtsk/trunk/src/org/apache/river/config/builder/VelocityConfigurationBuilder.java
Modified: incubator/river/jtsk/trunk/src/org/apache/river/config/builder/Example.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/config/builder/Example.java?rev=1058907&r1=1058906&r2=1058907&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/config/builder/Example.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/config/builder/Example.java Fri Jan 14 09:14:43 2011
@@ -44,7 +44,7 @@ public class Example {
} );
- TextConfigurationBuilder cb = new TextConfigurationBuilder();
+ VelocityConfigurationBuilder cb = new VelocityConfigurationBuilder();
cb.setServicePort(1234);
Modified: incubator/river/jtsk/trunk/src/org/apache/river/config/builder/VelocityConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/config/builder/VelocityConfigurationBuilder.java?rev=1058907&r1=1058906&r2=1058907&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/config/builder/VelocityConfigurationBuilder.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/config/builder/VelocityConfigurationBuilder.java Fri Jan 14 09:14:43 2011
@@ -143,8 +143,8 @@ public class VelocityConfigurationBuilde
context.put("multicastInterfaces", mcstr );
}
- context.put("registryEndpoint", String.format("TcpServerEndpoint.getInstance(%s,%d)",registryHost,registryPort) );
- context.put("serverEndpoint", String.format("TcpServerEndpoint.getInstance(%s,%d)",serviceHost,servicePort) );
+ context.put("registryEndpoint", String.format("TcpServerEndpoint.getInstance(%s,%d)",stringToLiteral(registryHost),registryPort) );
+ context.put("serverEndpoint", String.format("TcpServerEndpoint.getInstance(%s,%d)",stringToLiteral(serviceHost),servicePort) );
context.put("groups", String.format("\"%s\"",group) );
Template template = ve.getTemplate( getClass().getResource("template.vm").toExternalForm() );
@@ -156,6 +156,14 @@ public class VelocityConfigurationBuilde
return sw.toString();
}
+ private String stringToLiteral( String s )
+ {
+ if( s == null ) {
+ return "null" ;
+ }
+ return String.format("\"%s\"",s);
+ }
+
@Override
public Configuration createConfiguration() throws ConfigurationException
{