[infinispan-commits] Infinispan SVN: r980 - in trunk/core/src: test/java/org/infinispan/config/parsing and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-10-20 15:00:04 -0400 (Tue, 20 Oct 2009)
New Revision: 980

Modified:
   trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java
   trunk/core/src/main/java/org/infinispan/config/TypedPropertiesAdapter.java
   trunk/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java
   trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java
Log:
ns

Modified: trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java	2009-10-20 16:31:50 UTC (rev 979)
+++ trunk/core/src/main/java/org/infinispan/config/InfinispanConfiguration.java	2009-10-20 19:00:04 UTC (rev 980)
@@ -24,6 +24,8 @@
 import org.infinispan.Version;
 import org.infinispan.config.parsing.XmlConfigurationParser;
 import org.infinispan.util.FileLookup;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
 import org.jboss.util.StringPropertyReplacer;
 
 import javax.xml.bind.JAXBContext;
@@ -69,6 +71,8 @@
 @XmlRootElement(name = "infinispan")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class InfinispanConfiguration implements XmlConfigurationParser {
+   
+   private static final Log log = LogFactory.getLog(InfinispanConfiguration.class);
 
    public static final String VALIDATING_SYSTEM_PROPERTY = "infinispan.config.validate";
    
@@ -241,6 +245,9 @@
          int dollar = line.indexOf('$');
          if(dollar >0 && line.indexOf('{',dollar) > 0 && line.indexOf('}',dollar)>0) {
             String replacedLine = StringPropertyReplacer.replaceProperties(line);
+            if (line.equals(replacedLine)) {
+               log.warn("Property " +line.substring(line.indexOf('{')+1,line.indexOf('}')) + " could not be replaced as intended!");
+            }
             w.append(replacedLine);
          } else {
             w.append(line);

Modified: trunk/core/src/main/java/org/infinispan/config/TypedPropertiesAdapter.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/TypedPropertiesAdapter.java	2009-10-20 16:31:50 UTC (rev 979)
+++ trunk/core/src/main/java/org/infinispan/config/TypedPropertiesAdapter.java	2009-10-20 19:00:04 UTC (rev 980)
@@ -21,15 +21,12 @@
  */
 package org.infinispan.config;
 
-import org.infinispan.loaders.file.FileCacheStore;
-import org.infinispan.util.TypedProperties;
-import org.infinispan.util.logging.Log;
-import org.infinispan.util.logging.LogFactory;
-import org.jboss.util.StringPropertyReplacer;
+import java.util.Set;
+import java.util.Map.Entry;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
-import java.util.Map.Entry;
-import java.util.Set;
+
+import org.infinispan.util.TypedProperties;
 /**
  * TypedPropertiesAdapter is JAXB XmlAdapter for TypedProperties.
  *
@@ -38,8 +35,6 @@
  */
 public class TypedPropertiesAdapter extends XmlAdapter<PropertiesType, TypedProperties> {
    
-   private static final Log log = LogFactory.getLog(TypedPropertiesAdapter.class);
-
    @Override
    public PropertiesType marshal(TypedProperties tp) throws Exception {
       PropertiesType pxml = new PropertiesType();
@@ -61,19 +56,6 @@
       TypedProperties tp = new TypedProperties();
       if (props != null && props.properties != null) {
          for (Property p : props.properties) {
-            if (p.value != null) {
-               String originalValue = p.value;
-               boolean needsTokenReplacement = originalValue.indexOf('$') >= 0
-                        && originalValue.indexOf('{') > 0 && originalValue.indexOf('}') > 0;
-
-               if (needsTokenReplacement) {
-                  p.value = StringPropertyReplacer.replaceProperties(originalValue);
-                  if (originalValue.equals(p.value)) {
-                     log.warn("Property " + p.name + " with value " + originalValue
-                              + " could not be replaced as intended!");
-                  }
-               }
-            }
             tp.put(p.name, p.value);
          }
       }

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java	2009-10-20 16:31:50 UTC (rev 979)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/Coherence2InfinispanTransformerTest.java	2009-10-20 19:00:04 UTC (rev 980)
@@ -42,7 +42,7 @@
          convertor.parse(fileName, baos, XSLT_FILE);
 
 
-         File out = new File("target/zzzz2.xml");
+         File out = new File("target","zzzz2.xml");
          if (out.exists()) out.delete();
          out.createNewFile();
          FileOutputStream fos = new FileOutputStream(out);

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java	2009-10-20 16:31:50 UTC (rev 979)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/EHCache2InfinispanTransformerTest.java	2009-10-20 19:00:04 UTC (rev 980)
@@ -50,7 +50,7 @@
          convertor.parse(fileName, baos, XSLT_FILE);
 
 
-         File out = new File("target/zzzz3.xml");
+         File out = new File("target", "zzzz3.xml");
          if (out.exists()) out.delete();
          out.createNewFile();
          FileOutputStream fos = new FileOutputStream(out);