You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by le...@apache.org on 2017/02/27 17:57:01 UTC

any23 git commit: Updates to all Website documentation to reflect 2.0 release

Repository: any23
Updated Branches:
  refs/heads/master bc46c7289 -> d67bdff9a


Updates to all Website documentation to reflect 2.0 release


Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/d67bdff9
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/d67bdff9
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/d67bdff9

Branch: refs/heads/master
Commit: d67bdff9a477bac5aa4c38ec2c4c8d63d0da179a
Parents: bc46c72
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Mon Feb 27 09:56:56 2017 -0800
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Mon Feb 27 09:56:56 2017 -0800

----------------------------------------------------------------------
 src/site/apt/build-src.apt           |  22 +--
 src/site/apt/configuration.apt       |  16 +--
 src/site/apt/dev-data-conversion.apt |   2 +-
 src/site/apt/getting-started.apt     | 214 +++++++++++++++++-------------
 src/site/apt/index.apt               |   9 +-
 src/site/apt/install.apt             |   2 +-
 src/site/apt/supported-formats.apt   |   2 +
 src/site/xdoc/download.xml.vm        | 130 +++++++++---------
 8 files changed, 218 insertions(+), 179 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/any23/blob/d67bdff9/src/site/apt/build-src.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/build-src.apt b/src/site/apt/build-src.apt
index 1ed366d..4a38fa5 100644
--- a/src/site/apt/build-src.apt
+++ b/src/site/apt/build-src.apt
@@ -26,37 +26,37 @@ Build Apache Any23 from sources
  
 * Access a Snapshot Version
 
-    For the latest snapshot please checkout the code from the SVN code repository and build the library.
-    Checkout the code from SVN:
+    For the latest snapshot please checkout the code from the public Git repository and build the library.
+    Checkout the code from Github:
 
 +---------------------------------------------------------------------------
-$ svn checkout http://svn.apache.org/repos/asf/any23/trunk apache-any23-trunk-readonly
+$ git clone https://github.com/apache/any23.git
 +---------------------------------------------------------------------------
 
 * Build <<Apache Any23>>
 
