You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/02 18:27:34 UTC
[1/9] storm git commit: fix STORM-1579,
checks storm.local.dir property/conf when getting storm log dir
Repository: storm
Updated Branches:
refs/heads/master d42c43725 -> 906fcea61
fix STORM-1579, checks storm.local.dir property/conf when getting storm log dir
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/034f0cf1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/034f0cf1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/034f0cf1
Branch: refs/heads/master
Commit: 034f0cf107403100650d6eb65e7168f62133864a
Parents: 07629c1
Author: 卫乐 <we...@taobao.com>
Authored: Sun Feb 28 22:33:21 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Sun Feb 28 22:33:21 2016 +0800
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/utils/ConfigUtils.java | 6 +++++-
storm-core/test/clj/org/apache/storm/supervisor_test.clj | 11 +++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/034f0cf1/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
index 4a0564f..b4b3ea6 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
@@ -66,7 +66,11 @@ public class ConfigUtils {
dir = System.getProperty("storm.log.dir");
} else if ((conf = readStormConfig()).get("storm.log.dir") != null) {
dir = String.valueOf(conf.get("storm.log.dir"));
- } else {
+ } else if (System.getProperty("storm.local.dir") != null) {
+ dir = System.getProperty("storm.local.dir");
+ } else if (conf.get("storm.local.dir") != null) {
+ dir = conf.get("storm.local.dir") + FILE_SEPARATOR + "logs";
+ } else {
dir = concatIfNotNull(System.getProperty("storm.home")) + FILE_SEPARATOR + "logs";
}
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/034f0cf1/storm-core/test/clj/org/apache/storm/supervisor_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/org/apache/storm/supervisor_test.clj b/storm-core/test/clj/org/apache/storm/supervisor_test.clj
index cdd66e4..415a56d 100644
--- a/storm-core/test/clj/org/apache/storm/supervisor_test.clj
+++ b/storm-core/test/clj/org/apache/storm/supervisor_test.clj
@@ -297,6 +297,7 @@
(let [mock-port "42"
mock-storm-id "fake-storm-id"
mock-worker-id "fake-worker-id"
+ storm-log-dir (ConfigUtils/getLogDir)
mock-cp (str Utils/FILE_PATH_SEPARATOR "base" Utils/CLASS_PATH_SEPARATOR Utils/FILE_PATH_SEPARATOR "stormjar.jar")
mock-sensitivity "S3"
mock-cp "/base:/stormjar.jar"
@@ -308,7 +309,7 @@
(str "-Dstorm.id=" mock-storm-id)
(str "-Dworker.id=" mock-worker-id)
(str "-Dworker.port=" mock-port)
- "-Dstorm.log.dir=/logs"
+ (str "-Dstorm.log.dir=" storm-log-dir)
"-Dlog4j.configurationFile=/log4j2/worker.xml"
"-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector"
"org.apache.storm.LogWriter"]
@@ -321,7 +322,7 @@
"-Dworkers.artifacts=/tmp/workers-artifacts"
"-Dstorm.conf.file="
"-Dstorm.options="
- (str "-Dstorm.log.dir=" Utils/FILE_PATH_SEPARATOR "logs")
+ (str "-Dstorm.log.dir=" storm-log-dir)
(str "-Dlogging.sensitivity=" mock-sensitivity)
(str "-Dlog4j.configurationFile=" Utils/FILE_PATH_SEPARATOR "log4j2" Utils/FILE_PATH_SEPARATOR "worker.xml")
"-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector"
@@ -484,6 +485,7 @@
mock-cp "mock-classpath'quote-on-purpose"
attrs (make-array FileAttribute 0)
storm-local (.getCanonicalPath (.toFile (Files/createTempDirectory "storm-local" attrs)))
+ storm-log-dir (ConfigUtils/getLogDir)
worker-script (str storm-local "/workers/" mock-worker-id "/storm-worker-script.sh")
exp-launch ["/bin/worker-launcher"
"me"
@@ -499,7 +501,7 @@
" '-Dstorm.id=" mock-storm-id "'"
" '-Dworker.id=" mock-worker-id "'"
" '-Dworker.port=" mock-port "'"
- " '-Dstorm.log.dir=/logs'"
+ " '-Dstorm.log.dir=" storm-log-dir "'"
" '-Dlog4j.configurationFile=/log4j2/worker.xml'"
" '-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector'"
" 'org.apache.storm.LogWriter'"
@@ -512,7 +514,7 @@
" '-Dworkers.artifacts=" (str storm-local "/workers-artifacts'")
" '-Dstorm.conf.file='"
" '-Dstorm.options='"
- " '-Dstorm.log.dir=/logs'"
+ " '-Dstorm.log.dir=" storm-log-dir "'"
" '-Dlogging.sensitivity=" mock-sensitivity "'"
" '-Dlog4j.configurationFile=/log4j2/worker.xml'"
" '-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector'"
@@ -836,3 +838,4 @@
{"sup1" [3 4]}
(get-storm-id (:storm-cluster-state cluster) "topology2"))
)))
+
[3/9] storm git commit: add "storm.log.dir" to defaults.yaml
Posted by bo...@apache.org.
add "storm.log.dir" to defaults.yaml
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a4d1ce43
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a4d1ce43
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a4d1ce43
Branch: refs/heads/master
Commit: a4d1ce43bced0db9d81fb1486de0700c193ebf25
Parents: 504c11b
Author: 卫乐 <we...@taobao.com>
Authored: Tue Mar 1 09:51:53 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Tue Mar 1 09:51:53 2016 +0800
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a4d1ce43/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 9817161..28b9af4 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -23,6 +23,7 @@ java.library.path: "/usr/local/lib:/opt/local/lib:/usr/lib"
### storm.* configs are general configurations
# the local dir is where jars are kept
storm.local.dir: "storm-local"
+storm.log.dir: "logs"
storm.log4j2.conf.dir: "log4j2"
storm.zookeeper.servers:
- "localhost"
[4/9] storm git commit: upmerge from master
Posted by bo...@apache.org.
upmerge from master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1c9b9504
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1c9b9504
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1c9b9504
Branch: refs/heads/master
Commit: 1c9b9504369594217532a18efb99bf4c5546efe0
Parents: a4d1ce4 9aa8bf0
Author: 卫乐 <we...@taobao.com>
Authored: Tue Mar 1 09:52:19 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Tue Mar 1 09:52:19 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 4 +
.../src/clj/org/apache/storm/daemon/acker.clj | 108 ----------------
.../src/clj/org/apache/storm/daemon/common.clj | 17 ++-
storm-core/src/clj/org/apache/storm/testing.clj | 7 +-
.../src/jvm/org/apache/storm/daemon/Acker.java | 128 +++++++++++++++++++
.../src/jvm/org/apache/storm/utils/Utils.java | 4 +
7 files changed, 150 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
[2/9] storm git commit: append "/logs" to "storm.local.dir" property
when non-null
Posted by bo...@apache.org.
append "/logs" to "storm.local.dir" property when non-null
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/504c11b8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/504c11b8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/504c11b8
Branch: refs/heads/master
Commit: 504c11b8ead80e186ff0de83dbdece2337cd1162
Parents: 034f0cf
Author: 卫乐 <we...@taobao.com>
Authored: Sun Feb 28 22:42:56 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Sun Feb 28 22:42:56 2016 +0800
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/504c11b8/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
index b4b3ea6..36d4352 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
@@ -67,7 +67,7 @@ public class ConfigUtils {
} else if ((conf = readStormConfig()).get("storm.log.dir") != null) {
dir = String.valueOf(conf.get("storm.log.dir"));
} else if (System.getProperty("storm.local.dir") != null) {
- dir = System.getProperty("storm.local.dir");
+ dir = System.getProperty("storm.local.dir") + FILE_SEPARATOR + "logs";
} else if (conf.get("storm.local.dir") != null) {
dir = conf.get("storm.local.dir") + FILE_SEPARATOR + "logs";
} else {
[9/9] storm git commit: Added STORM-1579 to Changelog and updated
cleanup in pom.xml to be more maven standard.
Posted by bo...@apache.org.
Added STORM-1579 to Changelog and updated cleanup in pom.xml to be more maven standard.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/906fcea6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/906fcea6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/906fcea6
Branch: refs/heads/master
Commit: 906fcea615944626ceec232318290b60fe6bc2b1
Parents: 0953eca
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Mar 2 11:26:45 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Mar 2 11:26:45 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
pom.xml | 21 +++++++++++----------
2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/906fcea6/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97ec5f2..a87aa6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-1579: Fix NoSuchFileException when running tests in storm-core
* STORM-1244: port backtype.storm.command.upload-credentials to java
* STORM-1245: port backtype.storm.daemon.acker to java
* STORM-1545: Topology Debug Event Log in Wrong Location
http://git-wip-us.apache.org/repos/asf/storm/blob/906fcea6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fce54db..bdcc796 100644
--- a/pom.xml
+++ b/pom.xml
@@ -915,21 +915,22 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
<executions>
<execution>
- <phase>install</phase>
+ <id>cleanup</id>
+ <phase>clean</phase>
<goals>
- <goal>run</goal>
+ <goal>clean</goal>
</goals>
<configuration>
- <tasks>
- <delete quiet="true" includeEmptyDirs="true" failonerror="false">
- <fileset dir="logs"/>
- </delete>
- </tasks>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>./logs/</directory>
+ </fileset>
+ </filesets>
</configuration>
</execution>
</executions>
[5/9] storm git commit: exclude **/logs/** from apache-rat-plugin
Posted by bo...@apache.org.
exclude **/logs/** from apache-rat-plugin
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9165b603
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9165b603
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9165b603
Branch: refs/heads/master
Commit: 9165b603985c0c158821cd5a20e6c509ee63342a
Parents: 1c9b950
Author: 卫乐 <we...@taobao.com>
Authored: Tue Mar 1 09:55:50 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Tue Mar 1 09:55:50 2016 +0800
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9165b603/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 83f7f9c..ec5d1e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,6 +322,8 @@
<exclude>**/metastore_db/**</exclude>
<!-- anything written into build should be ignored -->
<exclude>**/build/**</exclude>
+ <!-- logs generated during test -->
+ <exclude>**/logs/**</exclude>
<!-- exclude CHANGELOG, VERSION, AND TODO files -->
<exclude>**/CHANGELOG.md</exclude>
[7/9] storm git commit: upmerge from master
Posted by bo...@apache.org.
upmerge from master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ff11c8a0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ff11c8a0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ff11c8a0
Branch: refs/heads/master
Commit: ff11c8a0bfaf2ac4a0daa2d6b0399fb42f301cd5
Parents: 3def236 d42c437
Author: 卫乐 <we...@taobao.com>
Authored: Wed Mar 2 11:12:55 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Wed Mar 2 11:12:55 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 4 ++
bin/storm.cmd | 2 +-
bin/storm.py | 4 +-
.../storm/starter/ThroughputVsLatency.java | 2 +-
.../apache/storm/sql/compiler/CompilerUtil.java | 7 ++-
.../apache/storm/sql/compiler/ExprCompiler.java | 32 ++++++++--
.../backends/standalone/RelNodeCompiler.java | 6 +-
.../apache/storm/sql/parser/StormParser.java | 5 ++
.../test/org/apache/storm/sql/TestStormSql.java | 64 +++++++++++++++++---
.../storm/sql/compiler/TestCompilerUtils.java | 62 ++++++++++++++++---
.../storm/sql/compiler/TestExprSemantic.java | 18 ++++++
.../backends/standalone/TestPlanCompiler.java | 20 ++++++
.../backends/trident/TestPlanCompiler.java | 4 +-
.../test/org/apache/storm/sql/TestUtils.java | 32 +++++++++-
.../apache/storm/command/upload_credentials.clj | 35 -----------
.../src/jvm/org/apache/storm/command/List.java | 50 ---------------
.../apache/storm/command/ListTopologies.java | 52 ++++++++++++++++
.../apache/storm/command/UploadCredentials.java | 61 +++++++++++++++++++
18 files changed, 344 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
[8/9] storm git commit: Merge branch 'STORM-1579' of
https://github.com/unsleepy22/storm into STORM-1579
Posted by bo...@apache.org.
Merge branch 'STORM-1579' of https://github.com/unsleepy22/storm into STORM-1579
STORM-1579: Fix NoSuchFileException when running tests in storm-core
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0953ecaa
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0953ecaa
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0953ecaa
Branch: refs/heads/master
Commit: 0953ecaa6ecb01cde7c59973e12d3473795e3d86
Parents: d42c437 ff11c8a
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Mar 2 11:15:43 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Mar 2 11:15:43 2016 -0600
----------------------------------------------------------------------
.gitignore | 1 +
pom.xml | 22 ++++++++++++++++++++
.../jvm/org/apache/storm/utils/ConfigUtils.java | 6 ++++--
.../clj/org/apache/storm/supervisor_test.clj | 11 ++++++----
4 files changed, 34 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[6/9] storm git commit: 1. revert changes to defaults.yaml 2. add
logs to .gitignore 3. add maven-antrun-plugin to delete logs directory
generated while running tests 4. remove storm.local.dir property check
Posted by bo...@apache.org.
1. revert changes to defaults.yaml
2. add logs to .gitignore
3. add maven-antrun-plugin to delete logs directory generated while running tests
4. remove storm.local.dir property check
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3def2364
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3def2364
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3def2364
Branch: refs/heads/master
Commit: 3def2364b37a631a3727ca5353949022e341cc0c
Parents: 9165b60
Author: 卫乐 <we...@taobao.com>
Authored: Wed Mar 2 11:11:05 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Wed Mar 2 11:11:05 2016 +0800
----------------------------------------------------------------------
.gitignore | 1 +
conf/defaults.yaml | 1 -
pom.xml | 20 ++++++++++++++++++++
.../jvm/org/apache/storm/utils/ConfigUtils.java | 8 +++-----
4 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3def2364/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 08b217a..13427bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ metastore_db
.settings/
.project
.classpath
+logs
http://git-wip-us.apache.org/repos/asf/storm/blob/3def2364/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 28b9af4..9817161 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -23,7 +23,6 @@ java.library.path: "/usr/local/lib:/opt/local/lib:/usr/lib"
### storm.* configs are general configurations
# the local dir is where jars are kept
storm.local.dir: "storm-local"
-storm.log.dir: "logs"
storm.log4j2.conf.dir: "log4j2"
storm.zookeeper.servers:
- "localhost"
http://git-wip-us.apache.org/repos/asf/storm/blob/3def2364/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ec5d1e7..fce54db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -916,6 +916,26 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete quiet="true" includeEmptyDirs="true" failonerror="false">
+ <fileset dir="logs"/>
+ </delete>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2.2</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/storm/blob/3def2364/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
index 36d4352..7fd61fa 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
@@ -66,12 +66,10 @@ public class ConfigUtils {
dir = System.getProperty("storm.log.dir");
} else if ((conf = readStormConfig()).get("storm.log.dir") != null) {
dir = String.valueOf(conf.get("storm.log.dir"));
- } else if (System.getProperty("storm.local.dir") != null) {
- dir = System.getProperty("storm.local.dir") + FILE_SEPARATOR + "logs";
- } else if (conf.get("storm.local.dir") != null) {
- dir = conf.get("storm.local.dir") + FILE_SEPARATOR + "logs";
+ } else if (System.getProperty("storm.home") != null) {
+ dir = System.getProperty("storm.home") + FILE_SEPARATOR + "logs";
} else {
- dir = concatIfNotNull(System.getProperty("storm.home")) + FILE_SEPARATOR + "logs";
+ dir = "logs";
}
try {
return new File(dir).getCanonicalPath();