Merge branch 'release/2.2'

.gitignore

@@ -0,0 +1,128 @@
+# Gradle task artifacts & build results
+.gradle/*
+/build/
+target/
+*.iml
+
+# JAR files retrieved during the build process
+src/main/lib/*.jar
+
+# Generated resources
+src/main/build.xml
+src/main/catalog-dita.xml
+src/main/doc
+src/main/lib/org.dita.dost.platform/plugin.properties
+src/main/plugins/org.dita.base/build.xml
+src/main/plugins/org.dita.base/build_preprocess.xml
+src/main/plugins/org.dita.base/catalog-dita.xml
+src/main/plugins/org.dita.docbook/xsl/dita2docbook.xsl
+src/main/plugins/org.dita.eclipsecontent/xsl/dita2dynamicdita.xsl
+src/main/plugins/org.dita.eclipsehelp/build_dita2eclipsehelp.xml
+src/main/plugins/org.dita.eclipsehelp/xsl/map2eclipse.xsl
+src/main/plugins/org.dita.eclipsehelp/xsl/map2plugin.xsl
+src/main/plugins/org.dita.html5/.sass-cache
+src/main/plugins/org.dita.html5/build_dita2html5.xml
+src/main/plugins/org.dita.html5/css/commonltr.css
+src/main/plugins/org.dita.html5/css/commonrtl.css
+src/main/plugins/org.dita.htmlhelp/xsl/map2hhc.xsl
+src/main/plugins/org.dita.htmlhelp/xsl/map2hhp.xsl
+src/main/plugins/org.dita.odt/xsl/dita2odt.xsl
+src/main/plugins/org.dita.pdf2.axf/build/
+src/main/plugins/org.dita.pdf2.axf/lib/axf.jar
+src/main/plugins/org.dita.pdf2.axf/xsl/fo/topic2fo_shell_axf.xsl
+src/main/plugins/org.dita.pdf2.fop/.gradle/
+src/main/plugins/org.dita.pdf2.fop/xsl/fo/topic2fo_shell_fop.xsl
+src/main/plugins/org.dita.pdf2.xep/build/
+src/main/plugins/org.dita.pdf2.xep/lib/
+src/main/plugins/org.dita.pdf2.xep/lib/
+src/main/plugins/org.dita.pdf2.xep/xsl/fo/topic2fo_shell_xep.xsl
+src/main/plugins/org.dita.pdf2/**/*.class
+src/main/plugins/org.dita.pdf2/.gradle/
+src/main/plugins/org.dita.pdf2/build.xml
+src/main/plugins/org.dita.pdf2/build/
+src/main/plugins/org.dita.pdf2/cfg/catalog.xml
+src/main/plugins/org.dita.pdf2/lib/fo.jar
+src/main/plugins/org.dita.pdf2/xsl/common/topicmerge.xsl
+src/main/plugins/org.dita.pdf2/xsl/fo/flagging-preprocess.xsl
+src/main/plugins/org.dita.pdf2/xsl/fo/i18n-postprocess.xsl
+src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo_shell.xsl
+src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo_shell_axf.xsl
+src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo_shell_fop.xsl
+src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo_shell_xep.xsl
+src/main/plugins/org.dita.troff/xsl/dita2troff-ast-shell.xsl
+src/main/plugins/org.dita.troff/xsl/dita2troff-step2-shell.xsl
+src/main/plugins/org.dita.wordrtf/xsl/dita2rtf.xsl
+src/main/plugins/org.dita.xhtml/build_dita2xhtml.xml
+src/main/plugins/org.dita.xhtml/build_general.xml
+src/main/plugins/org.dita.xhtml/xsl/dita2html-base.xsl
+src/main/plugins/org.dita.xhtml/xsl/map2html-coverImpl.xsl
+src/main/plugins/org.dita.xhtml/xsl/map2htmltoc.xsl
+src/main/resources/env.bat
+src/main/resources/env.sh
+src/main/resources/messages.xml
+src/main/resources/plugins.xml
+src/main/xsl/common/allstrings.xml
+src/main/xsl/common/strings.xml
+src/main/xsl/preprocess/conref.xsl
+src/main/xsl/preprocess/flag.xsl
+src/main/xsl/preprocess/maplink.xsl
+src/main/xsl/preprocess/mappull.xsl
+src/main/xsl/preprocess/mapref.xsl
+src/main/xsl/preprocess/topicpull.xsl
+
+
+# OS-specific entries below
+
+### Linux ###
+*~
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### Windows ###
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows shortcuts
+*.lnk
+
+

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "src/test/testsuite"]
 	path = src/test/testsuite
 	url = git://github.com/dita-ot/testsuite.git
-[submodule "src/main/ext-plugins"]
-	path = src/main/ext-plugins
-	url = git://github.com/dita-ot/ext-plugins.git
 [submodule "src/main/docsrc"]
 	path = src/main/docsrc
 	url = git://github.com/dita-ot/docs.git

.travis.yml

@@ -1,16 +1,14 @@
+sudo: false
 language: java
 jdk:
-- oraclejdk7
+  - oraclejdk7
 before_script:
