You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2014/08/07 17:57:35 UTC

[3/3] git commit: Site updates from master.

Site updates from master.


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

Branch: refs/heads/prestonc/benchmark_updates
Commit: 8c74f5870de23713a593e51458fdb27928add323
Parents: 624026c
Author: Till Westmann <we...@gmail.com>
Authored: Thu Jul 17 23:48:28 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Aug 7 08:50:25 2014 -0700

----------------------------------------------------------------------
 DISCLAIMER                                      |   9 --
 build-site.xml                                  |  29 ------
 pom.xml                                         |  97 ++++---------------
 src/site/apt/development_eclipse_setup.apt      |   2 +-
 src/site/apt/development_tips.apt               |  40 ++++----
 src/site/apt/development_xml_node_details.apt   |  14 +--
 src/site/apt/index.apt                          |   1 -
 src/site/apt/release.apt                        |  12 +--
 .../resources/images/apache-incubator-logo.png  | Bin 4234 -> 0 bytes
 src/site/resources/images/asf_logo_wide.png     | Bin 0 -> 14470 bytes
 src/site/site.xml                               |   8 +-
 vxquery-benchmark/src/site/site.xml             |   6 +-
 vxquery-cli/src/site/site.xml                   |   6 +-
 vxquery-core/src/site/site.xml                  |   6 +-
 vxquery-server/src/site/site.xml                |   6 +-
 vxquery-xtest/src/site/site.xml                 |   6 +-
 16 files changed, 70 insertions(+), 172 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index a5e6a19..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache VXQuery is an effort undergoing incubation at The Apache Software 
-Foundation (ASF), sponsored by the Apache Incubator PMC. 
-Incubation is required of all newly accepted projects until a further review 
-indicates that the infrastructure, communications, and decision making 
-process have stabilized in a manner consistent with other successful ASF 
-projects. 
-While incubation status is not necessarily a reflection of the completeness 
-or stability of the code, it does indicate that the project has yet to be 
-fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/build-site.xml
----------------------------------------------------------------------
diff --git a/build-site.xml b/build-site.xml
deleted file mode 100644
index 074ceaa..0000000
--- a/build-site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<project name="vxquery" default="build" basedir=".">
-
-  <target name="build">
-    <mkdir dir="${build.gen-site.dir}"/>
-    <concat destfile="${build.gen-site.dir}/index.apt">
-      <fileset file="${basedir}/src/site/apt/index.apt"/>
-      <fileset file="${basedir}/DISCLAIMER"/>
-    </concat>
-  </target>
-
-</project>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cf17361..33cb953 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
   <packaging>pom</packaging>
   <name>VXQuery</name>
   <description>A Versatile XQuery Processor</description>
-  <url>http://incubator.apache.org/vxquery/</url>
+  <url>http://vxquery.apache.org/</url>
 
   <organization>
     <name>Apache Software Foundation</name>
@@ -47,10 +47,10 @@
   </licenses>
 
   <scm>
-    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</url>
-    <tag>HEAD</tag>
+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf/vxquery.git</url>
+    <tag>apache-vxquery-0.3-incubating</tag>
   </scm>
 
   <issueManagement>
@@ -69,35 +69,13 @@
       <organization />
       <timezone />
     </developer>
-    <developer>
-      <id>jochen</id>
-      <name>Jochen Wiedmann</name>
-      <email />
-      <roles>
-        <role>Mentor</role>
-      </roles>
-      <organization />
-      <timezone />
-    </developer>
-    <developer>
-      <id>marvin</id>
-      <name>Marvin Humphrey</name>
-      <email />
-      <roles>
-        <role>Mentor</role>
-      </roles>
-      <organization />
-      <timezone />
-    </developer>
 
     <developer>
       <id>cezar</id>
       <name>Cezar Andrei</name>
       <email />
       <roles>
-        <role>Project Manager</role>
         <role>Architect</role>
-        <role>Champion</role>
       </roles>
       <organization />
       <timezone>-6</timezone>
@@ -137,7 +115,7 @@
       <name>Till Westmann</name>
       <email />
       <roles>
