SF.net SVN: ctl-dispatch:[2188] branches/ctl-dispatch-3-6-support/src/java/ com/controltier/ctl

[mose...@users.sourceforge.net]

Revision: 2188
http://ctl-dispatch.svn.sourceforge.net/ctl-dispatch/?rev=2188&view=rev
Author: moseslei
Date: 2011-09-13 10:01:02 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
#3408479 Fix framework.extensions.dir ignored if ctl.home present; wrong order of override logic https://sourceforge.net/tracker/?func=detail&aid=3408479&group_id=151079&atid=779847

Modified Paths:
--------------
branches/ctl-dispatch-3-6-support/src/java/com/controltier/ctl/cli/ExtensionInstallTool.java
branches/ctl-dispatch-3-6-support/src/java/com/controltier/ctl/common/Framework.java

Modified: branches/ctl-dispatch-3-6-support/src/java/com/controltier/ctl/cli/ExtensionInstallTool.java
===================================================================
--- branches/ctl-dispatch-3-6-support/src/java/com/controltier/ctl/cli/ExtensionInstallTool.java 2011-06-22 23:28:44 UTC (rev 2187)
+++ branches/ctl-dispatch-3-6-support/src/java/com/controltier/ctl/cli/ExtensionInstallTool.java 2011-09-13 10:01:02 UTC (rev 2188)
@@ -115,6 +115,7 @@

final IExtensionManifest mf = archive.getManifest();

+ log("Extracting archive " + cli.getOptionValue("f") + "to " + extensionMgr.getBaseDir() + " ...");
archive.extract(extensionMgr.getBaseDir());
final Extension extension = extensionMgr.getExtension(mf.getExtensionName());

Modified: branches/ctl-dispatch-3-6-support/src/java/com/controltier/ctl/common/Framework.java
===================================================================
--- branches/ctl-dispatch-3-6-support/src/java/com/controltier/ctl/common/Framework.java 2011-06-22 23:28:44 UTC (rev 2187)
+++ branches/ctl-dispatch-3-6-support/src/java/com/controltier/ctl/common/Framework.java 2011-09-13 10:01:02 UTC (rev 2188)
@@ -307,11 +307,10 @@
throw new IllegalArgumentException("\"ant.home\" property not set in framework.properties");
}

- if (null != ctlHome ) {
+ if (lookup.hasProperty("framework.extensions.dir")) {
+ extensionsBase = new File(lookup.getProperty("framework.extensions.dir"));
+ } else if (null != ctlHome ) {
extensionsBase = new File(ctlHome, "lib" + Constants.FILE_SEP + "extensions");
-
- } else if (lookup.hasProperty("framework.extensions.dir")) {
- extensionsBase = new File(lookup.getProperty("framework.extensions.dir"));
} else {
throw new IllegalArgumentException("\"framework.extensions.dir\" property not set");
}
@@ -536,8 +535,9 @@
public String toString() {
return "Framework{" +
"baseDir=" + getBaseDir() +
- ", modulesBaseDir=" + moduleBase +
- ", projectsBaseDir=" + projectsBase +
+ ", modulesBase=" + moduleBase +
+ ", projectsBase=" + projectsBase +
+ ", extensionsBase=" + extensionsBase +
"}";
}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.