jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r611145 - in /jackrabbit/branches/1.4: RELEASE-NOTES.txt jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
Date Fri, 11 Jan 2008 11:20:20 GMT
Author: jukka
Date: Fri Jan 11 03:20:07 2008
New Revision: 611145

URL: http://svn.apache.org/viewvc?rev=611145&view=rev
Log:
1.4: Merged revision 611143 (JCR-1304)

Modified:
    jackrabbit/branches/1.4/RELEASE-NOTES.txt
    jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java

Modified: jackrabbit/branches/1.4/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/RELEASE-NOTES.txt?rev=611145&r1=611144&r2=611145&view=diff
==============================================================================
--- jackrabbit/branches/1.4/RELEASE-NOTES.txt (original)
+++ jackrabbit/branches/1.4/RELEASE-NOTES.txt Fri Jan 11 03:20:07 2008
@@ -267,6 +267,7 @@
   [JCR-1184] Introduce spellchecker functionality based on content in ...
   [JCR-1276] A Property and a Node Can Have the Same Name
   [JCR-1295] Tablespace (Filegroup) support for MS SQL Server
+  [JCR-1304] Support system properties in ${...} vars in XML config files
 
   Improvements
   [JCR-314]  Fine grained locking in SharedItemStateManager

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java?rev=611145&r1=611144&r2=611145&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
Fri Jan 11 03:20:07 2008
@@ -132,7 +132,7 @@
      */
     public static RepositoryConfig create(InputSource xml, String home)
             throws ConfigurationException {
-        Properties variables = new Properties();
+        Properties variables = new Properties(System.getProperties());
         variables.setProperty(
                 RepositoryConfigurationParser.REPOSITORY_HOME_VARIABLE, home);
         RepositoryConfigurationParser parser =
@@ -408,7 +408,7 @@
             if (!homeDir.exists()) {
                 homeDir.mkdir();
             }
-            Properties variables = new Properties();
+            Properties variables = new Properties(parser.getVariables());
             variables.setProperty(
                     RepositoryConfigurationParser.WORKSPACE_HOME_VARIABLE,
                     homeDir.getPath());



Mime
View raw message