-        <role>Project Manager</role>
+        <role>Chair</role>
         <role>Architect</role>
       </roles>
       <organization />
@@ -148,49 +126,27 @@
       <name>Vinayak Borkar</name>
       <email />
       <roles>
-        <role>Project Manager</role>
         <role>Architect</role>
       </roles>
       <organization />
       <timezone>-8</timezone>
     </developer>
-
-    <developer>
-      <id>radup</id>
-      <name>Radu Preotiuc</name>
-      <email />
-      <roles>
-        <role>Mentor (dormant)</role>
-      </roles>
-      <organization />
-      <timezone />
-    </developer>
-    <developer>
-      <id>sanjiva</id>
-      <name>Sanjiva Weerawarana</name>
-      <email />
-      <roles>
-        <role>Mentor (dormant)</role>
-      </roles>
-      <organization />
-      <timezone />
-    </developer>
   </developers>
 
   <mailingLists>
     <mailingList>
-      <name>VXQuery-dev</name>
-      <subscribe>vxquery-dev-subscribe@incubator.apache.org</subscribe>
-      <unsubscribe>vxquery-dev-unsubscribe@incubator.apache.org</unsubscribe>
-      <post>vxquery-dev@incubator.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-vxquery-dev/</archive>
+      <name>dev</name>
+      <subscribe>dev-subscribe@vxquery.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@vxquery.apache.org</unsubscribe>
+      <post>dev@vxquery.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/vxquery-dev/</archive>
     </mailingList>
     <mailingList>
-      <name>VXQuery-commits</name>
-      <subscribe>vxquery-commits-subscribe@incubator.apache.org</subscribe>
-      <unsubscribe>vxquery-commits-unsubscribe@incubator.apache.org</unsubscribe>
-      <post>vxquery-commits@incubator.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-vxquery-commits/</archive>
+      <name>commits</name>
+      <subscribe>commits-subscribe@vxquery.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@vxquery.apache.org</unsubscribe>
+      <post>commits@vxquery.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/vxquery-commits/</archive>
     </mailingList>
   </mailingLists>
 
@@ -463,25 +419,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-site</id>
-            <phase>pre-site</phase>
-            <configuration>
-              <target>
-                <ant antfile="build-site.xml" target="build">
-                  <property name="build.gen-site.dir" value="${project.build.directory}/generated-site/apt" />
-                </ant>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <!-- We override the configuration plugin to override the descriptor to use for building
@@ -563,7 +500,7 @@
         <configuration>
           <linkOnly>true</linkOnly>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-          <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</developerConnection>
+          <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</developerConnection>
         </configuration>
       </plugin>
       <plugin>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/src/site/apt/development_eclipse_setup.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_eclipse_setup.apt b/src/site/apt/development_eclipse_setup.apt
index 2242312..cf259b3 100644
--- a/src/site/apt/development_eclipse_setup.apt
+++ b/src/site/apt/development_eclipse_setup.apt
@@ -68,7 +68,7 @@ $ cd ..
     installation, VXQuery needs to be downloaded from Apache's git repository.
 
 ----------------------------------------
-$ git clone https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git apache-vxquery
+$ git clone https://git-wip-us.apache.org/repos/asf/vxquery.git apache-vxquery
 (Accept the certificate information for *.apache.org.)
 $ cd apache-vxquery
 $ mvn package

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/src/site/apt/development_tips.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_tips.apt b/src/site/apt/development_tips.apt
index 180bf48..f139c21 100644
--- a/src/site/apt/development_tips.apt
+++ b/src/site/apt/development_tips.apt
@@ -50,29 +50,29 @@ Developer Tips
 *-------------------------+----------------------+---------------:
 | xs:byte                 | BytePointable        |             1 |
 *-------------------------+----------------------+---------------:
-| xs:date                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:date                 | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:dateTime             | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java}XSDateTimePointable}}  |            12 |
+| xs:dateTime             | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java}XSDateTimePointable}}  |            12 |
 *-------------------------+----------------------+---------------:
 | xs:dayTimeDuration      | LongPointable        |             8 |
 *-------------------------+----------------------+---------------:
