From 9698047cf849d2f9c63855d342282a260bd0fe41 Mon Sep 17 00:00:00 2001
From: a-ono <a-ono@users.sourceforge.jp>
Date: Fri, 2 Apr 2010 15:58:44 +0900
Subject: [PATCH] fixes #20813

---
 {installer/ant => ant}/INSTALL                     |   0
 {installer/ant => ant}/KEYS                        |   0
 {installer/ant => ant}/LICENSE                     |   0
 {installer/ant => ant}/NOTICE                      |   0
 {installer/ant => ant}/README                      |   0
 {installer/ant => ant}/WHATSNEW                    |   0
 {installer/ant => ant}/bin/ant                     |   0
 {installer/ant => ant}/bin/ant.bat                 |   0
 {installer/ant => ant}/bin/ant.cmd                 |   0
 {installer/ant => ant}/bin/antRun                  |   0
 {installer/ant => ant}/bin/antRun.bat              |   0
 {installer/ant => ant}/bin/antRun.pl               |   0
 {installer/ant => ant}/bin/antenv.cmd              |   0
 {installer/ant => ant}/bin/complete-ant-cmd.pl     |   0
 {installer/ant => ant}/bin/envset.cmd              |   0
 {installer/ant => ant}/bin/lcp.bat                 |   0
 {installer/ant => ant}/bin/runant.pl               |   0
 {installer/ant => ant}/bin/runant.py               |   0
 {installer/ant => ant}/bin/runrc.cmd               |   0
 {installer/ant => ant}/etc/ant-bootstrap.jar       | Bin
 {installer/ant => ant}/etc/changelog.xsl           |   0
 .../etc/checkstyle/checkstyle-frames.xsl           |   0
 .../ant => ant}/etc/checkstyle/checkstyle-text.xsl |   0
 .../ant => ant}/etc/checkstyle/checkstyle-xdoc.xsl |   0
 {installer/ant => ant}/etc/coverage-frames.xsl     |   0
 {installer/ant => ant}/etc/jdepend-frames.xsl      |   0
 {installer/ant => ant}/etc/jdepend.xsl             |   0
 {installer/ant => ant}/etc/junit-frames-xalan1.xsl |   0
 {installer/ant => ant}/etc/junit-frames.xsl        |   0
 {installer/ant => ant}/etc/junit-noframes.xsl      |   0
 {installer/ant => ant}/etc/log.xsl                 |   0
 {installer/ant => ant}/etc/maudit-frames.xsl       |   0
 {installer/ant => ant}/etc/mmetrics-frames.xsl     |   0
 {installer/ant => ant}/etc/tagdiff.xsl             |   0
 {installer/ant => ant}/fetch.xml                   |   0
 {installer/ant => ant}/get-m2.xml                  |   0
 {installer/ant => ant}/lib/README                  |   0
 {installer/ant => ant}/lib/ant-1.7.1.pom           |   0
 {installer/ant => ant}/lib/ant-1.7.1.pom.md5       |   0
 {installer/ant => ant}/lib/ant-1.7.1.pom.sha1      |   0
 {installer/ant => ant}/lib/ant-antlr-1.7.1.pom     |   0
 {installer/ant => ant}/lib/ant-antlr-1.7.1.pom.md5 |   0
 .../ant => ant}/lib/ant-antlr-1.7.1.pom.sha1       |   0
 {installer/ant => ant}/lib/ant-antlr.jar           | Bin
 .../ant => ant}/lib/ant-apache-bcel-1.7.1.pom      |   0
 .../ant => ant}/lib/ant-apache-bcel-1.7.1.pom.md5  |   0
 .../ant => ant}/lib/ant-apache-bcel-1.7.1.pom.sha1 |   0
 {installer/ant => ant}/lib/ant-apache-bcel.jar     | Bin
 .../ant => ant}/lib/ant-apache-bsf-1.7.1.pom       |   0
 .../ant => ant}/lib/ant-apache-bsf-1.7.1.pom.md5   |   0
 .../ant => ant}/lib/ant-apache-bsf-1.7.1.pom.sha1  |   0
 {installer/ant => ant}/lib/ant-apache-bsf.jar      | Bin
 .../ant => ant}/lib/ant-apache-log4j-1.7.1.pom     |   0
 .../ant => ant}/lib/ant-apache-log4j-1.7.1.pom.md5 |   0
 .../lib/ant-apache-log4j-1.7.1.pom.sha1            |   0
 {installer/ant => ant}/lib/ant-apache-log4j.jar    | Bin
 .../ant => ant}/lib/ant-apache-oro-1.7.1.pom       |   0
 .../ant => ant}/lib/ant-apache-oro-1.7.1.pom.md5   |   0
 .../ant => ant}/lib/ant-apache-oro-1.7.1.pom.sha1  |   0
 {installer/ant => ant}/lib/ant-apache-oro.jar      | Bin
 .../ant => ant}/lib/ant-apache-regexp-1.7.1.pom    |   0
 .../lib/ant-apache-regexp-1.7.1.pom.md5            |   0
 .../lib/ant-apache-regexp-1.7.1.pom.sha1           |   0
 {installer/ant => ant}/lib/ant-apache-regexp.jar   | Bin
 .../ant => ant}/lib/ant-apache-resolver-1.7.1.pom  |   0
 .../lib/ant-apache-resolver-1.7.1.pom.md5          |   0
 .../lib/ant-apache-resolver-1.7.1.pom.sha1         |   0
 {installer/ant => ant}/lib/ant-apache-resolver.jar | Bin
 .../ant => ant}/lib/ant-commons-logging-1.7.1.pom  |   0
 .../lib/ant-commons-logging-1.7.1.pom.md5          |   0
 .../lib/ant-commons-logging-1.7.1.pom.sha1         |   0
 {installer/ant => ant}/lib/ant-commons-logging.jar | Bin
 .../ant => ant}/lib/ant-commons-net-1.7.1.pom      |   0
 .../ant => ant}/lib/ant-commons-net-1.7.1.pom.md5  |   0
 .../ant => ant}/lib/ant-commons-net-1.7.1.pom.sha1 |   0
 {installer/ant => ant}/lib/ant-commons-net.jar     | Bin
 {installer/ant => ant}/lib/ant-jai-1.7.1.pom       |   0
 {installer/ant => ant}/lib/ant-jai-1.7.1.pom.md5   |   0
 {installer/ant => ant}/lib/ant-jai-1.7.1.pom.sha1  |   0
 {installer/ant => ant}/lib/ant-jai.jar             | Bin
 {installer/ant => ant}/lib/ant-javamail-1.7.1.pom  |   0
 .../ant => ant}/lib/ant-javamail-1.7.1.pom.md5     |   0
 .../ant => ant}/lib/ant-javamail-1.7.1.pom.sha1    |   0
 {installer/ant => ant}/lib/ant-javamail.jar        | Bin
 {installer/ant => ant}/lib/ant-jdepend-1.7.1.pom   |   0
 .../ant => ant}/lib/ant-jdepend-1.7.1.pom.md5      |   0
 .../ant => ant}/lib/ant-jdepend-1.7.1.pom.sha1     |   0
 {installer/ant => ant}/lib/ant-jdepend.jar         | Bin
 {installer/ant => ant}/lib/ant-jmf-1.7.1.pom       |   0
 {installer/ant => ant}/lib/ant-jmf-1.7.1.pom.md5   |   0
 {installer/ant => ant}/lib/ant-jmf-1.7.1.pom.sha1  |   0
 {installer/ant => ant}/lib/ant-jmf.jar             | Bin
 {installer/ant => ant}/lib/ant-jsch-1.7.1.pom      |   0
 {installer/ant => ant}/lib/ant-jsch-1.7.1.pom.md5  |   0
 {installer/ant => ant}/lib/ant-jsch-1.7.1.pom.sha1 |   0
 {installer/ant => ant}/lib/ant-jsch.jar            | Bin
 {installer/ant => ant}/lib/ant-junit-1.7.1.pom     |   0
 {installer/ant => ant}/lib/ant-junit-1.7.1.pom.md5 |   0
 .../ant => ant}/lib/ant-junit-1.7.1.pom.sha1       |   0
 {installer/ant => ant}/lib/ant-junit.jar           | Bin
 {installer/ant => ant}/lib/ant-launcher-1.7.1.pom  |   0
 .../ant => ant}/lib/ant-launcher-1.7.1.pom.md5     |   0
 .../ant => ant}/lib/ant-launcher-1.7.1.pom.sha1    |   0
 {installer/ant => ant}/lib/ant-launcher.jar        | Bin
 {installer/ant => ant}/lib/ant-netrexx-1.7.1.pom   |   0
 .../ant => ant}/lib/ant-netrexx-1.7.1.pom.md5      |   0
 .../ant => ant}/lib/ant-netrexx-1.7.1.pom.sha1     |   0
 {installer/ant => ant}/lib/ant-netrexx.jar         | Bin
 {installer/ant => ant}/lib/ant-nodeps-1.7.1.pom    |   0
 .../ant => ant}/lib/ant-nodeps-1.7.1.pom.md5       |   0
 .../ant => ant}/lib/ant-nodeps-1.7.1.pom.sha1      |   0
 {installer/ant => ant}/lib/ant-nodeps.jar          | Bin
 {installer/ant => ant}/lib/ant-parent-1.7.1.pom    |   0
 .../ant => ant}/lib/ant-parent-1.7.1.pom.md5       |   0
 .../ant => ant}/lib/ant-parent-1.7.1.pom.sha1      |   0
 {installer/ant => ant}/lib/ant-starteam-1.7.1.pom  |   0
 .../ant => ant}/lib/ant-starteam-1.7.1.pom.md5     |   0
 .../ant => ant}/lib/ant-starteam-1.7.1.pom.sha1    |   0
 {installer/ant => ant}/lib/ant-starteam.jar        | Bin
 {installer/ant => ant}/lib/ant-stylebook-1.7.1.pom |   0
 .../ant => ant}/lib/ant-stylebook-1.7.1.pom.md5    |   0
 .../ant => ant}/lib/ant-stylebook-1.7.1.pom.sha1   |   0
 {installer/ant => ant}/lib/ant-stylebook.jar       | Bin
 {installer/ant => ant}/lib/ant-swing-1.7.1.pom     |   0
 {installer/ant => ant}/lib/ant-swing-1.7.1.pom.md5 |   0
 .../ant => ant}/lib/ant-swing-1.7.1.pom.sha1       |   0
 {installer/ant => ant}/lib/ant-swing.jar           | Bin
 {installer/ant => ant}/lib/ant-testutil-1.7.1.pom  |   0
 .../ant => ant}/lib/ant-testutil-1.7.1.pom.md5     |   0
 .../ant => ant}/lib/ant-testutil-1.7.1.pom.sha1    |   0
 {installer/ant => ant}/lib/ant-testutil.jar        | Bin
 {installer/ant => ant}/lib/ant-trax-1.7.1.pom      |   0
 {installer/ant => ant}/lib/ant-trax-1.7.1.pom.md5  |   0
 {installer/ant => ant}/lib/ant-trax-1.7.1.pom.sha1 |   0
 {installer/ant => ant}/lib/ant-trax.jar            | Bin
 {installer/ant => ant}/lib/ant-weblogic-1.7.1.pom  |   0
 .../ant => ant}/lib/ant-weblogic-1.7.1.pom.md5     |   0
 .../ant => ant}/lib/ant-weblogic-1.7.1.pom.sha1    |   0
 {installer/ant => ant}/lib/ant-weblogic.jar        | Bin
 {installer/ant => ant}/lib/ant.jar                 | Bin
 {installer/ant => ant}/lib/libraries.properties    |   0
 {installer/ant => ant}/lib/xercesImpl.jar          | Bin
 {installer/ant => ant}/lib/xml-apis.jar            | Bin
 installer/install.xml                              | 158 +++++++++++----------
 script/setenv.bat                                  |   2 +-
 145 files changed, 83 insertions(+), 77 deletions(-)
 rename {installer/ant => ant}/INSTALL (100%)
 rename {installer/ant => ant}/KEYS (100%)
 rename {installer/ant => ant}/LICENSE (100%)
 rename {installer/ant => ant}/NOTICE (100%)
 rename {installer/ant => ant}/README (100%)
 rename {installer/ant => ant}/WHATSNEW (100%)
 rename {installer/ant => ant}/bin/ant (100%)
 rename {installer/ant => ant}/bin/ant.bat (100%)
 rename {installer/ant => ant}/bin/ant.cmd (100%)
 rename {installer/ant => ant}/bin/antRun (100%)
 rename {installer/ant => ant}/bin/antRun.bat (100%)
 rename {installer/ant => ant}/bin/antRun.pl (100%)
 rename {installer/ant => ant}/bin/antenv.cmd (100%)
 rename {installer/ant => ant}/bin/complete-ant-cmd.pl (100%)
 rename {installer/ant => ant}/bin/envset.cmd (100%)
 rename {installer/ant => ant}/bin/lcp.bat (100%)
 rename {installer/ant => ant}/bin/runant.pl (100%)
 rename {installer/ant => ant}/bin/runant.py (100%)
 rename {installer/ant => ant}/bin/runrc.cmd (100%)
 rename {installer/ant => ant}/etc/ant-bootstrap.jar (100%)
 rename {installer/ant => ant}/etc/changelog.xsl (100%)
 rename {installer/ant => ant}/etc/checkstyle/checkstyle-frames.xsl (100%)
 rename {installer/ant => ant}/etc/checkstyle/checkstyle-text.xsl (100%)
 rename {installer/ant => ant}/etc/checkstyle/checkstyle-xdoc.xsl (100%)
 rename {installer/ant => ant}/etc/coverage-frames.xsl (100%)
 rename {installer/ant => ant}/etc/jdepend-frames.xsl (100%)
 rename {installer/ant => ant}/etc/jdepend.xsl (100%)
 rename {installer/ant => ant}/etc/junit-frames-xalan1.xsl (100%)
 rename {installer/ant => ant}/etc/junit-frames.xsl (100%)
 rename {installer/ant => ant}/etc/junit-noframes.xsl (100%)
 rename {installer/ant => ant}/etc/log.xsl (100%)
 rename {installer/ant => ant}/etc/maudit-frames.xsl (100%)
 rename {installer/ant => ant}/etc/mmetrics-frames.xsl (100%)
 rename {installer/ant => ant}/etc/tagdiff.xsl (100%)
 rename {installer/ant => ant}/fetch.xml (100%)
 rename {installer/ant => ant}/get-m2.xml (100%)
 rename {installer/ant => ant}/lib/README (100%)
 rename {installer/ant => ant}/lib/ant-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-antlr-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-antlr-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-antlr-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-antlr.jar (100%)
 rename {installer/ant => ant}/lib/ant-apache-bcel-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-apache-bcel-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-apache-bcel-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-apache-bcel.jar (100%)
 rename {installer/ant => ant}/lib/ant-apache-bsf-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-apache-bsf-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-apache-bsf-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-apache-bsf.jar (100%)
 rename {installer/ant => ant}/lib/ant-apache-log4j-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-apache-log4j-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-apache-log4j-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-apache-log4j.jar (100%)
 rename {installer/ant => ant}/lib/ant-apache-oro-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-apache-oro-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-apache-oro-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-apache-oro.jar (100%)
 rename {installer/ant => ant}/lib/ant-apache-regexp-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-apache-regexp-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-apache-regexp-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-apache-regexp.jar (100%)
 rename {installer/ant => ant}/lib/ant-apache-resolver-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-apache-resolver-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-apache-resolver-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-apache-resolver.jar (100%)
 rename {installer/ant => ant}/lib/ant-commons-logging-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-commons-logging-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-commons-logging-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-commons-logging.jar (100%)
 rename {installer/ant => ant}/lib/ant-commons-net-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-commons-net-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-commons-net-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-commons-net.jar (100%)
 rename {installer/ant => ant}/lib/ant-jai-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-jai-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-jai-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-jai.jar (100%)
 rename {installer/ant => ant}/lib/ant-javamail-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-javamail-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-javamail-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-javamail.jar (100%)
 rename {installer/ant => ant}/lib/ant-jdepend-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-jdepend-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-jdepend-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-jdepend.jar (100%)
 rename {installer/ant => ant}/lib/ant-jmf-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-jmf-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-jmf-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-jmf.jar (100%)
 rename {installer/ant => ant}/lib/ant-jsch-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-jsch-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-jsch-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-jsch.jar (100%)
 rename {installer/ant => ant}/lib/ant-junit-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-junit-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-junit-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-junit.jar (100%)
 rename {installer/ant => ant}/lib/ant-launcher-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-launcher-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-launcher-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-launcher.jar (100%)
 rename {installer/ant => ant}/lib/ant-netrexx-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-netrexx-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-netrexx-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-netrexx.jar (100%)
 rename {installer/ant => ant}/lib/ant-nodeps-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-nodeps-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-nodeps-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-nodeps.jar (100%)
 rename {installer/ant => ant}/lib/ant-parent-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-parent-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-parent-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-starteam-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-starteam-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-starteam-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-starteam.jar (100%)
 rename {installer/ant => ant}/lib/ant-stylebook-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-stylebook-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-stylebook-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-stylebook.jar (100%)
 rename {installer/ant => ant}/lib/ant-swing-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-swing-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-swing-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-swing.jar (100%)
 rename {installer/ant => ant}/lib/ant-testutil-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-testutil-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-testutil-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-testutil.jar (100%)
 rename {installer/ant => ant}/lib/ant-trax-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-trax-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-trax-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-trax.jar (100%)
 rename {installer/ant => ant}/lib/ant-weblogic-1.7.1.pom (100%)
 rename {installer/ant => ant}/lib/ant-weblogic-1.7.1.pom.md5 (100%)
 rename {installer/ant => ant}/lib/ant-weblogic-1.7.1.pom.sha1 (100%)
 rename {installer/ant => ant}/lib/ant-weblogic.jar (100%)
 rename {installer/ant => ant}/lib/ant.jar (100%)
 rename {installer/ant => ant}/lib/libraries.properties (100%)
 rename {installer/ant => ant}/lib/xercesImpl.jar (100%)
 rename {installer/ant => ant}/lib/xml-apis.jar (100%)