-    The following instructions describe how to build the library with {{{http://maven.apache.org/}Maven 2.x.y+}}.
+    The following instructions describe how to build the library with {{{http://maven.apache.org/}Maven 3.x.y+}}.
     For specific information about Maven see: {{{http://maven.apache.org/}}}
-    Go to the trunk folder:
+    Go to the any23 folder:
 
 +-----------
-$ cd trunk/
+$ cd any23/
 +-----------
 
     and execute the following command:
 
 +-----------
-trunk$ mvn clean install
+any23$ mvn clean install
 +-----------
 
     This will install the <<Apache Any23>> artifact and its dependencies in your local M2 repository.
 
 * Generate Documentation
 
-    To generate the project site locally execute the following command from the trunk dir:
+    To generate the project site locally execute the following command from the any23 dir:
 
 +---------------------------------------------------------------------------
-trunk$ MAVEN_OPTS='-Xmx1024m' mvn clean site
+any23$ MAVEN_OPTS='-Xmx1024m' mvn clean site
 +---------------------------------------------------------------------------
 
     You can speed up the site generation process specifying the offline option ( -o ),
@@ -64,7 +64,7 @@ trunk$ MAVEN_OPTS='-Xmx1024m' mvn clean site
     in the local M2 repository:
 
 +---------------------------------------------------------------------------
-trunk$ MAVEN_OPTS='-Xmx1024m' mvn -o clean site
+any23$ MAVEN_OPTS='-Xmx1024m' mvn -o clean site
 +---------------------------------------------------------------------------
 
     If you're interested in generating the Javadoc enriched with navigable UML graphs, you can activate
@@ -72,5 +72,5 @@ trunk$ MAVEN_OPTS='-Xmx1024m' mvn -o clean site
     installed in your system.
 
 +---------------------------------------------------------------------------
-trunk$ MAVEN_OPTS='-Xmx256m' mvn -P umlgraphdoc clean site
+any23$ MAVEN_OPTS='-Xmx256m' mvn -P umlgraphdoc clean site
 +---------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/any23/blob/d67bdff9/src/site/apt/configuration.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/configuration.apt b/src/site/apt/configuration.apt
index 63ff1fd..9d5773e 100644
--- a/src/site/apt/configuration.apt
+++ b/src/site/apt/configuration.apt
@@ -27,8 +27,8 @@ Configuration
     The core module contains the main library code and the command-line implementation.
 
     The main library configuration parameters are managed by the
-    {{{./xref/org/apache/any23/configuration/DefaultConfiguration.html} Configuration}}
-    class. The default values are declared within the {{{http://any23.googlecode.com/svn/trunk/any23-core/src/main/resources/default-configuration.properties} default-configuration.properties}}
+    {{{http://any23.apache.org/apidocs/index.html?org/apache/any23/configuration/DefaultConfiguration.html} Configuration}}
+    class. The default values are declared within the {{{https://github.com/apache/any23/blob/master/api/src/main/resources/default-configuration.properties} default-configuration.properties}}
     file. The following sections explain how to override the default configuration.
 
 ** Override Default Configuration from Command-line
@@ -43,16 +43,16 @@ Configuration
 -Dany23.http.client.max.connections=10
 +----------------------------------------------------------------------------------------------
 
-    any23, any23tools and any23server scripts accept the variable <<ANY23_OPTS>> to specify custom options.
+    any23 and any23server scripts accept the variable <<ANY23_OPTS>> to specify custom options.
     It is possible to customize the <<HTTP Max Client Connections>> for the <<any23>> script simply using:
 
 +----------------------------------------------------------------------------------------------
-any23-core/bin/$ ANY23_OPTS="-Dany23.http.client.max.connections=10" any23 http://path/to/resource
+cli/target/appassembler/bin/$ ANY23_OPTS="-Dany23.http.client.max.connections=10" any23 http://path/to/resource
 +----------------------------------------------------------------------------------------------
 
 ** Override Default Configuration Programmatically
 
-    The {{{./xref/org/apache/any23/configuration/Configuration.html} Configuration}}
+    The {{{http://any23.apache.org/apidocs/index.html?org/apache/any23/configuration/Configuration.html} Configuration}}
     properties can be accessed in read-only mode just retrieving the configuration <<singleton>> instance.\
     Such instance is <immutable>:
 
@@ -62,7 +62,7 @@ final String propertyValue = immutableConf.getProperty("propertyName", "default
 ...
 +----------------------------------------------------------------------------------------------
 
-    To obtain a <modifiable> {{{./xref/org/apache/any23/configuration/Configuration.html} Configuration}}
+    To obtain a <modifiable> {{{http://any23.apache.org/apidocs/index.html?org/apache/any23/configuration/Configuration.html} Configuration}}
     instead it is possible to use the <<copy()>> method.\
     One of the <<Apache Any23>> constructors accepts a <<Configuration>> object that allows to customize the behavior
     of the <<Apache Any23>> instance for its entire life-cycle.
@@ -77,13 +77,13 @@ final Apache Any23 any23 = new Apache Any23(modifiableConf, "extractor1", ...);
 * Use of ExtractionParameters
 
     It is possible to customize the behavior of a single data extraction by providing an
-    {{{./xref/org/apache/any23/extractor/ExtractionParameters.html} ExtractionParameters}}
+    {{{http://any23.apache.org/apidocs/index.html?org/apache/any23/extractor/ExtractionParameters.html} ExtractionParameters}}
     instance to one the <Apache Any23#extract()> methods accepting it. <<ExtractionParameters>> allows to customize any <property> and <flag>
     other then the <<specific extraction options>>.\
     If no custom parameters are specified the default configuration values are used.
 
 +----------------------------------------------------------------------------------------------
-final Apache Any23 any23 = ...
+final Any23 any23 = ...
 final TripleHandler tripleHandler = ...
 final ExtractionParameters extractionParameters = ExtractionParameters.getDefault();
 extractionParameters.setFlag("any23.microdata.strict", true);

http://git-wip-us.apache.org/repos/asf/any23/blob/d67bdff9/src/site/apt/dev-data-conversion.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/dev-data-conversion.apt b/src/site/apt/dev-data-conversion.apt
index 319eadd..f2b8723 100644
--- a/src/site/apt/dev-data-conversion.apt
+++ b/src/site/apt/dev-data-conversion.apt
@@ -23,7 +23,7 @@
 Data Conversion
 
 +----------------------------------------------------------------------------------------------
-/*1*/ Apache Any23 runner = new Apache Any23();
+/*1*/ Any23 runner = new Any23();
 /*2*/ final String content = "@prefix foo: <http://example.org/ns#> .   " +
                              "@prefix : <http://other.example.org/ns#> ." +
                              "foo:bar foo: : .                          " +

http://git-wip-us.apache.org/repos/asf/any23/blob/d67bdff9/src/site/apt/getting-started.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/getting-started.apt b/src/site/apt/getting-started.apt
index 5f60b93..d0ffbaf 100644
--- a/src/site/apt/getting-started.apt
+++ b/src/site/apt/getting-started.apt
@@ -25,25 +25,37 @@ Getting started with <<Apache Any23>>
     <<Apache Any23>> can be used:
 
       * via CLI (command line interface) from your preferred shell environment;
+
       * as a RESTful Webservice;
+
       * as a library.
 
 * <<Apache Any23>> Modules
 
     <<Apache Any23>> is composed of the following modules:
 
-      * <<<any23-core/>>>      The core library.
+      * <<<api/>>>      The base API definitions e.g. The Any23 API.
+
+      * <<<core/>>>      The core library containing all extractor functionality.
+
+      * <<<cli/>>>       A command line interface enabling easy invocation of Any23 tools.
+
+      * <<<csvutils/>>>       Utility code for CSV extractions.
+
+      * <<<encoding/>>>       Characterset detection and encoding.
+
+      * <<<mime/>>>       Media-type detection.
 
-      * <<<any23-service/>>>   The REST service.
+      * <<<service/>>>   The REST service.
 
-      * <<<any23-plugins/>>>   The core additional plugins.
+      * <<<plugins/>>>   The core additional plugins.
 
 * Use the <<Apache Any23>> CLI
 
-   The command-line tools support is provided by the <<any23-core>> module.
+   The command-line tools support is provided by the <<cli>> module.
 
    Once <<Apache Any23>> has been correctly {{{./install.html}installed}}, if you want to use it as a command line tool,
-   use the shell script within the <<<any23-core/bin>>> directory.
+   use the shell script within the <<<cli/target/appassembler/bin/>>> directory.
    These are provided both for Unix (Linux/OSX) and Windows.
 
    The <<<any23>>> script provides analysis, documentation, testing and debugging utilities.
@@ -51,68 +63,87 @@ Getting started with <<Apache Any23>>
    Simply running <./any23> without options will show the <usage> options.
 
 +-------------------------------------------
-any23-core$ ./bin/any23
+$ cli/target/appassembler/bin/any23
+
 A command must be specified.
 Usage: any23 [options] [command] [command options]
   Options:
-    -h, --help          Display help information.
-                        Default: false
-        --plugins-dir   The Any23 plugins directory.
-                        Default: ~/.any23/plugins
-    -X, --verbose       Produce execution verbose output.
-                        Default: false
-    -v, --version       Display version information.
-                        Default: false
+    -h, --help
+       Display help information.
+       Default: false
+        --plugins-dir
+       The Any23 plugins directory.
+       Default: /Users/lmcgibbn/.any23/plugins
+    -X, --verbose
+       Produce execution verbose output.
+       Default: false
+    -v, --version
+       Display version information.
+       Default: false
   Commands:
     extractor      Utility for obtaining documentation about metadata extractors.
-      Usage: extractor [options] Extractor name      
-  Options:
-          -a, --all     shows a report about all available extractors
-                        Default: false
-          -i, --input   shows example input for the given extractor
-                        Default: false
-          -l, --list    shows the names of all available extractors
-                        Default: false
-          -o, --outut   shows example output for the given extractor
-                        Default: false
+      Usage: extractor [options] Extractor name
+        Options:
+          -a, --all
+             shows a report about all available extractors
+             Default: false
+          -i, --input
+             shows example input for the given extractor
+             Default: false
+          -l, --list
+             shows the names of all available extractors
+             Default: false
+          -o, --outut
+             shows example output for the given extractor
+             Default: false
 
     microdata      Commandline Tool for extracting Microdata from file/HTTP source.
-      Usage: microdata [options] Input document URL, {http://path/to/resource.html|file:/path/to/local.file}
+      Usage: microdata [options] Input document URL, {http://path/to/resource.html|file:/path/to/localFile.html}
+
     mimes      MIME Type Detector Tool.
       Usage: mimes [options] Input document URL, {http://path/to/resource.html|file:///path/to/local.file|inline:// some inline content}
+
     verify      Utility for plugin management verification.
       Usage: verify [options] plugins-dir
+
     rover      Any23 Command Line Tool.
       Usage: rover [options] input IRIs {<url>|<file>}+
-  Options:
-          -d, --defaultns    Override the default namespace used to produce
-                             statements.
-          -e, --extractors   a comma-separated list of extractors, e.g.
-                             rdf-xml,rdf-turtle
-                             Default: []
-          -f, --format       the output format
-                             Default: turtle
-          -l, --log          Produce log within a file.
-          -n, --nesting      Disable production of nesting triples.
-                             Default: false
-          -t, --notrivial    Filter trivial statements (e.g. CSS related ones).
-                             Default: false
-          -o, --output       Specify Output file (defaults to standard output)
-                             Default: java.io.PrintStream@79dfc547
-          -p, --pedantic     Validate and fixes HTML content detecting commons
-                             issues.
-                             Default: false
-          -s, --stats        Print out extraction statistics.
-                             Default: false
+        Options:
+          -d, --defaultns
+             Override the default namespace used to produce statements.
+          -e, --extractors
+             a comma-separated list of extractors, e.g. rdf-xml,rdf-turtle
+             Default: []
+          -f, --format
+             the output format
+             Default: json
+          -l, --log
+             Produce log within a file.
+          -n, --nesting
+             Disable production of nesting triples.
+             Default: false
+          -t, --notrivial
+             Filter trivial statements (e.g. CSS related ones).
+             Default: false
+          -o, --output
+             Specify Output file (defaults to standard output)
+             Default: java.io.PrintStream@5204062d
+          -p, --pedantic
+             Validate and fixes HTML content detecting commons issues.
+             Default: false
+          -s, --stats
+             Print out extraction statistics.
+             Default: false
 
     vocab      Prints out the RDF Schema of the vocabularies used by Any23.
-      Usage: vocab [options]      
-  Options:
-          -f, --format   Vocabulary output format
-                         Default: NQuads
+      Usage: vocab [options]
+        Options:
+          -f, --format
+             Vocabulary output format
+             Default: N-Quads (mimeTypes=application/n-quads, text/x-nquads, text/nquads; ext=nq)
 +-------------------------------------------
 
-   The <<<any23>>> script detects a list of available utilities within the <<any23-core>> and <<plugins>>
+   The <<<any23>>> script detects a list of available utilities within the <<core>> and <<plugins>>
    classpath and allows to activate them.
 
    The <any23-core> CLI tools are:
@@ -140,20 +171,20 @@ Usage: any23 [options] [command] [command options]
   Extract metadata from an <<HTML>> page:
 
 +-----------------------------------------
-any23-core$ ./bin/any23 rover http://yourdomain/yourfile
+cli$ any23 rover http://yourdomain/yourfile
 +-----------------------------------------
 
   Extract metadata from a <<local>> resource:
 
 +--------------------------------------
-any23-core$ ./bin/any23 rover myfoaf.rdf
+cli$ any23 rover myfoaf.rdf
 +--------------------------------------
 
   Specify the output format, use the option <<"-f">> or <<"--format">>:
   (Default output format is <<TURTLE>>).
 
 +--------------------------------------
-any23-core$ ./bin/any23 rover -f quad myfoaf.rdf
+cli$ any23 rover -f quad myfoaf.rdf
 +--------------------------------------
 
   Filtering trivial statements
@@ -164,7 +195,7 @@ any23-core$ ./bin/any23 rover -f quad myfoaf.rdf
     command line argument.
 
 +-------------------------
-any23-core$ ./bin/any23 rover -t -f quad myfoaf.rdf
+core$ any23 rover -t -f quad myfoaf.rdf
 +-------------------------
 
 ** The ExtractorDocumentation tool
@@ -175,30 +206,35 @@ any23-core$ ./bin/any23 rover -t -f quad myfoaf.rdf
    List all the available extractors:
 
 +--------------------------------------
-any23-core/core$ ./bin/any23 extractor --list
-                      csv [class org.apache.any23.extractor.csv.CSVExtractor]
-           html-head-icbm [class org.apache.any23.extractor.html.ICBMExtractor]
-          html-head-links [class org.apache.any23.extractor.html.HeadLinkExtractor]
-          html-head-title [class org.apache.any23.extractor.html.TitleExtractor]
-              html-mf-adr [class org.apache.any23.extractor.html.AdrExtractor]
-              html-mf-geo [class org.apache.any23.extractor.html.GeoExtractor]
-        html-mf-hcalendar [class org.apache.any23.extractor.html.HCalendarExtractor]
-            html-mf-hcard [class org.apache.any23.extractor.html.HCardExtractor]
-         html-mf-hlisting [class org.apache.any23.extractor.html.HListingExtractor]
-          html-mf-hrecipe [class org.apache.any23.extractor.html.HRecipeExtractor]
-          html-mf-hresume [class org.apache.any23.extractor.html.HResumeExtractor]
-          html-mf-hreview [class org.apache.any23.extractor.html.HReviewExtractor]
-          html-mf-license [class org.apache.any23.extractor.html.LicenseExtractor]
-          html-mf-species [class org.apache.any23.extractor.html.SpeciesExtractor]
-              html-mf-xfn [class org.apache.any23.extractor.html.XFNExtractor]
-           html-microdata [class org.apache.any23.extractor.microdata.MicrodataExtractor]
-              html-rdfa11 [class org.apache.any23.extractor.rdfa.RDFa11Extractor]
-       html-script-turtle [class org.apache.any23.extractor.html.TurtleHTMLExtractor]
-                   rdf-nq [class org.apache.any23.extractor.rdf.NQuadsExtractor]
-                   rdf-nt [class org.apache.any23.extractor.rdf.NTriplesExtractor]
-                 rdf-trix [class org.apache.any23.extractor.rdf.TriXExtractor]
-               rdf-turtle [class org.apache.any23.extractor.rdf.TurtleExtractor]
-                  rdf-xml [class org.apache.any23.extractor.rdf.RDFXMLExtractor]
+cli$ any23 extractor --list
+                      csv [org.apache.any23.extractor.csv.CSVExtractorFactory]
+     html-embedded-jsonld [org.apache.any23.extractor.html.EmbeddedJSONLDExtractorFactory]
+           html-head-icbm [org.apache.any23.extractor.html.ICBMExtractorFactory]
+          html-head-links [org.apache.any23.extractor.html.HeadLinkExtractorFactory]
+           html-head-meta [org.apache.any23.extractor.html.HTMLMetaExtractorFactory]
+          html-head-title [org.apache.any23.extractor.html.TitleExtractorFactory]
+              html-mf-adr [org.apache.any23.extractor.html.AdrExtractorFactory]
+              html-mf-geo [org.apache.any23.extractor.html.GeoExtractorFactory]
+        html-mf-hcalendar [org.apache.any23.extractor.html.HCalendarExtractorFactory]
+            html-mf-hcard [org.apache.any23.extractor.html.HCardExtractorFactory]
+         html-mf-hlisting [org.apache.any23.extractor.html.HListingExtractorFactory]
+          html-mf-hrecipe [org.apache.any23.extractor.html.HRecipeExtractorFactory]
+          html-mf-hresume [org.apache.any23.extractor.html.HResumeExtractorFactory]
+          html-mf-hreview [org.apache.any23.extractor.html.HReviewExtractorFactory]
+html-mf-hreview-aggregate [org.apache.any23.extractor.html.HReviewAggregateExtractorFactory]
+          html-mf-license [org.apache.any23.extractor.html.LicenseExtractorFactory]
+          html-mf-species [org.apache.any23.extractor.html.SpeciesExtractorFactory]
+              html-mf-xfn [org.apache.any23.extractor.html.XFNExtractorFactory]
+           html-microdata [org.apache.any23.extractor.microdata.MicrodataExtractorFactory]
+              html-rdfa11 [org.apache.any23.extractor.rdfa.RDFa11ExtractorFactory]
+               html-xpath [org.apache.any23.extractor.xpath.XPathExtractorFactory]
+               rdf-jsonld [org.apache.any23.extractor.rdf.JSONLDExtractorFactory]
+                   rdf-nq [org.apache.any23.extractor.rdf.NQuadsExtractorFactory]
+                   rdf-nt [org.apache.any23.extractor.rdf.NTriplesExtractorFactory]
+                 rdf-trix [org.apache.any23.extractor.rdf.TriXExtractorFactory]
+               rdf-turtle [org.apache.any23.extractor.rdf.TurtleExtractorFactory]
+                  rdf-xml [org.apache.any23.extractor.rdf.RDFXMLExtractorFactory]
+                     yaml [org.apache.any23.extractor.yaml.YAMLExtractorFactory]
 +--------------------------------------
 
 ** The MicrodataParser tool
@@ -208,7 +244,7 @@ any23-core/core$ ./bin/any23 extractor --list
    declared in the Microdata specification section {{{http://www.w3.org/TR/microdata/#json}JSON}}.
 
 +--------------------------------------
-any23-core/core$ ./bin/any23 microdata http://path/to/resource.html
+cli$ any23 microdata http://path/to/resource.html
 +--------------------------------------
 
 
@@ -220,7 +256,7 @@ any23-core/core$ ./bin/any23 microdata http://path/to/resource.html
   Just launch the command below to see all the managed vocabularies.
 
 +--------------------------------------
-any23-core/core$ ./bin/any23 vocab
+cli$ any23 vocab
 +--------------------------------------
 
    <NOTE>: <<This tool is still in beta version.>>
@@ -232,17 +268,17 @@ any23-core/core$ ./bin/any23 vocab
    Examples:
 
 +--------------------------------------
-any23-core$ ./bin/any23 mimes http://www.michelemostarda.com/foaf.rdf
+cli$ any23 mimes http://www.michelemostarda.com/foaf.rdf
 application/rdf+xml
 +--------------------------------------
 
 +--------------------------------------
-any23-core$ ./bin/any23 mimes file://../src/test/resources/application/trix/test1.trx
+cli$ any23 mimes file://../src/test/resources/application/trix/test1.trx
 application/trix
 +--------------------------------------
 
 +--------------------------------------
-any23-core$ ./bin/any23 mimes 'inline://<http://s> <http://p> <http://o> .'
+cli$ any23 mimes 'inline://<http://s> <http://p> <http://o> .'
 text/n3
 +--------------------------------------
 
@@ -253,12 +289,12 @@ text/n3
   Just launch the command below to sanity-check the input plugins directory
 
 +--------------------------------------
-any23-core$ ./bin/any23 verify [/path/to/plugins/dir]
+cli$ any23 verify [/path/to/plugins/dir]
 +--------------------------------------
 
 * <<Apache Any23>> CLI <Plugins>
 
-   The <<Apache Any23>> ToolRunner CLI (<bin/any23tools>) supports the auto detection of Tool plugins within the classpath.
+   The <<Apache Any23>> ToolRunner CLI (<bin/any23>) supports the auto detection of Tool plugins within the classpath.
    For further details see {{{./any23-plugins.html}Plugins}} section.
 
    The default <<any23>> CLI plugins are enlisted below.
@@ -269,7 +305,7 @@ any23-core$ ./bin/any23 verify [/path/to/plugins/dir]
    The <Crawler Plugin> provides basic site crawling and metadata extraction capabilities.
 
 +----------------------------------------------------------------------------
-any23-core$ ./bin/any23 -h
+cli$ any23 -h
 [...]
     crawler      Any23 Crawler Command Line Tool.
       Usage: crawler [options] input IRIs {<url>|<file>}+
@@ -314,7 +350,7 @@ any23-core$ ./bin/any23 -h
     A usage example:
 
 +----------------------------------------------------------------------------
-any23-core$ ./bin/any23 crawler -s -f ntriples http://www.repubblica.it 1> out.nt 2> repubblica.log
+cli$ any23 crawler -s -f ntriples http://www.repubblica.it 1> out.nt 2> repubblica.log
 +----------------------------------------------------------------------------
 
 * Use <<Apache Any23>> as a RESTful Web Service
@@ -324,11 +360,11 @@ any23-core$ ./bin/any23 crawler -s -f ntriples http://www.repubblica.it 1> out.n
 
    Running the server
 
-    The server command line tool is defined within the <<any23-service>> module.
+    The server command line tool is defined within the <<service>> module.
     Run the <<<any23server>>> script
 
 +--------------------------
-any23-service$ ./bin/any23server
+service$ ./bin/any23server
 +--------------------------
 
     from the command line in order to start up the server, then go to {{{http://localhost:8080/}}}

http://git-wip-us.apache.org/repos/asf/any23/blob/d67bdff9/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index d257416..8068ec7 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -32,7 +32,7 @@ Introduction to Apache Any23
 
      * {{{http://microformats.org/}Microformats1}} and {{{http://microformats.org/wiki/microformats-2}Microformats2}}: hAdr, hCard, hCalendar, hEntry, hEvent, hGeo, hItem, hListing, hProduct, hProduct, hRecipie, hResume, hReview, License, Species, XFN, etc
 
-      * {{{http://json-ld.org/}JSON-LD}}: JSON for Linking Data. a lightweight Linked Data format based on the already successful JSON format and provides a way to help JSON data interoperate at Web-scale.
+     * {{{http://json-ld.org/}JSON-LD}}: JSON for Linking Data. a lightweight Linked Data format based on the already successful JSON format and provides a way to help JSON data interoperate at Web-scale.
 
      * {{{http://dev.w3.org/html5/md/}HTML5 Microdata}}: (such as {{{http://schema.org}Schema.org}})
 
@@ -40,11 +40,12 @@ Introduction to Apache Any23
 
      * Vocabularies: Extraction support for {{{http://dublincore.org/}Dublin Core Terms}}, {{{http://www.w3.org/wiki/DescriptionOfACareerVocabulary}Description of a Career}}, {{{https://github.com/edumbill/doap/wiki}Description Of A Project}}, {{{http://xmlns.com/foaf/spec/}Friend Of A Friend}}, {{{http://www.geonames.org/ontology/}GEO Names}}, {{{http://www.w3.org/2002/12/cal/icaltzd#}ICAL}}, {{{https://github.com/RinkeHoekstra/lkif-core}lkif-core}}, {{{http://ogp.me/}Open Graph Protocol}}, {{{http://purl.org/ontology/po/}BBC Programmes Ontology}}, {{{http://vocab.org/review/terms.html}RDF Review Vocabulary}}, {{{http://schema.org/}schema.org}}, {{{http://www.w3.org/2006/vcard/ns}VCard}}, {{{http://purl.org/ontology/wo/}BBC Wildlife Ontology}} and {{{http://www.w3.org/1999/xhtml/vocab/}XHTML}}... and more!
 
+     * {{{http://www.yaml.org/}YAML}}: human friendly data serialization standard for all programming languages.
 
 
     A detailed description of available extractors is {{{./extractors.html}here}}.
 
-    <<Apache Any23>> is used in major Web of Data applications such as {{{http://sindice.com/}sindice.com}} and {{{http://sig.ma/}sig.ma}}. It is written in Java and licensed under the {{{http://any23.googlecode.com/svn/trunk/LICENSE.txt}Apache License}}.
+    <<Apache Any23>> is written in Java and licensed under the {{{https://www.apache.org/licenses/LICENSE-2.0}Apache License v2.0}}.
     <<Apache Any23>> can be used in various ways:
      * As a library in Java applications that consume structured data from the Web.
      * As a command-line tool for extracting and converting between the supported formats.
@@ -75,6 +76,6 @@ Introduction to Apache Any23
 
 * Community
 
-    Questions, comments? Get in touch on the {{{http://any23-dev@apache.org}mailing list}}!
+    Questions, comments? Get in touch on the {{{./mail-lists.html}mailing lists}}!
     Bugs, feature requests, patches? Please submit to the {{{https://issues.apache.org/jira/browse/ANY23}issue tracker}}.
-    You can access the source through Subversion, see the {{{./install.html}Installation Guide}} for details.
+    You can access the source through Git, see the {{{./install.html}Installation Guide}} for details.

http://git-wip-us.apache.org/repos/asf/any23/blob/d67bdff9/src/site/apt/install.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/install.apt b/src/site/apt/install.apt
index 8e64173..4551935 100644
--- a/src/site/apt/install.apt
+++ b/src/site/apt/install.apt
@@ -27,7 +27,7 @@ Apache Any23 Installation Guide
 * Download a Stable Distribution
 
     Most users probably don't need to have day to day access to the source code as it changes.
-    For these users we provide distribution packages via our {{{./downloads.html}
+    For these users we provide distribution packages via our {{{./download.html}
     downloads page}}. Download either the <<".zip">> or <<".tar.gz">> file and extract the archive.
  
 Installing the Core

http://git-wip-us.apache.org/repos/asf/any23/blob/d67bdff9/src/site/apt/supported-formats.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/supported-formats.apt b/src/site/apt/supported-formats.apt
index 5146c7c..0f6ea22 100644
--- a/src/site/apt/supported-formats.apt
+++ b/src/site/apt/supported-formats.apt
@@ -44,6 +44,8 @@ Supported Formats in Apache Any23
 
    * <<CSV>> <<Apache Any23>> allows you to represent header-provided {{{http://www.ietf.org/rfc/rfc4180.txt}CSV}} files with RDF using a specific {{{./dev-csv-extractor.html}algorithm}}.
 
+   * <<YAML>> <<Apache Any23>> support {{{http://yaml.org/spec/1.2/spec.html}YAML}} a human friendly data serialization standard for all programming languages.
+
 * <<Output Formats>>
 
    The supported output formats are enlisted below.

http://git-wip-us.apache.org/repos/asf/any23/blob/d67bdff9/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index 6b495d1..61f8855 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -34,7 +34,7 @@
 
       <p>In order to guard against corrupted downloads/installations, it is highly recommended to
    <a href="http://www.apache.org/dev/release-signing#verifying-signature">verify the signature</a>
-   of the release bundles against the public <a href="http://www.apache.org/dyn/closer.cgi/any23/KEYS">KEYS</a> used by the Apache Any23
+   of the release bundles against the public <a href="http://apache.org/dist/any23/KEYS">KEYS</a> used by the Apache Any23
    developers.</p>
 
       <p>Apache Any23 is distributed under the <a href="http://any23.apache.org/license.html"> Apache License, version 2.0</a>.</p>
@@ -51,16 +51,16 @@
           </thead>
           <tbody>
             <tr>
-              <td>Apache Any23 ${latest.stable.released} (Source tar.gz)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/sources/apache-any23-${latest.stable.released}-src.tar.gz"> apache-any23-${latest.stable.released}-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/sources/apache-any23-${latest.stable.released}-src.tar.gz.md5"> apache-any23-${latest.stable.released}-src.tar.gz.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/sources/apache-any23-${latest.stable.released}-src.tar.gz.asc"> apache-any23-${latest.stable.released}-src.tar.gz.asc</a></td>
+              <td>Apache Any23 2.0 (Source tar.gz)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-2.0-src.tar.gz"> apache-any23-2.0-src.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-2.0-src.tar.gz.md5"> apache-any23-2.0-src.tar.gz.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-2.0-src.tar.gz.asc"> apache-any23-2.0-src.tar.gz.asc</a></td>
             </tr>
             <tr>
-              <td>Apache Any23 ${latest.stable.released} (Source zip)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/sources/apache-any23-${latest.stable.released}-src.zip"> apache-any23-${latest.stable.released}-src.zip</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/sources/apache-any23-${latest.stable.released}-src.zip.md5"> apache-any23-${latest.stable.released}-src.zip.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/sources/apache-any23-${latest.stable.released}-src.zip.asc"> apache-any23-${latest.stable.released}-src.zip.asc</a></td>
+              <td>Apache Any23 2.0 (Source zip)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-2.0-src.zip"> apache-any23-2.0-src.zip</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-2.0-src.zip.md5"> apache-any23-2.0-src.zip.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-2.0-src.zip.asc"> apache-any23-2.0-src.zip.asc</a></td>
             </tr>
           </tbody>
         </table>
@@ -78,16 +78,16 @@
           </thead>
           <tbody>
             <tr>
-              <td>Apache Any23 ${latest.stable.released} (Binary tar.gz)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-core-${latest.stable.released}.tar.gz"> apache-any23-core-${latest.stable.released}.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-core-${latest.stable.released}.tar.gz.md5"> apache-any23-core-${latest.stable.released}.tar.gz.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-core-${latest.stable.released}.tar.gz.asc"> apache-any23-core-${latest.stable.released}.tar.gz.asc</a></td>
+              <td>Apache Any23 2.0 (Binary tar.gz)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-core-2.0.tar.gz"> apache-any23-core-2.0.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-core-2.0.tar.gz.md5"> apache-any23-core-2.0.tar.gz.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-core-2.0.tar.gz.asc"> apache-any23-core-2.0.tar.gz.asc</a></td>
             </tr>
             <tr>
-              <td>Apache Any23 ${latest.stable.released} (Binary zip)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-core-${latest.stable.released}.zip"> apache-any23-core-${latest.stable.released}.zip</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-core-${latest.stable.released}.zip.md5"> apache-any23-core-${latest.stable.released}.zip.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-core-${latest.stable.released}.zip.asc"> apache-any23-core-${latest.stable.released}.zip.asc</a></td>
+              <td>Apache Any23 2.0 (Binary zip)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-core-2.0.zip"> apache-any23-core-2.0.zip</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-core-2.0.zip.md5"> apache-any23-core-2.0.zip.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-core-2.0.zip.asc"> apache-any23-core-2.0.zip.asc</a></td>
             </tr>
           </tbody>
         </table>
@@ -107,16 +107,16 @@
           </thead>
           <tbody>
             <tr>
-              <td>Apache Any23 Basic Crawler 1.0.0 (Binary tar.gz)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-basic-crawler-1.0.0.tar.gz"> apache-any23-basic-crawler-1.0.0.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-basic-crawler-1.0.0.tar.gz.md5"> apache-any23-basic-crawler-1.0.0.tar.gz.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-basic-crawler-1.0.0.tar.gz.asc"> apache-any23-basic-crawler-1.0.0.tar.gz.asc</a></td>
+              <td>Apache Any23 Basic Crawler 2.0 (Binary tar.gz)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-basic-crawler-2.0.tar.gz"> apache-any23-basic-crawler-2.0.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-basic-crawler-2.0.tar.gz.md5"> apache-any23-basic-crawler-2.0.tar.gz.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-basic-crawler-2.0.tar.gz.asc"> apache-any23-basic-crawler-2.0.tar.gz.asc</a></td>
             </tr>
             <tr>
-              <td>Apache Any23 Basic Crawler 1.0.0 (Binary zip)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-basic-crawler-1.0.0.zip"> apache-any23-basic-crawler-1.0.0.zip</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-basic-crawler-1.0.0.zip.md5"> apache-any23-basic-crawler-1.0.0.zip.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-basic-crawler-1.0.0.zip.asc"> apache-any23-basic-crawler-1.0.0.tar.gz.asc</a></td>
+              <td>Apache Any23 Basic Crawler 2.0 (Binary zip)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-basic-crawler-2.0.zip"> apache-any23-basic-crawler-2.0.zip</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-basic-crawler-2.0.zip.md5"> apache-any23-basic-crawler-2.0.zip.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-basic-crawler-2.0.zip.asc"> apache-any23-basic-crawler-2.0.tar.gz.asc</a></td>
             </tr>
           </tbody>
         </table>
@@ -134,16 +134,16 @@
           </thead>
           <tbody>
             <tr>
-              <td>Apache Any23 HTML Scraper 1.0.1 (Binary tar.gz)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-html-scraper-1.0.1.tar.gz"> apache-any23-html-scraper-1.0.1.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-html-scraper-1.0.1.tar.gz.md5"> apache-any23-html-scraper-1.0.1.tar.gz.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-html-scraper-1.0.1.tar.gz.asc"> apache-any23-html-scraper-1.0.1.tar.gz.asc</a></td>
+              <td>Apache Any23 HTML Scraper 2.0 (Binary tar.gz)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-html-scraper-2.0.tar.gz"> apache-any23-html-scraper-2.0.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-html-scraper-2.0.tar.gz.md5"> apache-any23-html-scraper-2.0.tar.gz.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-html-scraper-2.0.tar.gz.asc"> apache-any23-html-scraper-2.0.tar.gz.asc</a></td>
             </tr>
             <tr>
-              <td>Apache Any23 HTML Scraper 1.0.1 (Binary zip)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-html-scraper-1.0.1.zip"> apache-any23-html-scraper-1.0.1.zip</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-html-scraper-1.0.1.zip.md5"> apache-any23-html-scraper-1.0.1.zip.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-html-scraper-1.0.1.zip.asc"> apache-any23-html-scraper-1.0.1.zip.asc</a></td>
+              <td>Apache Any23 HTML Scraper 2.0 (Binary zip)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-html-scraper-2.0.zip"> apache-any23-html-scraper-2.0.zip</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-html-scraper-2.0.zip.md5"> apache-any23-html-scraper-2.0.zip.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-html-scraper-2.0.zip.asc"> apache-any23-html-scraper-2.0.zip.asc</a></td>
             </tr>
           </tbody>
         </table>
@@ -161,16 +161,16 @@
           </thead>
           <tbody>
             <tr>
-              <td>Apache Any23 Office Scraper 1.0.0 (Binary tar.gz)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-office-scraper-1.0.0.tar.gz"> apache-any23-office-scraper-1.0.0.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-office-scraper-1.0.0.tar.gz.md5"> apache-any23-office-scraper-1.0.0.tar.gz.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-office-scraper-1.0.0.tar.gz.asc"> apache-any23-office-scraper-1.0.0.tar.gz.asc</a></td>
+              <td>Apache Any23 Office Scraper 2.0 (Binary tar.gz)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-office-scraper-2.0.tar.gz"> apache-any23-office-scraper-2.0.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-office-scraper-2.0.tar.gz.md5"> apache-any23-office-scraper-2.0.tar.gz.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-office-scraper-2.0.tar.gz.asc"> apache-any23-office-scraper-2.0.tar.gz.asc</a></td>
             </tr>
             <tr>
-              <td>Apache Any23 Office Scraper 1.0.0 (Binary zip)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-office-scraper-1.0.0.zip"> apache-any23-office-scraper-1.0.0.zip</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-office-scraper-1.0.0.zip.md5"> apache-any23-office-scraper-1.0.0.zip.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-office-scraper-1.0.0.zip.asc"> apache-any23-office-scraper-1.0.0.zip.asc</a></td>
+              <td>Apache Any23 Office Scraper 2.0 (Binary zip)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-office-scraper-2.0.zip"> apache-any23-office-scraper-2.0.zip</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-office-scraper-2.0.zip.md5"> apache-any23-office-scraper-2.0.zip.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-office-scraper-2.0.zip.asc"> apache-any23-office-scraper-2.0.zip.asc</a></td>
             </tr>
           </tbody>
         </table>
@@ -190,16 +190,16 @@
           </thead>
           <tbody>
             <tr>
-              <td>Apache Any23 Service ${latest.stable.released} (Binary tar.gz)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}.tar.gz"> apache-any23-service-${latest.stable.released}.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}.tar.gz.md5"> apache-any23-service-${latest.stable.released}.tar.gz.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}.tar.gz.asc"> apache-any23-service-${latest.stable.released}.tar.gz.asc</a></td>
+              <td>Apache Any23 Service 2.0 (Binary tar.gz)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0.tar.gz"> apache-any23-service-2.0.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0.tar.gz.md5"> apache-any23-service-2.0.tar.gz.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0.tar.gz.asc"> apache-any23-service-2.0.tar.gz.asc</a></td>
             </tr>
             <tr>
-              <td>Apache Any23 Service ${latest.stable.released} (Binary zip)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}.zip"> apache-any23-service-${latest.stable.released}.zip</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}.zip.md5"> apache-any23-service-${latest.stable.released}.zip.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}.zip.asc"> apache-any23-service-${latest.stable.released}.zip.asc</a></td>
+              <td>Apache Any23 Service 2.0 (Binary zip)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0.zip"> apache-any23-service-2.0.zip</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0.zip.md5"> apache-any23-service-2.0.zip.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0.zip.asc"> apache-any23-service-2.0.zip.asc</a></td>
             </tr>
           </tbody>
         </table>
@@ -217,16 +217,16 @@
           </thead>
           <tbody>
             <tr>
-              <td>Apache Any23 Service (No deps) ${latest.stable.released} (Binary tar.gz)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-without-deps.tar.gz"> apache-any23-service-${latest.stable.released}-without-deps.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-without-deps.tar.gz.md5"> apache-any23-service-${latest.stable.released}-without-deps.tar.gz.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-without-deps.tar.gz.asc"> apache-any23-service-${latest.stable.released}-without-deps.tar.gz.asc</a></td>
+              <td>Apache Any23 Service (No deps) 2.0 (Binary tar.gz)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-without-deps.tar.gz"> apache-any23-service-2.0-without-deps.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-without-deps.tar.gz.md5"> apache-any23-service-2.0-without-deps.tar.gz.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-without-deps.tar.gz.asc"> apache-any23-service-2.0-without-deps.tar.gz.asc</a></td>
             </tr>
             <tr>
-              <td>Apache Any23 Service (No deps) ${latest.stable.released} (Binary zip)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-without-deps.zip"> apache-any23-service-${latest.stable.released}-without-deps.zip</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-without-deps.zip.md5"> apache-any23-service-${latest.stable.released}-without-deps.zip.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-without-deps.zip.asc"> apache-any23-service-${latest.stable.released}-without-deps.zip.asc</a></td>
+              <td>Apache Any23 Service (No deps) 2.0 (Binary zip)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-without-deps.zip"> apache-any23-service-2.0-without-deps.zip</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-without-deps.zip.md5"> apache-any23-service-2.0-without-deps.zip.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-without-deps.zip.asc"> apache-any23-service-2.0-without-deps.zip.asc</a></td>
             </tr>
           </tbody>
         </table>
@@ -244,16 +244,16 @@
           </thead>
           <tbody>
             <tr>
-              <td>Apache Any23 Service (Standalone server embedded) ${latest.stable.released} (Binary tar.gz)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-server-embedded.tar.gz"> apache-any23-service-${latest.stable.released}-server-embedded.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-server-embedded.tar.gz.md5"> apache-any23-service-${latest.stable.released}-server-embedded.tar.gz.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-server-embedded.tar.gz.asc"> apache-any23-service-${latest.stable.released}-server-embedded.tar.gz.asc</a></td>
+              <td>Apache Any23 Service (Standalone server embedded) 2.0 (Binary tar.gz)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-server-embedded.tar.gz"> apache-any23-service-2.0-server-embedded.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-server-embedded.tar.gz.md5"> apache-any23-service-2.0-server-embedded.tar.gz.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-server-embedded.tar.gz.asc"> apache-any23-service-2.0-server-embedded.tar.gz.asc</a></td>
             </tr>
             <tr>
-              <td>Apache Any23 Service (Standalone server embedded) ${latest.stable.released} (Binary zip)</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-server-embedded.zip"> apache-any23-service-${latest.stable.released}-server-embedded.zip</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-server-embedded.zip.md5"> apache-any23-service-${latest.stable.released}-server-embedded.zip.md5</a></td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/binaries/apache-any23-service-${latest.stable.released}-server-embedded.zip.asc"> apache-any23-service-${latest.stable.released}-server-embedded.zip.asc</a></td>
+              <td>Apache Any23 Service (Standalone server embedded) 2.0 (Binary zip)</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-server-embedded.zip"> apache-any23-service-2.0-server-embedded.zip</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-server-embedded.zip.md5"> apache-any23-service-2.0-server-embedded.zip.md5</a></td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/any23/2.0/any23/apache-any23-service-2.0-server-embedded.zip.asc"> apache-any23-service-2.0-server-embedded.zip.asc</a></td>
             </tr>
           </tbody>
         </table>