Repository: incubator-vxquery Updated Branches: refs/heads/site a73cca33d -> 35d5e0989
fullfill branding requirements - fix issues VXQUERY-118 and VXQUERY-119 - add "TM" to the project name - add "TM" to the project logo - add apache website navigation links - add trademark attributions - also: update fluido skin version to 1.3.1 Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/35d5e098 Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/35d5e098 Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/35d5e098 Branch: refs/heads/site Commit: 35d5e09899b6e6328a8d6a19190b7184ad5fe5c4 Parents: a73cca3 Author: Till Westmann <[email protected]> Authored: Tue Jul 1 11:53:09 2014 -0700 Committer: Till Westmann <[email protected]> Committed: Tue Jul 1 11:53:09 2014 -0700 ---------------------------------------------------------------------- NOTICE | 2 +- src/site/apt/development_eclipse_setup.apt | 2 +- src/site/apt/development_tips.apt | 2 +- src/site/apt/development_xml_node_details.apt | 2 +- src/site/apt/index.apt | 2 +- src/site/apt/release.apt | 4 +- src/site/apt/user_installation.apt | 2 +- src/site/resources/images/VXQuery.png | Bin 7184 -> 7333 bytes src/site/site.xml | 18 ++++++- vxquery-benchmark/src/site/site.xml | 44 ++++++++++------- vxquery-cli/src/site/site.xml | 44 ++++++++++------- vxquery-core/src/site/site.xml | 53 ++++++++++++--------- vxquery-server/src/site/site.xml | 44 ++++++++++------- vxquery-xtest/src/site/site.xml | 44 ++++++++++------- 14 files changed, 159 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 669de33..a520fd2 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache VXQuery -Copyright 2009-2013 The Apache Software Foundation +Copyright 2009-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/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 9df9fbc..2242312 100644 --- a/src/site/apt/development_eclipse_setup.apt +++ b/src/site/apt/development_eclipse_setup.apt @@ -16,7 +16,7 @@ Eclipse Setup Eclipse is a nice IDE for developing in Java and below are the instructions to setting up - Eclipse for VXQuery development. + Eclipse for Apache VXQuery\x99 development. * Installation http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/src/site/apt/development_tips.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/development_tips.apt b/src/site/apt/development_tips.apt index bfbf818..180bf48 100644 --- a/src/site/apt/development_tips.apt +++ b/src/site/apt/development_tips.apt @@ -33,7 +33,7 @@ Developer Tips [] - In VXQuery the TaggedValuePointable is used to read a result from this byte + In Apache VXQuery\x99 the TaggedValuePointable is used to read a result from this byte array. The first byte defines the data type and alerts us to what pointable to use for reading the rest of the data. http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/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 8cf2900..c172a30 100644 --- a/src/site/apt/development_xml_node_details.apt +++ b/src/site/apt/development_xml_node_details.apt @@ -17,7 +17,7 @@ Data XML and Node Types XML is used as the data source for XQuery and must be parsed into Hyracks data. Each node type defined in XPath and XQuery can be mapped into pointable defined in Apache - VXQuery. + VXQuery\x99. * XPath Node Types http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/src/site/apt/index.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index f9095eb..9fe2090 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -15,7 +15,7 @@ Apache VXQuery - Apache VXQuery will be a standards compliant XML Query processor implemented in Java. + Apache VXQuery\x99 will be a standards compliant XML Query processor implemented in Java. The focus is on the evaluation of queries on large amounts of XML data. Specifically the goal is to evaluate queries on large collections of relatively small XML documents. To achieve this queries will be evaluated on a cluster of shared nothing machines. http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/src/site/apt/release.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/release.apt b/src/site/apt/release.apt index 931f12b..c58e489 100644 --- a/src/site/apt/release.apt +++ b/src/site/apt/release.apt @@ -13,7 +13,7 @@ ~~ See the License for the specific language governing permissions and ~~ limitations under the License. -Releasing Apache VXQuery +Releasing Apache VXQuery\x99 * One time steps @@ -122,7 +122,7 @@ $ mvn release:prepare -DdryRun=true $ java -jar ~/Downloads/apache-rat-0.10/apache-rat-0.10.jar -d . -E .rat-excludes --- - * check (and fix) the content of the <<<NOTICE>>> file (especially the date) + * check (and fix) the content of the <<<LICENSE>>> and <<<NOTICE>>> files (especially the date) and the copyright dates in changed files * release to the staging repository http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/src/site/apt/user_installation.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/user_installation.apt b/src/site/apt/user_installation.apt index 39f9106..8713c60 100644 --- a/src/site/apt/user_installation.apt +++ b/src/site/apt/user_installation.apt @@ -17,7 +17,7 @@ Installation * Requirements - * Apache VXQuery source archive (apache-vxquery-X.Y-incubating-source-release.zip) + * Apache VXQuery\x99 source archive (apache-vxquery-X.Y-incubating-source-release.zip) * JDK >= 1.7 http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/src/site/resources/images/VXQuery.png ---------------------------------------------------------------------- diff --git a/src/site/resources/images/VXQuery.png b/src/site/resources/images/VXQuery.png index d3e2c31..58b4921 100644 Binary files a/src/site/resources/images/VXQuery.png and b/src/site/resources/images/VXQuery.png differ http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/src/site/site.xml ---------------------------------------------------------------------- diff --git a/src/site/site.xml b/src/site/site.xml index daf2f75..88332c6 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -30,10 +30,17 @@ limitations under the License. <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>1.3.1</version> </skin> <body> + <menu name="Apache Software Foundation"> + <item name="Home" href="http://www.apache.org/"/> + <item name="Donate" href="http://www.apache.org/foundation/sponsorship.html"/> + <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/> + <item name="Security" href="http://www.apache.org/security/"/> + </menu> + <menu name="Get VXQuery"> <item name="Download" href="http://www.apache.org/dyn/closer.cgi/incubator/vxquery/"; /> </menu> @@ -53,6 +60,15 @@ limitations under the License. <menu ref="reports"/> <menu ref="modules"/> + + <footer> + <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache + feather logo, and the Apache VXQuery project logo are either + registered trademarks or trademarks of The Apache Software + Foundation in the United States and other countries. + All other marks mentioned may be trademarks or registered + trademarks of their respective owners.</div> + </footer> </body> </project> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/vxquery-benchmark/src/site/site.xml ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/site/site.xml b/vxquery-benchmark/src/site/site.xml index cf8bfdb..a6fbc82 100644 --- a/vxquery-benchmark/src/site/site.xml +++ b/vxquery-benchmark/src/site/site.xml @@ -15,26 +15,34 @@ See the License for the specific language governing permissions and limitations under the License. --> <project name="VXQuery"> - <bannerLeft> - <name>VXQuery</name> - <src>../images/VXQuery.png</src> - <href>../index.html</href> - </bannerLeft> + <bannerLeft> + <name>VXQuery</name> + <src>../images/VXQuery.png</src> + <href>../index.html</href> + </bannerLeft> - <bannerRight> - <name>Apache Incubator</name> - <src>../images/apache-incubator-logo.png</src> - <href>http://incubator.apache.org/</href> - </bannerRight> + <bannerRight> + <name>Apache Incubator</name> + <src>../images/apache-incubator-logo.png</src> + <href>http://incubator.apache.org/</href> + </bannerRight> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> - </skin> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.1</version> + </skin> - <body> - <menu ref="reports"/> - </body> + <body> + <menu ref="reports"/> + <footer> + <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache + feather logo, and the Apache VXQuery project logo are either + registered trademarks or trademarks of The Apache Software + Foundation in the United States and other countries. + All other marks mentioned may be trademarks or registered + trademarks of their respective owners.</div> + </footer> + </body> </project> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/vxquery-cli/src/site/site.xml ---------------------------------------------------------------------- diff --git a/vxquery-cli/src/site/site.xml b/vxquery-cli/src/site/site.xml index cf8bfdb..a6fbc82 100644 --- a/vxquery-cli/src/site/site.xml +++ b/vxquery-cli/src/site/site.xml @@ -15,26 +15,34 @@ See the License for the specific language governing permissions and limitations under the License. --> <project name="VXQuery"> - <bannerLeft> - <name>VXQuery</name> - <src>../images/VXQuery.png</src> - <href>../index.html</href> - </bannerLeft> + <bannerLeft> + <name>VXQuery</name> + <src>../images/VXQuery.png</src> + <href>../index.html</href> + </bannerLeft> - <bannerRight> - <name>Apache Incubator</name> - <src>../images/apache-incubator-logo.png</src> - <href>http://incubator.apache.org/</href> - </bannerRight> + <bannerRight> + <name>Apache Incubator</name> + <src>../images/apache-incubator-logo.png</src> + <href>http://incubator.apache.org/</href> + </bannerRight> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> - </skin> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.1</version> + </skin> - <body> - <menu ref="reports"/> - </body> + <body> + <menu ref="reports"/> + <footer> + <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache + feather logo, and the Apache VXQuery project logo are either + registered trademarks or trademarks of The Apache Software + Foundation in the United States and other countries. + All other marks mentioned may be trademarks or registered + trademarks of their respective owners.</div> + </footer> + </body> </project> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/vxquery-core/src/site/site.xml ---------------------------------------------------------------------- diff --git a/vxquery-core/src/site/site.xml b/vxquery-core/src/site/site.xml index 63452e0..2805e58 100644 --- a/vxquery-core/src/site/site.xml +++ b/vxquery-core/src/site/site.xml @@ -15,31 +15,38 @@ See the License for the specific language governing permissions and limitations under the License. --> <project name="VXQuery"> + <bannerLeft> + <name>VXQuery</name> + <src>../images/VXQuery.png</src> + <href>../index.html</href> + </bannerLeft> - <bannerLeft> - <name>VXQuery</name> - <src>../images/VXQuery.png</src> - <href>../index.html</href> - </bannerLeft> + <bannerRight> + <name>Apache Incubator</name> + <src>../images/apache-incubator-logo.png</src> + <href>http://incubator.apache.org/</href> + </bannerRight> - <bannerRight> - <name>Apache Incubator</name> - <src>../images/apache-incubator-logo.png</src> - <href>http://incubator.apache.org/</href> - </bannerRight> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.1</version> + </skin> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> - </skin> - - <body> - <menu ref="reports"/> - <menu name="Open Items"> - <item name="Missing Functions" href="missing-functions.html"/> - <item name="Missing Operators" href="missing-operators.html"/> - </menu> - </body> + <body> + <menu ref="reports"/> + <menu name="Open Items"> + <item name="Missing Functions" href="missing-functions.html"/> + <item name="Missing Operators" href="missing-operators.html"/> + </menu> + <footer> + <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache + feather logo, and the Apache VXQuery project logo are either + registered trademarks or trademarks of The Apache Software + Foundation in the United States and other countries. + All other marks mentioned may be trademarks or registered + trademarks of their respective owners.</div> + </footer> + </body> </project> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/vxquery-server/src/site/site.xml ---------------------------------------------------------------------- diff --git a/vxquery-server/src/site/site.xml b/vxquery-server/src/site/site.xml index cf8bfdb..a6fbc82 100644 --- a/vxquery-server/src/site/site.xml +++ b/vxquery-server/src/site/site.xml @@ -15,26 +15,34 @@ See the License for the specific language governing permissions and limitations under the License. --> <project name="VXQuery"> - <bannerLeft> - <name>VXQuery</name> - <src>../images/VXQuery.png</src> - <href>../index.html</href> - </bannerLeft> + <bannerLeft> + <name>VXQuery</name> + <src>../images/VXQuery.png</src> + <href>../index.html</href> + </bannerLeft> - <bannerRight> - <name>Apache Incubator</name> - <src>../images/apache-incubator-logo.png</src> - <href>http://incubator.apache.org/</href> - </bannerRight> + <bannerRight> + <name>Apache Incubator</name> + <src>../images/apache-incubator-logo.png</src> + <href>http://incubator.apache.org/</href> + </bannerRight> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> - </skin> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.1</version> + </skin> - <body> - <menu ref="reports"/> - </body> + <body> + <menu ref="reports"/> + <footer> + <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache + feather logo, and the Apache VXQuery project logo are either + registered trademarks or trademarks of The Apache Software + Foundation in the United States and other countries. + All other marks mentioned may be trademarks or registered + trademarks of their respective owners.</div> + </footer> + </body> </project> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/35d5e098/vxquery-xtest/src/site/site.xml ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/site/site.xml b/vxquery-xtest/src/site/site.xml index cf8bfdb..a6fbc82 100644 --- a/vxquery-xtest/src/site/site.xml +++ b/vxquery-xtest/src/site/site.xml @@ -15,26 +15,34 @@ See the License for the specific language governing permissions and limitations under the License. --> <project name="VXQuery"> - <bannerLeft> - <name>VXQuery</name> - <src>../images/VXQuery.png</src> - <href>../index.html</href> - </bannerLeft> + <bannerLeft> + <name>VXQuery</name> + <src>../images/VXQuery.png</src> + <href>../index.html</href> + </bannerLeft> - <bannerRight> - <name>Apache Incubator</name> - <src>../images/apache-incubator-logo.png</src> - <href>http://incubator.apache.org/</href> - </bannerRight> + <bannerRight> + <name>Apache Incubator</name> + <src>../images/apache-incubator-logo.png</src> + <href>http://incubator.apache.org/</href> + </bannerRight> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> - </skin> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.1</version> + </skin> - <body> - <menu ref="reports"/> - </body> + <body> + <menu ref="reports"/> + <footer> + <div class="row-fluid">Apache VXQuery, VXQuery, Apache, the Apache + feather logo, and the Apache VXQuery project logo are either + registered trademarks or trademarks of The Apache Software + Foundation in the United States and other countries. + All other marks mentioned may be trademarks or registered + trademarks of their respective owners.</div> + </footer> + </body> </project>
