activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1040194 - in /activemq/activemq-apollo/trunk: apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java
Date Mon, 29 Nov 2010 17:15:05 GMT
Author: chirino
Date: Mon Nov 29 17:15:05 2010
New Revision: 1040194

URL: http://svn.apache.org/viewvc?rev=1040194&view=rev
Log:
Fixes build failure on windows.

Modified:
    activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
    activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java

Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala?rev=1040194&r1=1040193&r2=1040194&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/commands/Create.scala
Mon Nov 29 17:15:05 2010
@@ -24,6 +24,7 @@ import org.fusesource.jansi.Ansi.Attribu
 import Helper._
 import java.io._
 import org.apache.activemq.apollo.util.FileSupport._
+import java.util.regex.Matcher
 
 object Create {
   val IS_WINDOWS = System.getProperty("os.name").toLowerCase().trim().startsWith("win");
@@ -120,7 +121,7 @@ class Create extends Action {
       }
 
       var content = new String(out.toByteArray, "UTF-8")
-      content = content.replaceAll("${host}", host)
+      content = content.replaceAll("${host}", Matcher.quoteReplacement(host))
       val in = new ByteArrayInputStream(content.getBytes("UTF-8"))
 
       using(new FileOutputStream(target)) { out=>

Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java?rev=1040194&r1=1040193&r2=1040194&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/XmlCodec.java
Mon Nov 29 17:15:05 2010
@@ -63,7 +63,7 @@ public class XmlCodec {
                 }
                 String property = System.getProperty(matcher.group(1));
                 if (property != null) {
-                    str = matcher.replaceFirst(property);
+                    str = matcher.replaceFirst(Matcher.quoteReplacement(property));
                 } else {
                     start = matcher.end();
                 }



Mime
View raw message