-| xs:decimal              | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java}XSDecimalPointable}}   |             9 |
+| xs:decimal              | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java}XSDecimalPointable}}   |             9 |
 *-------------------------+----------------------+---------------:
 | xs:double               | DoublePointable      |             8 |
 *-------------------------+----------------------+---------------:
-| xs:duration             | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java}XSDurationPointable}}  |            12 |
+| xs:duration             | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java}XSDurationPointable}}  |            12 |
 *-------------------------+----------------------+---------------:
 | xs:float                | FloatPointable       |             4 |
 *-------------------------+----------------------+---------------:
-| xs:gDay                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gDay                 | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gMonth               | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gMonth               | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gMonthDay            | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gMonthDay            | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gYear                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gYear                | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gYearMonth           | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gYearMonth           | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
 | xs:int                  | IntegerPointable     |             4 |
 *-------------------------+----------------------+---------------:
@@ -88,7 +88,7 @@ Developer Tips
 *-------------------------+----------------------+---------------:
 | xs:short                | ShortPointable       |             2 |
 *-------------------------+----------------------+---------------:
-| xs:time                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java}XSTimePointable}}      |             8 |
+| xs:time                 | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java}XSTimePointable}}      |             8 |
 *-------------------------+----------------------+---------------:
 | xs:unsignedByte         | ShortPointable       |             2 |
 *-------------------------+----------------------+---------------:
@@ -119,13 +119,13 @@ Developer Tips
 *-------------------------+----------------------+---------------:
 | xs:anyURI               | UTF8StringPointable  |    2 + length |
 *-------------------------+----------------------+---------------:
-| xs:base64Binary         | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
+| xs:base64Binary         | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
 *-------------------------+----------------------+---------------:
-| xs:hexBinary            | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
+| xs:hexBinary            | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
 *-------------------------+----------------------+---------------:
 | xs:NOTATION             | UTF8StringPointable  |    2 + length |
 *-------------------------+----------------------+---------------:
-| xs:QName                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java}XSQNamePointable}}     |    6 + length |
+| xs:QName                | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java}XSQNamePointable}}     |    6 + length |
 *-------------------------+----------------------+---------------:
 | xs:string               | UTF8StringPointable  |    2 + length |
 *-------------------------+----------------------+---------------:
@@ -139,19 +139,19 @@ Developer Tips
   an end of string value. Stacking iterators can be used to alter the string
   into a desired form.
   
-  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/ICharacterIterator.java}ICharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/ICharacterIterator.java}ICharacterIterator}}
    
-  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java}LowerCaseStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java}LowerCaseStringCharacterIterator}}
    
-  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringAfterCharacterIterator.java}SubstringAfterStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringAfterCharacterIterator.java}SubstringAfterStringCharacterIterator}}
    
-  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringBeforeCharacterIterator.java}SubstringBeforeStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringBeforeCharacterIterator.java}SubstringBeforeStringCharacterIterator}}
    
-  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringCharacterIterator.java}SubstringStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringCharacterIterator.java}SubstringStringCharacterIterator}}
    
-  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java}UTF8StringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java}UTF8StringCharacterIterator}}
 
-  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java}UpperCaseStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java}UpperCaseStringCharacterIterator}}
   
 * Array Backed Value Store
 

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/src/site/apt/development_xml_node_details.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_xml_node_details.apt b/src/site/apt/development_xml_node_details.apt
index c172a30..647b8d1 100644
--- a/src/site/apt/development_xml_node_details.apt
+++ b/src/site/apt/development_xml_node_details.apt
@@ -24,19 +24,19 @@ Data XML and Node Types
 *--------------------------------+----------------------+---------------+
 | <<Data Type>>                  | <<Pointable Name>>   | <<Data Size>> |
 *--------------------------------+----------------------+---------------:
