geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1026979 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
Date Mon, 25 Oct 2010 09:01:02 GMT
Author: genspring
Date: Mon Oct 25 09:01:01 2010
New Revision: 1026979

URL: http://svn.apache.org/viewvc?rev=1026979&view=rev
Log:
GERONIMO-5658 deploy --inPlace broken for quick start sample,

The files in the inPlace configuration dir was not copied to the deployed repo artifact.

Modified:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java?rev=1026979&r1=1026978&r2=1026979&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
Mon Oct 25 09:01:01 2010
@@ -341,7 +341,9 @@ public class RepositoryConfigurationStor
     public void install(ConfigurationData configurationData) throws IOException, InvalidConfigException
{
         // determine the source file/dir
         log.debug("Writing config: " + configurationData);
-        File source = configurationData.getConfigurationDir();
+        File source = configurationData.getInPlaceConfigurationDir() == null ? configurationData.getConfigurationDir()
+                : configurationData.getInPlaceConfigurationDir();
+        
         if (!source.exists()) {
             throw new InvalidConfigException("Source does not exist " + source);
         } else if (!source.canRead()) {



Mime
View raw message