diff --git a/installer/ant/INSTALL b/ant/INSTALL
similarity index 100%
rename from installer/ant/INSTALL
rename to ant/INSTALL
diff --git a/installer/ant/KEYS b/ant/KEYS
similarity index 100%
rename from installer/ant/KEYS
rename to ant/KEYS
diff --git a/installer/ant/LICENSE b/ant/LICENSE
similarity index 100%
rename from installer/ant/LICENSE
rename to ant/LICENSE
diff --git a/installer/ant/NOTICE b/ant/NOTICE
similarity index 100%
rename from installer/ant/NOTICE
rename to ant/NOTICE
diff --git a/installer/ant/README b/ant/README
similarity index 100%
rename from installer/ant/README
rename to ant/README
diff --git a/installer/ant/WHATSNEW b/ant/WHATSNEW
similarity index 100%
rename from installer/ant/WHATSNEW
rename to ant/WHATSNEW
diff --git a/installer/ant/bin/ant b/ant/bin/ant
similarity index 100%
rename from installer/ant/bin/ant
rename to ant/bin/ant
diff --git a/installer/ant/bin/ant.bat b/ant/bin/ant.bat
similarity index 100%
rename from installer/ant/bin/ant.bat
rename to ant/bin/ant.bat
diff --git a/installer/ant/bin/ant.cmd b/ant/bin/ant.cmd
similarity index 100%
rename from installer/ant/bin/ant.cmd
rename to ant/bin/ant.cmd
diff --git a/installer/ant/bin/antRun b/ant/bin/antRun
similarity index 100%
rename from installer/ant/bin/antRun
rename to ant/bin/antRun
diff --git a/installer/ant/bin/antRun.bat b/ant/bin/antRun.bat
similarity index 100%
rename from installer/ant/bin/antRun.bat
rename to ant/bin/antRun.bat
diff --git a/installer/ant/bin/antRun.pl b/ant/bin/antRun.pl
similarity index 100%
rename from installer/ant/bin/antRun.pl
rename to ant/bin/antRun.pl
diff --git a/installer/ant/bin/antenv.cmd b/ant/bin/antenv.cmd
similarity index 100%
rename from installer/ant/bin/antenv.cmd
rename to ant/bin/antenv.cmd
diff --git a/installer/ant/bin/complete-ant-cmd.pl b/ant/bin/complete-ant-cmd.pl
similarity index 100%
rename from installer/ant/bin/complete-ant-cmd.pl
rename to ant/bin/complete-ant-cmd.pl
diff --git a/installer/ant/bin/envset.cmd b/ant/bin/envset.cmd
similarity index 100%
rename from installer/ant/bin/envset.cmd
rename to ant/bin/envset.cmd
diff --git a/installer/ant/bin/lcp.bat b/ant/bin/lcp.bat
similarity index 100%
rename from installer/ant/bin/lcp.bat
rename to ant/bin/lcp.bat
diff --git a/installer/ant/bin/runant.pl b/ant/bin/runant.pl
similarity index 100%
rename from installer/ant/bin/runant.pl
rename to ant/bin/runant.pl
diff --git a/installer/ant/bin/runant.py b/ant/bin/runant.py
similarity index 100%
rename from installer/ant/bin/runant.py
rename to ant/bin/runant.py
diff --git a/installer/ant/bin/runrc.cmd b/ant/bin/runrc.cmd
similarity index 100%
rename from installer/ant/bin/runrc.cmd
rename to ant/bin/runrc.cmd
diff --git a/installer/ant/etc/ant-bootstrap.jar b/ant/etc/ant-bootstrap.jar
similarity index 100%
rename from installer/ant/etc/ant-bootstrap.jar
rename to ant/etc/ant-bootstrap.jar
diff --git a/installer/ant/etc/changelog.xsl b/ant/etc/changelog.xsl
similarity index 100%
rename from installer/ant/etc/changelog.xsl
rename to ant/etc/changelog.xsl
diff --git a/installer/ant/etc/checkstyle/checkstyle-frames.xsl b/ant/etc/checkstyle/checkstyle-frames.xsl
similarity index 100%
rename from installer/ant/etc/checkstyle/checkstyle-frames.xsl
rename to ant/etc/checkstyle/checkstyle-frames.xsl
diff --git a/installer/ant/etc/checkstyle/checkstyle-text.xsl b/ant/etc/checkstyle/checkstyle-text.xsl
similarity index 100%
rename from installer/ant/etc/checkstyle/checkstyle-text.xsl
rename to ant/etc/checkstyle/checkstyle-text.xsl
diff --git a/installer/ant/etc/checkstyle/checkstyle-xdoc.xsl b/ant/etc/checkstyle/checkstyle-xdoc.xsl
similarity index 100%
rename from installer/ant/etc/checkstyle/checkstyle-xdoc.xsl
rename to ant/etc/checkstyle/checkstyle-xdoc.xsl
diff --git a/installer/ant/etc/coverage-frames.xsl b/ant/etc/coverage-frames.xsl
similarity index 100%
rename from installer/ant/etc/coverage-frames.xsl
rename to ant/etc/coverage-frames.xsl
diff --git a/installer/ant/etc/jdepend-frames.xsl b/ant/etc/jdepend-frames.xsl
similarity index 100%
rename from installer/ant/etc/jdepend-frames.xsl
rename to ant/etc/jdepend-frames.xsl
diff --git a/installer/ant/etc/jdepend.xsl b/ant/etc/jdepend.xsl
similarity index 100%
rename from installer/ant/etc/jdepend.xsl
rename to ant/etc/jdepend.xsl
diff --git a/installer/ant/etc/junit-frames-xalan1.xsl b/ant/etc/junit-frames-xalan1.xsl
similarity index 100%
rename from installer/ant/etc/junit-frames-xalan1.xsl
rename to ant/etc/junit-frames-xalan1.xsl
diff --git a/installer/ant/etc/junit-frames.xsl b/ant/etc/junit-frames.xsl
similarity index 100%
rename from installer/ant/etc/junit-frames.xsl
rename to ant/etc/junit-frames.xsl
diff --git a/installer/ant/etc/junit-noframes.xsl b/ant/etc/junit-noframes.xsl
similarity index 100%
rename from installer/ant/etc/junit-noframes.xsl
rename to ant/etc/junit-noframes.xsl
diff --git a/installer/ant/etc/log.xsl b/ant/etc/log.xsl
similarity index 100%
rename from installer/ant/etc/log.xsl
rename to ant/etc/log.xsl
diff --git a/installer/ant/etc/maudit-frames.xsl b/ant/etc/maudit-frames.xsl
similarity index 100%
rename from installer/ant/etc/maudit-frames.xsl
rename to ant/etc/maudit-frames.xsl
diff --git a/installer/ant/etc/mmetrics-frames.xsl b/ant/etc/mmetrics-frames.xsl
similarity index 100%
rename from installer/ant/etc/mmetrics-frames.xsl
rename to ant/etc/mmetrics-frames.xsl
diff --git a/installer/ant/etc/tagdiff.xsl b/ant/etc/tagdiff.xsl
similarity index 100%
rename from installer/ant/etc/tagdiff.xsl
rename to ant/etc/tagdiff.xsl
diff --git a/installer/ant/fetch.xml b/ant/fetch.xml
similarity index 100%
rename from installer/ant/fetch.xml
rename to ant/fetch.xml
diff --git a/installer/ant/get-m2.xml b/ant/get-m2.xml
similarity index 100%
rename from installer/ant/get-m2.xml
rename to ant/get-m2.xml
diff --git a/installer/ant/lib/README b/ant/lib/README
similarity index 100%
rename from installer/ant/lib/README
rename to ant/lib/README
diff --git a/installer/ant/lib/ant-1.7.1.pom b/ant/lib/ant-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-1.7.1.pom
rename to ant/lib/ant-1.7.1.pom
diff --git a/installer/ant/lib/ant-1.7.1.pom.md5 b/ant/lib/ant-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-1.7.1.pom.md5
rename to ant/lib/ant-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-1.7.1.pom.sha1 b/ant/lib/ant-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-1.7.1.pom.sha1
rename to ant/lib/ant-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-antlr-1.7.1.pom b/ant/lib/ant-antlr-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-antlr-1.7.1.pom
rename to ant/lib/ant-antlr-1.7.1.pom
diff --git a/installer/ant/lib/ant-antlr-1.7.1.pom.md5 b/ant/lib/ant-antlr-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-antlr-1.7.1.pom.md5
rename to ant/lib/ant-antlr-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-antlr-1.7.1.pom.sha1 b/ant/lib/ant-antlr-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-antlr-1.7.1.pom.sha1
rename to ant/lib/ant-antlr-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-antlr.jar b/ant/lib/ant-antlr.jar
similarity index 100%
rename from installer/ant/lib/ant-antlr.jar
rename to ant/lib/ant-antlr.jar
diff --git a/installer/ant/lib/ant-apache-bcel-1.7.1.pom b/ant/lib/ant-apache-bcel-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-apache-bcel-1.7.1.pom
rename to ant/lib/ant-apache-bcel-1.7.1.pom
diff --git a/installer/ant/lib/ant-apache-bcel-1.7.1.pom.md5 b/ant/lib/ant-apache-bcel-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-apache-bcel-1.7.1.pom.md5
rename to ant/lib/ant-apache-bcel-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-apache-bcel-1.7.1.pom.sha1 b/ant/lib/ant-apache-bcel-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-apache-bcel-1.7.1.pom.sha1
rename to ant/lib/ant-apache-bcel-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-apache-bcel.jar b/ant/lib/ant-apache-bcel.jar
similarity index 100%
rename from installer/ant/lib/ant-apache-bcel.jar
rename to ant/lib/ant-apache-bcel.jar
diff --git a/installer/ant/lib/ant-apache-bsf-1.7.1.pom b/ant/lib/ant-apache-bsf-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-apache-bsf-1.7.1.pom
rename to ant/lib/ant-apache-bsf-1.7.1.pom
diff --git a/installer/ant/lib/ant-apache-bsf-1.7.1.pom.md5 b/ant/lib/ant-apache-bsf-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-apache-bsf-1.7.1.pom.md5
rename to ant/lib/ant-apache-bsf-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-apache-bsf-1.7.1.pom.sha1 b/ant/lib/ant-apache-bsf-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-apache-bsf-1.7.1.pom.sha1
rename to ant/lib/ant-apache-bsf-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-apache-bsf.jar b/ant/lib/ant-apache-bsf.jar
similarity index 100%
rename from installer/ant/lib/ant-apache-bsf.jar
rename to ant/lib/ant-apache-bsf.jar
diff --git a/installer/ant/lib/ant-apache-log4j-1.7.1.pom b/ant/lib/ant-apache-log4j-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-apache-log4j-1.7.1.pom
rename to ant/lib/ant-apache-log4j-1.7.1.pom
diff --git a/installer/ant/lib/ant-apache-log4j-1.7.1.pom.md5 b/ant/lib/ant-apache-log4j-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-apache-log4j-1.7.1.pom.md5
rename to ant/lib/ant-apache-log4j-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-apache-log4j-1.7.1.pom.sha1 b/ant/lib/ant-apache-log4j-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-apache-log4j-1.7.1.pom.sha1
rename to ant/lib/ant-apache-log4j-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-apache-log4j.jar b/ant/lib/ant-apache-log4j.jar
similarity index 100%
rename from installer/ant/lib/ant-apache-log4j.jar
rename to ant/lib/ant-apache-log4j.jar
diff --git a/installer/ant/lib/ant-apache-oro-1.7.1.pom b/ant/lib/ant-apache-oro-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-apache-oro-1.7.1.pom
rename to ant/lib/ant-apache-oro-1.7.1.pom
diff --git a/installer/ant/lib/ant-apache-oro-1.7.1.pom.md5 b/ant/lib/ant-apache-oro-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-apache-oro-1.7.1.pom.md5
rename to ant/lib/ant-apache-oro-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-apache-oro-1.7.1.pom.sha1 b/ant/lib/ant-apache-oro-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-apache-oro-1.7.1.pom.sha1
rename to ant/lib/ant-apache-oro-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-apache-oro.jar b/ant/lib/ant-apache-oro.jar
similarity index 100%
rename from installer/ant/lib/ant-apache-oro.jar
rename to ant/lib/ant-apache-oro.jar
diff --git a/installer/ant/lib/ant-apache-regexp-1.7.1.pom b/ant/lib/ant-apache-regexp-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-apache-regexp-1.7.1.pom
rename to ant/lib/ant-apache-regexp-1.7.1.pom
diff --git a/installer/ant/lib/ant-apache-regexp-1.7.1.pom.md5 b/ant/lib/ant-apache-regexp-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-apache-regexp-1.7.1.pom.md5
rename to ant/lib/ant-apache-regexp-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-apache-regexp-1.7.1.pom.sha1 b/ant/lib/ant-apache-regexp-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-apache-regexp-1.7.1.pom.sha1
rename to ant/lib/ant-apache-regexp-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-apache-regexp.jar b/ant/lib/ant-apache-regexp.jar
similarity index 100%
rename from installer/ant/lib/ant-apache-regexp.jar
rename to ant/lib/ant-apache-regexp.jar
diff --git a/installer/ant/lib/ant-apache-resolver-1.7.1.pom b/ant/lib/ant-apache-resolver-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-apache-resolver-1.7.1.pom
rename to ant/lib/ant-apache-resolver-1.7.1.pom
diff --git a/installer/ant/lib/ant-apache-resolver-1.7.1.pom.md5 b/ant/lib/ant-apache-resolver-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-apache-resolver-1.7.1.pom.md5
rename to ant/lib/ant-apache-resolver-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-apache-resolver-1.7.1.pom.sha1 b/ant/lib/ant-apache-resolver-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-apache-resolver-1.7.1.pom.sha1
rename to ant/lib/ant-apache-resolver-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-apache-resolver.jar b/ant/lib/ant-apache-resolver.jar
similarity index 100%
rename from installer/ant/lib/ant-apache-resolver.jar
rename to ant/lib/ant-apache-resolver.jar
diff --git a/installer/ant/lib/ant-commons-logging-1.7.1.pom b/ant/lib/ant-commons-logging-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-commons-logging-1.7.1.pom
rename to ant/lib/ant-commons-logging-1.7.1.pom
diff --git a/installer/ant/lib/ant-commons-logging-1.7.1.pom.md5 b/ant/lib/ant-commons-logging-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-commons-logging-1.7.1.pom.md5
rename to ant/lib/ant-commons-logging-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-commons-logging-1.7.1.pom.sha1 b/ant/lib/ant-commons-logging-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-commons-logging-1.7.1.pom.sha1
rename to ant/lib/ant-commons-logging-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-commons-logging.jar b/ant/lib/ant-commons-logging.jar
similarity index 100%
rename from installer/ant/lib/ant-commons-logging.jar
rename to ant/lib/ant-commons-logging.jar
diff --git a/installer/ant/lib/ant-commons-net-1.7.1.pom b/ant/lib/ant-commons-net-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-commons-net-1.7.1.pom
rename to ant/lib/ant-commons-net-1.7.1.pom
diff --git a/installer/ant/lib/ant-commons-net-1.7.1.pom.md5 b/ant/lib/ant-commons-net-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-commons-net-1.7.1.pom.md5
rename to ant/lib/ant-commons-net-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-commons-net-1.7.1.pom.sha1 b/ant/lib/ant-commons-net-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-commons-net-1.7.1.pom.sha1
rename to ant/lib/ant-commons-net-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-commons-net.jar b/ant/lib/ant-commons-net.jar
similarity index 100%
rename from installer/ant/lib/ant-commons-net.jar
rename to ant/lib/ant-commons-net.jar
diff --git a/installer/ant/lib/ant-jai-1.7.1.pom b/ant/lib/ant-jai-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-jai-1.7.1.pom
rename to ant/lib/ant-jai-1.7.1.pom
diff --git a/installer/ant/lib/ant-jai-1.7.1.pom.md5 b/ant/lib/ant-jai-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-jai-1.7.1.pom.md5
rename to ant/lib/ant-jai-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-jai-1.7.1.pom.sha1 b/ant/lib/ant-jai-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-jai-1.7.1.pom.sha1
rename to ant/lib/ant-jai-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-jai.jar b/ant/lib/ant-jai.jar
similarity index 100%
rename from installer/ant/lib/ant-jai.jar
rename to ant/lib/ant-jai.jar
diff --git a/installer/ant/lib/ant-javamail-1.7.1.pom b/ant/lib/ant-javamail-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-javamail-1.7.1.pom
rename to ant/lib/ant-javamail-1.7.1.pom
diff --git a/installer/ant/lib/ant-javamail-1.7.1.pom.md5 b/ant/lib/ant-javamail-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-javamail-1.7.1.pom.md5
rename to ant/lib/ant-javamail-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-javamail-1.7.1.pom.sha1 b/ant/lib/ant-javamail-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-javamail-1.7.1.pom.sha1
rename to ant/lib/ant-javamail-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-javamail.jar b/ant/lib/ant-javamail.jar
similarity index 100%
rename from installer/ant/lib/ant-javamail.jar
rename to ant/lib/ant-javamail.jar
diff --git a/installer/ant/lib/ant-jdepend-1.7.1.pom b/ant/lib/ant-jdepend-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-jdepend-1.7.1.pom
rename to ant/lib/ant-jdepend-1.7.1.pom
diff --git a/installer/ant/lib/ant-jdepend-1.7.1.pom.md5 b/ant/lib/ant-jdepend-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-jdepend-1.7.1.pom.md5
rename to ant/lib/ant-jdepend-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-jdepend-1.7.1.pom.sha1 b/ant/lib/ant-jdepend-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-jdepend-1.7.1.pom.sha1
rename to ant/lib/ant-jdepend-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-jdepend.jar b/ant/lib/ant-jdepend.jar
similarity index 100%
rename from installer/ant/lib/ant-jdepend.jar
rename to ant/lib/ant-jdepend.jar
diff --git a/installer/ant/lib/ant-jmf-1.7.1.pom b/ant/lib/ant-jmf-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-jmf-1.7.1.pom
rename to ant/lib/ant-jmf-1.7.1.pom
diff --git a/installer/ant/lib/ant-jmf-1.7.1.pom.md5 b/ant/lib/ant-jmf-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-jmf-1.7.1.pom.md5
rename to ant/lib/ant-jmf-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-jmf-1.7.1.pom.sha1 b/ant/lib/ant-jmf-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-jmf-1.7.1.pom.sha1
rename to ant/lib/ant-jmf-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-jmf.jar b/ant/lib/ant-jmf.jar
similarity index 100%
rename from installer/ant/lib/ant-jmf.jar
rename to ant/lib/ant-jmf.jar
diff --git a/installer/ant/lib/ant-jsch-1.7.1.pom b/ant/lib/ant-jsch-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-jsch-1.7.1.pom
rename to ant/lib/ant-jsch-1.7.1.pom
diff --git a/installer/ant/lib/ant-jsch-1.7.1.pom.md5 b/ant/lib/ant-jsch-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-jsch-1.7.1.pom.md5
rename to ant/lib/ant-jsch-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-jsch-1.7.1.pom.sha1 b/ant/lib/ant-jsch-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-jsch-1.7.1.pom.sha1
rename to ant/lib/ant-jsch-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-jsch.jar b/ant/lib/ant-jsch.jar
similarity index 100%
rename from installer/ant/lib/ant-jsch.jar
rename to ant/lib/ant-jsch.jar
diff --git a/installer/ant/lib/ant-junit-1.7.1.pom b/ant/lib/ant-junit-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-junit-1.7.1.pom
rename to ant/lib/ant-junit-1.7.1.pom
diff --git a/installer/ant/lib/ant-junit-1.7.1.pom.md5 b/ant/lib/ant-junit-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-junit-1.7.1.pom.md5
rename to ant/lib/ant-junit-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-junit-1.7.1.pom.sha1 b/ant/lib/ant-junit-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-junit-1.7.1.pom.sha1
rename to ant/lib/ant-junit-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-junit.jar b/ant/lib/ant-junit.jar
similarity index 100%
rename from installer/ant/lib/ant-junit.jar
rename to ant/lib/ant-junit.jar
diff --git a/installer/ant/lib/ant-launcher-1.7.1.pom b/ant/lib/ant-launcher-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-launcher-1.7.1.pom
rename to ant/lib/ant-launcher-1.7.1.pom
diff --git a/installer/ant/lib/ant-launcher-1.7.1.pom.md5 b/ant/lib/ant-launcher-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-launcher-1.7.1.pom.md5
rename to ant/lib/ant-launcher-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-launcher-1.7.1.pom.sha1 b/ant/lib/ant-launcher-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-launcher-1.7.1.pom.sha1
rename to ant/lib/ant-launcher-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-launcher.jar b/ant/lib/ant-launcher.jar
similarity index 100%
rename from installer/ant/lib/ant-launcher.jar
rename to ant/lib/ant-launcher.jar
diff --git a/installer/ant/lib/ant-netrexx-1.7.1.pom b/ant/lib/ant-netrexx-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-netrexx-1.7.1.pom
rename to ant/lib/ant-netrexx-1.7.1.pom
diff --git a/installer/ant/lib/ant-netrexx-1.7.1.pom.md5 b/ant/lib/ant-netrexx-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-netrexx-1.7.1.pom.md5
rename to ant/lib/ant-netrexx-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-netrexx-1.7.1.pom.sha1 b/ant/lib/ant-netrexx-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-netrexx-1.7.1.pom.sha1
rename to ant/lib/ant-netrexx-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-netrexx.jar b/ant/lib/ant-netrexx.jar
similarity index 100%
rename from installer/ant/lib/ant-netrexx.jar
rename to ant/lib/ant-netrexx.jar
diff --git a/installer/ant/lib/ant-nodeps-1.7.1.pom b/ant/lib/ant-nodeps-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-nodeps-1.7.1.pom
rename to ant/lib/ant-nodeps-1.7.1.pom
diff --git a/installer/ant/lib/ant-nodeps-1.7.1.pom.md5 b/ant/lib/ant-nodeps-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-nodeps-1.7.1.pom.md5
rename to ant/lib/ant-nodeps-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-nodeps-1.7.1.pom.sha1 b/ant/lib/ant-nodeps-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-nodeps-1.7.1.pom.sha1
rename to ant/lib/ant-nodeps-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-nodeps.jar b/ant/lib/ant-nodeps.jar
similarity index 100%
rename from installer/ant/lib/ant-nodeps.jar
rename to ant/lib/ant-nodeps.jar
diff --git a/installer/ant/lib/ant-parent-1.7.1.pom b/ant/lib/ant-parent-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-parent-1.7.1.pom
rename to ant/lib/ant-parent-1.7.1.pom
diff --git a/installer/ant/lib/ant-parent-1.7.1.pom.md5 b/ant/lib/ant-parent-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-parent-1.7.1.pom.md5
rename to ant/lib/ant-parent-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-parent-1.7.1.pom.sha1 b/ant/lib/ant-parent-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-parent-1.7.1.pom.sha1
rename to ant/lib/ant-parent-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-starteam-1.7.1.pom b/ant/lib/ant-starteam-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-starteam-1.7.1.pom
rename to ant/lib/ant-starteam-1.7.1.pom
diff --git a/installer/ant/lib/ant-starteam-1.7.1.pom.md5 b/ant/lib/ant-starteam-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-starteam-1.7.1.pom.md5
rename to ant/lib/ant-starteam-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-starteam-1.7.1.pom.sha1 b/ant/lib/ant-starteam-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-starteam-1.7.1.pom.sha1
rename to ant/lib/ant-starteam-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-starteam.jar b/ant/lib/ant-starteam.jar
similarity index 100%
rename from installer/ant/lib/ant-starteam.jar
rename to ant/lib/ant-starteam.jar
diff --git a/installer/ant/lib/ant-stylebook-1.7.1.pom b/ant/lib/ant-stylebook-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-stylebook-1.7.1.pom
rename to ant/lib/ant-stylebook-1.7.1.pom
diff --git a/installer/ant/lib/ant-stylebook-1.7.1.pom.md5 b/ant/lib/ant-stylebook-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-stylebook-1.7.1.pom.md5
rename to ant/lib/ant-stylebook-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-stylebook-1.7.1.pom.sha1 b/ant/lib/ant-stylebook-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-stylebook-1.7.1.pom.sha1
rename to ant/lib/ant-stylebook-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-stylebook.jar b/ant/lib/ant-stylebook.jar
similarity index 100%
rename from installer/ant/lib/ant-stylebook.jar
rename to ant/lib/ant-stylebook.jar
diff --git a/installer/ant/lib/ant-swing-1.7.1.pom b/ant/lib/ant-swing-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-swing-1.7.1.pom
rename to ant/lib/ant-swing-1.7.1.pom
diff --git a/installer/ant/lib/ant-swing-1.7.1.pom.md5 b/ant/lib/ant-swing-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-swing-1.7.1.pom.md5
rename to ant/lib/ant-swing-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-swing-1.7.1.pom.sha1 b/ant/lib/ant-swing-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-swing-1.7.1.pom.sha1
rename to ant/lib/ant-swing-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-swing.jar b/ant/lib/ant-swing.jar
similarity index 100%
rename from installer/ant/lib/ant-swing.jar
rename to ant/lib/ant-swing.jar
diff --git a/installer/ant/lib/ant-testutil-1.7.1.pom b/ant/lib/ant-testutil-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-testutil-1.7.1.pom
rename to ant/lib/ant-testutil-1.7.1.pom
diff --git a/installer/ant/lib/ant-testutil-1.7.1.pom.md5 b/ant/lib/ant-testutil-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-testutil-1.7.1.pom.md5
rename to ant/lib/ant-testutil-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-testutil-1.7.1.pom.sha1 b/ant/lib/ant-testutil-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-testutil-1.7.1.pom.sha1
rename to ant/lib/ant-testutil-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-testutil.jar b/ant/lib/ant-testutil.jar
similarity index 100%
rename from installer/ant/lib/ant-testutil.jar
rename to ant/lib/ant-testutil.jar
diff --git a/installer/ant/lib/ant-trax-1.7.1.pom b/ant/lib/ant-trax-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-trax-1.7.1.pom
rename to ant/lib/ant-trax-1.7.1.pom
diff --git a/installer/ant/lib/ant-trax-1.7.1.pom.md5 b/ant/lib/ant-trax-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-trax-1.7.1.pom.md5
rename to ant/lib/ant-trax-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-trax-1.7.1.pom.sha1 b/ant/lib/ant-trax-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-trax-1.7.1.pom.sha1
rename to ant/lib/ant-trax-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-trax.jar b/ant/lib/ant-trax.jar
similarity index 100%
rename from installer/ant/lib/ant-trax.jar
rename to ant/lib/ant-trax.jar
diff --git a/installer/ant/lib/ant-weblogic-1.7.1.pom b/ant/lib/ant-weblogic-1.7.1.pom
similarity index 100%
rename from installer/ant/lib/ant-weblogic-1.7.1.pom
rename to ant/lib/ant-weblogic-1.7.1.pom
diff --git a/installer/ant/lib/ant-weblogic-1.7.1.pom.md5 b/ant/lib/ant-weblogic-1.7.1.pom.md5
similarity index 100%
rename from installer/ant/lib/ant-weblogic-1.7.1.pom.md5
rename to ant/lib/ant-weblogic-1.7.1.pom.md5
diff --git a/installer/ant/lib/ant-weblogic-1.7.1.pom.sha1 b/ant/lib/ant-weblogic-1.7.1.pom.sha1
similarity index 100%
rename from installer/ant/lib/ant-weblogic-1.7.1.pom.sha1
rename to ant/lib/ant-weblogic-1.7.1.pom.sha1
diff --git a/installer/ant/lib/ant-weblogic.jar b/ant/lib/ant-weblogic.jar
similarity index 100%
rename from installer/ant/lib/ant-weblogic.jar
rename to ant/lib/ant-weblogic.jar
diff --git a/installer/ant/lib/ant.jar b/ant/lib/ant.jar
similarity index 100%
rename from installer/ant/lib/ant.jar
rename to ant/lib/ant.jar
diff --git a/installer/ant/lib/libraries.properties b/ant/lib/libraries.properties
similarity index 100%
rename from installer/ant/lib/libraries.properties
rename to ant/lib/libraries.properties
diff --git a/installer/ant/lib/xercesImpl.jar b/ant/lib/xercesImpl.jar
similarity index 100%
rename from installer/ant/lib/xercesImpl.jar
rename to ant/lib/xercesImpl.jar
diff --git a/installer/ant/lib/xml-apis.jar b/ant/lib/xml-apis.jar
similarity index 100%
rename from installer/ant/lib/xml-apis.jar
rename to ant/lib/xml-apis.jar
diff --git a/installer/install.xml b/installer/install.xml
index 350a65a..ccc54f5 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -34,9 +34,9 @@
 		
 		<!-- 画面上に画像とタイトルを表示する -->
 		<modifier key="useHeadingPanel" value="yes"/>