-| Attribute Nodes                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java}AttributeNodePointable}}      |    1 + length |
+| Attribute Nodes                | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java}AttributeNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Document Nodes                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java}DocumentNodePointable}}      |    1 + length |
+| Document Nodes                 | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java}DocumentNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Element Nodes                  | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java}ElementNodePointable}}      |    1 + length |
+| Element Nodes                  | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java}ElementNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Node Tree Nodes                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java}NodeTreePointable}}      |    1 + length |
+| Node Tree Nodes                | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java}NodeTreePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Processing Instruction Nodes   | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java}PINodePointable}}      |    1 + length |
+| Processing Instruction Nodes   | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java}PINodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Comment Nodes                  | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
+| Comment Nodes                  | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Text Nodes                     | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
+| Text Nodes                     | {{{https://git-wip-us.apache.org/repos/asf?p=vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
 
 

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 9fe2090..8b5777a 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -23,6 +23,5 @@ Apache VXQuery
   There are lots of large collections of relatively small documents like e.g. the {{{http://www.sec.gov/info/edgar/ednews/dissemin.htm}EDGAR dataset}} or the {{{http://wiki.openstreetmap.org/wiki/Download}OpenStreetMap dataset}}.
   However there are no XQuery processors available today that are capable of processing these datasets in parallel and making the contained information accessible.
   
-* Incubation Disclaimer
 
   
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/src/site/apt/release.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/release.apt b/src/site/apt/release.apt
index c58e489..ffe8806 100644
--- a/src/site/apt/release.apt
+++ b/src/site/apt/release.apt
@@ -21,7 +21,7 @@ Releasing Apache VXQuery\x99
 
     There usually are 3 directories at the same level
 
-    * the source directory <<<incubator-vxquery>>>,
+    * the source directory <<<vxquery>>>,
 
     * the <<<site>>> directory, and
 
@@ -40,8 +40,8 @@ Releasing Apache VXQuery\x99
     directories:
 
 ---
-$ svn co https://dist.apache.org/repos/dist/release/incubator/vxquery dist
-$ svn co https://svn.apache.org/repos/asf/incubator/vxquery/site
+$ svn co https://dist.apache.org/repos/dist/release/vxquery dist
+$ svn co https://svn.apache.org/repos/asf/vxquery/site
 ---
 
   * add your key to the <<<KEYS>>> file
@@ -141,7 +141,7 @@ $ mvn release:perform
 
   * after successful vote promote staging repository {{{https://repository.apache.org/}https://repository.apache.org/}}
 
-  * add new source artifacts (archive + signature + hashes) to svn {{{https://dist.apache.org/repos/dist/release/incubator/vxquery}https://dist.apache.org/repos/dist/release/incubator/vxquery}} and remove old release dirctory
+  * add new source artifacts (archive + signature + hashes) to svn {{{https://dist.apache.org/repos/dist/release/vxquery}https://dist.apache.org/repos/dist/release/vxquery}} and remove old release dirctory
 
   * commit changes to svn
 
@@ -177,7 +177,7 @@ $ cd -
 ~~ ** Undo release plugin:
 ~~
 ~~ ---
-~~ $ svn merge -r 1526098:1524606 https://svn.apache.org/repos/asf/incubator/vxquery/branches/vxquery_0_2_staging
-~~ $ svn del -m "re-releasing build" https://svn.apache.org/repos/asf/incubator/vxquery/tags/apache-vxquery-0.2-incubating
+~~ $ svn merge -r 1526098:1524606 https://svn.apache.org/repos/asf/vxquery/branches/vxquery_0_2_staging
+~~ $ svn del -m "re-releasing build" https://svn.apache.org/repos/asf/vxquery/tags/apache-vxquery-0.2-incubating
 ~~ ---
 

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/src/site/resources/images/apache-incubator-logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/apache-incubator-logo.png b/src/site/resources/images/apache-incubator-logo.png
deleted file mode 100644
index 81fb31e..0000000
Binary files a/src/site/resources/images/apache-incubator-logo.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/src/site/resources/images/asf_logo_wide.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/asf_logo_wide.png b/src/site/resources/images/asf_logo_wide.png
new file mode 100644
index 0000000..56a4369
Binary files /dev/null and b/src/site/resources/images/asf_logo_wide.png differ

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 88332c6..3cee696 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -18,13 +18,13 @@ limitations under the License.
   <bannerLeft>
     <name>VXQuery</name>
     <src>images/VXQuery.png</src>
-    <href>http://incubator.apache.org/vxquery/</href>
+    <href>http://vxquery.apache.org/</href>
   </bannerLeft>
 
   <bannerRight>
-    <name>Apache Incubator</name>
-    <src>images/apache-incubator-logo.png</src>
-    <href>http://incubator.apache.org/</href>
+    <name>Apache Software Foundation</name>
+    <src>images/asf_logo_wide.png</src>
+    <href>http://www.apache.org/</href>
   </bannerRight>
 
   <skin>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/vxquery-benchmark/src/site/site.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/site/site.xml b/vxquery-benchmark/src/site/site.xml
index a6fbc82..c74ffb5 100644
--- a/vxquery-benchmark/src/site/site.xml
+++ b/vxquery-benchmark/src/site/site.xml
@@ -22,9 +22,9 @@ limitations under the License.
   </bannerLeft>
 
   <bannerRight>
-    <name>Apache Incubator</name>
-    <src>../images/apache-incubator-logo.png</src>
-    <href>http://incubator.apache.org/</href>
+    <name>Apache Software Foundation</name>
+    <src>../images/asf_logo_wide.png</src>
+    <href>http://www.apache.org/</href>
   </bannerRight>
 
   <skin>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/vxquery-cli/src/site/site.xml
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/site/site.xml b/vxquery-cli/src/site/site.xml
index a6fbc82..c74ffb5 100644
--- a/vxquery-cli/src/site/site.xml
+++ b/vxquery-cli/src/site/site.xml
@@ -22,9 +22,9 @@ limitations under the License.
   </bannerLeft>
 
   <bannerRight>
-    <name>Apache Incubator</name>
-    <src>../images/apache-incubator-logo.png</src>
-    <href>http://incubator.apache.org/</href>
+    <name>Apache Software Foundation</name>
+    <src>../images/asf_logo_wide.png</src>
+    <href>http://www.apache.org/</href>
   </bannerRight>
 
   <skin>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/vxquery-core/src/site/site.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/src/site/site.xml b/vxquery-core/src/site/site.xml
index 2805e58..3bce7d0 100644
--- a/vxquery-core/src/site/site.xml
+++ b/vxquery-core/src/site/site.xml
@@ -22,9 +22,9 @@ limitations under the License.
   </bannerLeft>
 
   <bannerRight>
-    <name>Apache Incubator</name>
-    <src>../images/apache-incubator-logo.png</src>
-    <href>http://incubator.apache.org/</href>
+    <name>Apache Software Foundation</name>
+    <src>../images/asf_logo_wide.png</src>
+    <href>http://www.apache.org/</href>
   </bannerRight>
 
   <skin>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/vxquery-server/src/site/site.xml
----------------------------------------------------------------------
diff --git a/vxquery-server/src/site/site.xml b/vxquery-server/src/site/site.xml
index a6fbc82..c74ffb5 100644
--- a/vxquery-server/src/site/site.xml
+++ b/vxquery-server/src/site/site.xml
@@ -22,9 +22,9 @@ limitations under the License.
   </bannerLeft>
 
   <bannerRight>
-    <name>Apache Incubator</name>
-    <src>../images/apache-incubator-logo.png</src>
-    <href>http://incubator.apache.org/</href>
+    <name>Apache Software Foundation</name>
+    <src>../images/asf_logo_wide.png</src>
+    <href>http://www.apache.org/</href>
   </bannerRight>
 
   <skin>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/8c74f587/vxquery-xtest/src/site/site.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/site/site.xml b/vxquery-xtest/src/site/site.xml
index a6fbc82..c74ffb5 100644
--- a/vxquery-xtest/src/site/site.xml
+++ b/vxquery-xtest/src/site/site.xml
@@ -22,9 +22,9 @@ limitations under the License.
   </bannerLeft>
 
   <bannerRight>
-    <name>Apache Incubator</name>
-    <src>../images/apache-incubator-logo.png</src>
-    <href>http://incubator.apache.org/</href>
+    <name>Apache Software Foundation</name>
+    <src>../images/asf_logo_wide.png</src>
+    <href>http://www.apache.org/</href>
   </bannerRight>
 
   <skin>