-- git submodule update --init --recursive
-- ant init-ivy
-- ant jar
-- ant -f src/main/integrator.xml strict
-script: ant test integration-test
-env: CLASSPATH=src/test/lib:src/test/resources:src/main/lib/dost.jar:src/main/lib/dost-configuration.jar:src/main:src/main/lib:src/main/resources:src/main/lib/commons-io.jar:src/main/lib/commons-codec.jar:src/main/lib/xml-resolver.jar:src/main/lib/icu4j.jar:src/main/lib/xercesImpl.jar:src/main/lib/xml-apis.jar:src/main/lib/saxon.jar:src/main/lib/saxon-dom.jar
+  - git submodule update --init --recursive
+script:
+  - ./gradlew check integrationTest --info --stacktrace
 branches:
   only:
-  - /^(develop|hotfix\/.*)$/
+  - /^(develop|hotfix\/.*|feature\/.*|release\/.*)$/
 notifications:
   slack:
     secure: IAA4d9O2Dw1hkpY9cwxJz++VMjkgbV3EuaS09DGFujvHl2eQtpKTloE0/CDF+NZA4tcbH1dNqsGw3ETLmrqA581CLpmiiq3LG02cDMoSXZeOKB/9vo6tvLFg0UMawzo+FomJS/hvCmS5KirrFqZQKE5g6SCC05UBM5nwI5d0vOw=

README.markdown

@@ -1,18 +1,14 @@
 DITA Open Toolkit [![Build Status](https://secure.travis-ci.org/dita-ot/dita-ot.png?branch=develop)](http://travis-ci.org/dita-ot/dita-ot)
 =================
 
-The DITA Open Toolkit, or DITA-OT for short, is an open-source tool that provides processing for OASIS DITA content. See [dita-ot.org](http://www.dita-ot.org/) for documentation, information about releases, and download packages.
+The _DITA Open Toolkit_, or _DITA-OT_ for short, is an open-source tool that provides processing for OASIS DITA content. See [dita-ot.org](http://www.dita-ot.org/) for documentation, information about releases, and download packages.
 
 Prerequisites
 -------------
 
 To build and use DITA-OT, you’ll need:
 
 * Java Development Kit 7 or newer
-* Apache Ant 1.9.4 or newer
-* Apache Ivy 2.3.0 or newer
-
-If Ant throws an error like `unknown protocol: plugin` or `unknown protocol: cfg`, your Ant installation may be outdated. Try installing [a newer version of Ant](http://ant.apache.org/).
 
 Building
 --------
@@ -21,13 +17,17 @@ Building
 
         git clone git://github.com/dita-ot/dita-ot.git
 
-2. Fetch the submodules:
+2. Move to the DITA-OT directory:
+
+        cd dita-ot
+
+3. Fetch the submodules:
 
         git submodule update --init --recursive
 
-3. In the root directory, run `ant` to compile the Java code and install plugins:
+4. In the root directory, run Gradle to compile the Java code and install plugins:
 
-        ant
+        ./gradlew
 
 Usage
 -----
@@ -36,35 +36,22 @@ Usage
 
         src/main/bin/dita [options]
         
-   See the [documentation](http://www.dita-ot.org/2.0/) for arguments and [options](http://www.dita-ot.org/2.0/readme/using-dita-command.html).
+   See the [documentation](http://www.dita-ot.org/2.1/) for arguments and [options](http://www.dita-ot.org/2.1/getting-started/using-dita-command.html).
 
 Distribution
 ------------
 
-1. In the root directory, run `ant` to compile the Java code and install plugins:
-
-        ant
-     
-2. Add these files and directories to the `CLASSPATH` environment variable:
-   * `src/main/`
-   * `src/main/lib/dost.jar`
-   * `src/main/lib/dost-configuration.jar`
-   * `src/main/lib/xercesImpl.jar`
-   * `src/main/lib/xml-apis.jar`
-   * `src/main/lib/commons-codec.jar`
-   * `src/main/lib/commons-io.jar`
-   * `src/main/lib/saxon-dom.jar`
-   * `src/main/lib/saxon.jar`
-   * `src/main/lib/xml-resolver.jar`
-   * `src/main/lib/icu4j.jar`
-
-3. Build distribution packages:
-
-        ant dist
+1. In the root directory, set up build environment:
+
+        ./gradlew
+
+2. Build distribution packages:
+
+        ./gradlew dist
 
-   Distribution packages are built in the `target` directory.
+   Distribution packages are built in the `build/distributions` directory.
 
-   If Ant throws an error like `java.lang.OutOfMemoryError: Java heap space`, you probably need to increase the maximum Java heap size. One way to do this is to set the `ANT_OPTS` environment variable to a value like `-Xmx1024m`.
+   If Gradle throws an error like `java.lang.OutOfMemoryError: Java heap space`, you probably need to increase the maximum Java heap size. One way to do this is to set the `GRADLE_OPTS` environment variable to a value like `-Xmx1024m`.
 
    For more information on the `-Xmx` option, see [Java SE Documentation](http://docs.oracle.com/javase/6/docs/technotes/tools/windows/java.html#nonstandard).