-		<modifier key="headingImageOnRight" value="yes"/>
-		<modifier key="headingLineCount" value="2"/>
-		<modifier key="headingFontSize" value="1.3"/>
+		<modifier key="headingImageOnRight" value="yes"/>
+		<modifier key="headingLineCount" value="2"/>
+		<modifier key="headingFontSize" value="1.3"/>
 		<modifier key="headingBackgroundColor" value="0x00ffffff"/>
 		
 		<!-- 画面下に進捗画面(現在何画面目か)を表示する -->
@@ -147,80 +147,86 @@
 	</conditions>
 
 	<packs>
-		<pack name="apache" required="yes">
-			<description>apache</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
-				<include name="apache/**/*" />
-			</fileset>
-		</pack>
-		<pack name="config" required="yes">
-			<description>config</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
-				<include name="config/**/*" />
-			</fileset>
-		</pack>
-		<pack name="hudson" required="yes">
-			<description>Hudson module</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
-				<include name="hudson/**/*" />
-			</fileset>
-		</pack>
-		<pack name="imagemagick" required="yes">
-			<description>imagemagick</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
-				<include name="imagemagick/**/*" />
-			</fileset>
-		</pack>
-		<!-- 外部LDAPを設定するを選んだときはOpenDSをインストールしない -->
-		<pack name="opends" required="yes" condition="useInstalledLdap">
-			<description>opends</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
-				<include name="opends/**/*" />
-			</fileset>
-		</pack>
-		<pack name="redmine" required="yes">
-			<description>redmine</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
-				<include name="redmine/**/*" />
-			</fileset>
-		</pack>
-		<pack name="ruby" required="yes">
-			<description>ruby</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
-				<include name="ruby/**/*" />
-			</fileset>
-		</pack>
-		<pack name="sqlite" required="yes">
-			<description>sqlite</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
-				<include name="sqlite/**/*" />
-			</fileset>
-		</pack>
-		<pack name="subversion" required="yes">
-			<description>subversion</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
-				<include name="subversion/**/*" />
-			</fileset>
-		</pack>
-		<pack name="template" required="yes">
-			<description>template</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
-				<include name="template/**/*" />
-			</fileset>
-		</pack>
-		<pack name="document" required="yes">
-			<description>document files.</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
-				<include name="installer/copy/readme.txt" />
-				<include name="installer/copy/license.txt" />
-			</fileset>
-		</pack>
-		<pack name="script" required="yes">
-			<description>script</description>
-			<fileset dir="" targetdir="$INSTALL_PATH">
+		<pack name="ant" required="yes">
+			<description>ant</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="ant/**/*" />
+			</fileset>
+		</pack>
+		<pack name="apache" required="yes">
+			<description>apache</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="apache/**/*" />
+			</fileset>
+		</pack>
+		<pack name="config" required="yes">
+			<description>config</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="config/**/*" />
+			</fileset>
+		</pack>
+		<pack name="hudson" required="yes">
+			<description>Hudson module</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="hudson/**/*" />
+			</fileset>
+		</pack>
+		<pack name="imagemagick" required="yes">
+			<description>imagemagick</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="imagemagick/**/*" />
+			</fileset>
+		</pack>
+		<!-- 外部LDAPを設定するを選んだときはOpenDSをインストールしない -->
+		<pack name="opends" required="yes" condition="useInstalledLdap">
+			<description>opends</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="opends/**/*" />
+			</fileset>
+		</pack>
+		<pack name="redmine" required="yes">
+			<description>redmine</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="redmine/**/*" />
+			</fileset>
+		</pack>
+		<pack name="ruby" required="yes">
+			<description>ruby</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="ruby/**/*" />
+			</fileset>
+		</pack>
+		<pack name="sqlite" required="yes">
+			<description>sqlite</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="sqlite/**/*" />
+			</fileset>
+		</pack>
+		<pack name="subversion" required="yes">
+			<description>subversion</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="subversion/**/*" />
+			</fileset>
+		</pack>
+		<pack name="template" required="yes">
+			<description>template</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="template/**/*" />
+			</fileset>
+		</pack>
+		<pack name="document" required="yes">
+			<description>document files.</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
+				<include name="installer/copy/readme.txt" />
+				<include name="installer/copy/license.txt" />
+			</fileset>
+		</pack>
+		<pack name="script" required="yes">
+			<description>script</description>
+			<fileset dir="" targetdir="$INSTALL_PATH">
 				<include name="script/**/*" />
-				<include name="LICENSE.txt" />
-			</fileset>
+				<include name="LICENSE.txt" />
+			</fileset>
 		</pack>
 	</packs>
 
diff --git a/script/setenv.bat b/script/setenv.bat
index 0fbfc76..da4f28f 100644
--- a/script/setenv.bat
+++ b/script/setenv.bat
@@ -1,6 +1,6 @@
 @echo off
 set PACKAGE_HOME=%~dp0..\
-set ANT_HOME=%PACKAGE_HOME%installer\ant
+set ANT_HOME=%PACKAGE_HOME%ant
 set PATH=%PACKAGE_HOME%apache\bin;%PACKAGE_HOME%ruby\bin;%PACKAGE_HOME%sqlite;%PACKAGE_HOME%subversion\bin;%PACKAGE_HOME%imagemagick;%PACKAGE_HOME%opends\bat;%ANT_HOME%\bin;%PATH%
 set APR_ICONV_PATH=%PACKAGE_HOME%apache\bin\iconv
 
-- 
2.11.0