You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by ti...@apache.org on 2013/11/23 08:22:24 UTC
svn commit: r1544754 - in /incubator/vxquery/trunk/vxquery: ./ build/ docs/
docs/related/ src/main/assembly/ src/site/ src/site/apt/ vxquery-benchmark/
vxquery-cli/ vxquery-cli/src/site/ vxquery-core/
vxquery-core/src/main/java/org/apache/vxquery/runti...
Author: tillw
Date: Sat Nov 23 07:22:24 2013
New Revision: 1544754
URL: http://svn.apache.org/r1544754
Log:
merge changes from release branch
Added:
incubator/vxquery/trunk/vxquery/KEYS
- copied unchanged from r1543688, incubator/vxquery/branches/vxquery_0_2_staging/KEYS
incubator/vxquery/trunk/vxquery/build/
- copied from r1543688, incubator/vxquery/branches/vxquery_0_2_staging/build/
incubator/vxquery/trunk/vxquery/vxquery-cli/src/site/
- copied from r1543688, incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/src/site/
Removed:
incubator/vxquery/trunk/vxquery/docs/related/
incubator/vxquery/trunk/vxquery/vxquery-parent/
Modified:
incubator/vxquery/trunk/vxquery/ (props changed)
incubator/vxquery/trunk/vxquery/LICENSE
incubator/vxquery/trunk/vxquery/NOTICE
incubator/vxquery/trunk/vxquery/docs/README
incubator/vxquery/trunk/vxquery/pom.xml
incubator/vxquery/trunk/vxquery/src/main/assembly/source.xml
incubator/vxquery/trunk/vxquery/src/site/apt/development_tips.apt
incubator/vxquery/trunk/vxquery/src/site/site.xml
incubator/vxquery/trunk/vxquery/vxquery-benchmark/pom.xml
incubator/vxquery/trunk/vxquery/vxquery-cli/pom.xml
incubator/vxquery/trunk/vxquery/vxquery-core/build-xqts.xml
incubator/vxquery/trunk/vxquery/vxquery-core/findbugs-exclude.xml
incubator/vxquery/trunk/vxquery/vxquery-core/pom.xml
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/site/site.xml
incubator/vxquery/trunk/vxquery/vxquery-server/pom.xml
incubator/vxquery/trunk/vxquery/vxquery-xtest/pom.xml
incubator/vxquery/trunk/vxquery/vxquery-xtest/src/site/site.xml
Propchange: incubator/vxquery/trunk/vxquery/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Nov 23 07:22:24 2013
@@ -3,4 +3,3 @@ testsuites
.settings
.classpath
.project
-edu.uci.ics.hyracks.control.nc.NodeControllerService
Propchange: incubator/vxquery/trunk/vxquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Nov 23 07:22:24 2013
@@ -0,0 +1 @@
+/incubator/vxquery/branches/vxquery_0_2_staging:1393283-1543688
Modified: incubator/vxquery/trunk/vxquery/LICENSE
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/LICENSE?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/LICENSE (original)
+++ incubator/vxquery/trunk/vxquery/LICENSE Sat Nov 23 07:22:24 2013
@@ -200,3 +200,15 @@
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.
+
+ ===================================================================
+
+ The DBLP (http://dblp.uni-trier.de/db/) database in
+
+ vxquery-core/src/test/resources/documents/dblp.xml.gz
+
+ can be used under the terms and conditions of the Open Data Commons
+ Attribution License (ODC-BY 1.0). The full ODC-BY 1.0 license text
+ is avaialable at
+
+ http://opendatacommons.org/licenses/by/1.0/
Modified: incubator/vxquery/trunk/vxquery/NOTICE
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/NOTICE?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/NOTICE (original)
+++ incubator/vxquery/trunk/vxquery/NOTICE Sat Nov 23 07:22:24 2013
@@ -1,7 +1,7 @@
Apache VXQuery
-Copyright 2001-2008 The Apache Software Foundation
+Copyright 2009-2013 The Apache Software Foundation
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Portions of this software were originally based on the following:
Modified: incubator/vxquery/trunk/vxquery/docs/README
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/docs/README?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/docs/README (original)
+++ incubator/vxquery/trunk/vxquery/docs/README Sat Nov 23 07:22:24 2013
@@ -1,19 +1,29 @@
-Apache VXQuery
---------------
+ Apache VXQuery
+What is it?
+===========
-Requirements:
+Apache VXQuery aims to 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 are
+evaluated on a cluster of shared nothing machines. VXQuery levarages the
+runtime facilities provided by Hyracks (http://hyracks.org) and the algebraic
+framework provided by Algebricks.
-1. JDK >= 1.6
-2. Apache Maven >= 2.0
+Building
+========
-Setup:
+Requirements
+------------
+1. JDK >= 1.6
+2. Apache Maven >= 2.0
-VXQuery is currently only located in SVN. The following instructions are to check out the
-active version under active development. In addition to VXQuery, the current release of
-Hyracks needs to be set up for VXQuery to run properly. The following steps are to be followed
-from the command line.
+Setup
+-----
+VXQuery is currently only located in SVN. The following instructions are to
+check out the active version under active development.
1. Create a folder for all the VXQuery files.
@@ -29,27 +39,29 @@ $ mvn package -DskipTests
$ cd ../..
-Running:
+Running
+=======
There are two ways to run VXQuery:
Note: shell scripts exist for running VXQuery for Un*x like systems.
-TODO: Add Windows batch files
1. Command line client (vxq)
-Type "sh apache_vxquery_incubating/vxquery/vxquery-cli/target/appassembler/bin/vxq" without any
-arguments for help on executing the command line client.
-
+Run
+$ sh apache_vxquery_incubating/vxquery/vxquery-cli/target/appassembler/bin/vxq
+without any arguments for help on executing the command line client.
2. XQTS test driver (xtest)
The xtest test driver can be used to execute XQuery tests from the XQTS suite.
-Type "sh apache_vxquery_incubating/vxquery/vxquery-xtest/target/appassembler/bin/xtest" without
-any arguments for help on executing xtest.
-
-Typically the test suite will need extra memory to run and output can be stored in html for easy viewing.
-Sample Test Command: JAVA_OPTS="-Xmx1024m -Djava.util.logging.config.file=/path/to/logging.properties" sh apache_vxquery_incubating/vxquery/vxquery-xtest/target/appassembler/bin/xtest -xqtsbase apache_vxquery_incubating/testsuites/XQTS/ -htmlreport /tmp/full_report.html
-The result can be viewed at file:///tmp/full_report.html
+Run
+$ sh apache_vxquery_incubating/vxquery/vxquery-xtest/target/appassembler/bin/xtest
+without any arguments for help on executing xtest.
+
+Typically the test suite will need extra memory to run and output can be
+written in html for easy viewing. Sample Test Command:
+$ JAVA_OPTS="-Xmx1024m -Djava.util.logging.config.file=/path/to/logging.properties" sh apache_vxquery_incubating/vxquery/vxquery-xtest/target/appassembler/bin/xtest -xqtsbase apache_vxquery_incubating/testsuites/XQTS/ -htmlreport /tmp/full_report.html
+The result can be viewed at /tmp/full_report.html
-Note: XQTS test suite is set up as part of the Apache VXQuery Incubating setup process.
\ No newline at end of file
+Note: XQTS test suite is set up as part of the Apache VXQuery setup process.
Modified: incubator/vxquery/trunk/vxquery/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/pom.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/pom.xml (original)
+++ incubator/vxquery/trunk/vxquery/pom.xml Sat Nov 23 07:22:24 2013
@@ -14,24 +14,153 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>13</version>
+ <relativePath />
+ </parent>
+
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
+ <version>0.3-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
- <version>0.1-incubating-SNAPSHOT</version>
<name>VXQuery</name>
<description>A Versatile XQuery Processor</description>
<url>http://incubator.apache.org/vxquery/</url>
- <parent>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-parent</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
- <relativePath>vxquery-parent</relativePath>
- </parent>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery/branches/vxquery_0_2_staging</developerConnection>
+ <url>https://svn.apache.org/repos/asf/incubator/vxquery</url>
+ </scm>
+ <issueManagement>
+ <system>Jira</system>
+ <url>https://issues.apache.org/jira/browse/VXQUERY</url>
+ </issueManagement>
+
+ <developers>
+ <developer>
+ <id>jochen</id>
+ <name>Jochen Wiedmann</name>
+ <email />
+ <roles>
+ <role>Mentor</role>
+ </roles>
+ <organization />
+ <timezone />
+ </developer>
+ <developer>
+ <id>radup</id>
+ <name>Radu Preotiuc</name>
+ <email />
+ <roles>
+ <role>Mentor</role>
+ </roles>
+ <organization />
+ <timezone />
+ </developer>
+ <developer>
+ <id>sanjiva</id>
+ <name>Sanjiva Weerawarana</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>
+ </developer>
+ <developer>
+ <id>vinayakb</id>
+ <name>Vinayak Borkar</name>
+ <email />
+ <roles>
+ <role>Project Manager</role>
+ <role>Architect</role>
+ </roles>
+ <organization />
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>dtabass</id>
+ <name>Michael J. Carey</name>
+ <email />
+ <roles>
+ <role>Architect</role>
+ </roles>
+ <organization />
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>prestonc</id>
+ <name>Preston Carman</name>
+ <email />
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <organization />
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>tillw</id>
+ <name>Till Westmann</name>
+ <email />
+ <roles>
+ <role>Project Manager</role>
+ <role>Architect</role>
+ </roles>
+ <organization />
+ <timezone>-8</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>
+ </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>
+ </mailingList>
+ </mailingLists>
+
<distributionManagement>
<site>
<id>vxquery.website</id>
@@ -40,20 +169,135 @@
</site>
</distributionManagement>
+ <repositories>
+ <repository>
+ <id>hyracks-snapshots</id>
+ <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-snapshots/</url>
+ <snapshots>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>hyracks-releases</id>
+ <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-releases/</url>
+ <releases>
+ </releases>
+ </repository>
+ <repository>
+ <id>hyracks-thirdparty</id>
+ <url>http://obelix.ics.uci.edu/nexus/content/repositories/hyracks-thirdparty/</url>
+ <releases>
+ </releases>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-client</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-cc</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-nc</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-compiler</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+ </dependencies>
+
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ <maxmemory>1024m</maxmemory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
<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>
+ <ant antfile="build-site.xml" target="build">
+ <property name="build.gen-site.dir" value="${project.build.directory}/generated-site/apt" />
+ </ant>
</target>
</configuration>
<goals>
@@ -65,17 +309,43 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/source.xml</descriptor>
</descriptors>
</configuration>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <reportPlugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-site</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -85,7 +355,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
<reportSets>
<reportSet>
<reports>
@@ -100,26 +369,35 @@
</reportSet>
</reportSets>
<configuration>
- <linkOnly>true</linkOnly>
- </configuration>
+ <linkOnly>true</linkOnly>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery</developerConnection>
+ </configuration>
</plugin>
- <!--
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.7</version>
</plugin>
- -->
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
</plugins>
</reporting>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <hyracks.version>0.2.10-SNAPSHOT</hyracks.version>
+ </properties>
+
<modules>
- <module>vxquery-parent</module>
<module>vxquery-core</module>
<module>vxquery-xtest</module>
<module>vxquery-benchmark</module>
<module>vxquery-server</module>
<module>vxquery-cli</module>
</modules>
-
</project>
Modified: incubator/vxquery/trunk/vxquery/src/main/assembly/source.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/assembly/source.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/assembly/source.xml (original)
+++ incubator/vxquery/trunk/vxquery/src/main/assembly/source.xml Sat Nov 23 07:22:24 2013
@@ -1,9 +1,25 @@
+<!--
+ 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.
+-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>src</id>
<formats>
- <format>tar.gz</format>
+ <format>zip</format>
</formats>
<fileSets>
<fileSet>
@@ -11,6 +27,11 @@
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
+ <include>**/DISCLAIMER</include>
+ <include>**/KEYS</include>
+ <include>**/LICENSE</include>
+ <include>**/NOTICE</include>
+ <include>**/README</include>
<include>**/src/**</include>
<include>**/pom.xml</include>
<include>**/build*.xml</include>
Modified: incubator/vxquery/trunk/vxquery/src/site/apt/development_tips.apt
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/site/apt/development_tips.apt?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/site/apt/development_tips.apt (original)
+++ incubator/vxquery/trunk/vxquery/src/site/apt/development_tips.apt Sat Nov 23 07:22:24 2013
@@ -18,11 +18,12 @@ Developer Tips
* Hyracks Data Mapping
- Hyracks supports several basic data types stored in byte arrays. The byte arrays can be
- accessed through objects referred to as pointables. The pointable helps with tracking the
- bytes stored in a larger storage array. Some pointables support converting the byte array
- into a desired format such as for numeric type. The most basic pointable has three values
- stored in the object.
+ {{{http://hyracks.org}Hyracks}} supports several basic data types stored in
+ byte arrays. The byte arrays can be accessed through objects referred to as
+ pointables. The pointable helps with tracking the bytes stored in a larger
+ storage array. Some pointables support converting the byte array into a
+ desired format such as for numeric type. The most basic pointable has three
+ values stored in the object.
* byte array
@@ -32,14 +33,15 @@ Developer Tips
[]
- In VXQuery 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.
+ In VXQuery 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.
** Fixed Length Data
- Fixed length data types can be stored in a set field size. The following outlines the
- Hyracks data type or custom VXQuery definition with the details about the implementation.
+ Fixed length data types can be stored in a set field size. The following
+ outlines the Hyracks data type or custom VXQuery definition with the
+ details about the implementation.
*-------------------------+----------------------+---------------+
| <<Data Type>> | <<Pointable Name>> | <<Data Size>> |
@@ -101,15 +103,16 @@ Developer Tips
** Variable Length Data
- Some information can not be stored in a fixed length value. The following data types are
- stored in variable length values. Because the size varies, the first two bytes are used to
- store the length of the total value in bytes. QName is one exception to this rule because
- the QName field has three distinct variable length fields. In this case we basically are
+ Some information can not be stored in a fixed length value. The following
+ data types are stored in variable length values. Because the size varies,
+ the first two bytes are used to store the length of the total value in
+ bytes. QName is one exception to this rule because the QName field has
+ three distinct variable length fields. In this case we basically are
storing three strings right after each other.
- Please note that all strings are stored in UTF8. The UTF8 characters range in size from one
- to three bytes. UTF8StringWriter supports writing a character sequence into the
- UTF8StringPointable format.
+ Please note that all strings are stored in UTF8. The UTF8 characters range
+ in size from one to three bytes. UTF8StringWriter supports writing a
+ character sequence into the UTF8StringPointable format.
*-------------------------+----------------------+---------------+
| <<Data Type>> | <<Pointable Name>> | <<Data Size>> |
@@ -130,10 +133,11 @@ Developer Tips
* String Iterators
- For many string functions, we have used string iterators to traverse the string. The iterator
- allows the user to ignore the details about the byte size and number of characters. The iterator
- returns the next character or an end of string value. Stacking iterators can be used to alter
- the string into a desired form.
+ For many string functions, we have used string iterators to traverse the
+ string. The iterator allows the user to ignore the details about the byte
+ size and number of characters. The iterator returns the next character or
+ an end of string value. Stacking iterators can be used to alter the string
+ into a desired form.
* {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/ICharacterIterator.java}ICharacterIterator}}
@@ -151,12 +155,8 @@ Developer Tips
* Array Backed Value Store
- The array back value store is a key design element of Hyracks. The object is used to manage an
- output array. The system creates an array large enough to hold your output. Adding to the result,
- if necessary. The array can be reused and can hold multiple pointable results due to the starting
- offset parameter in the pointable.
-
-
-
-
-
\ No newline at end of file
+ The array back value store is a key design element of Hyracks. The object
+ is used to manage an output array. The system creates an array large enough
+ to hold your output. Adding to the result, if necessary. The array can be
+ reused and can hold multiple pointable results due to the starting offset
+ parameter in the pointable.
Modified: incubator/vxquery/trunk/vxquery/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/site/site.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/site/site.xml (original)
+++ incubator/vxquery/trunk/vxquery/src/site/site.xml Sat Nov 23 07:22:24 2013
@@ -27,6 +27,12 @@ limitations under the License.
<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>
+
<body>
<menu ref="reports"/>
<menu ref="modules"/>
Modified: incubator/vxquery/trunk/vxquery/vxquery-benchmark/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-benchmark/pom.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-benchmark/pom.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-benchmark/pom.xml Sat Nov 23 07:22:24 2013
@@ -17,26 +17,37 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.vxquery</groupId>
+
+ <parent>
+ <groupId>org.apache.vxquery</groupId>
+ <artifactId>apache-vxquery</artifactId>
+ <version>0.3-incubating-SNAPSHOT</version>
+ </parent>
+
<artifactId>apache-vxquery-benchmark</artifactId>
<packaging>jar</packaging>
- <version>0.1-incubating-SNAPSHOT</version>
<name>VXQuery Benchmark</name>
<description>Apache VXQuery Benchmark</description>
- <parent>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-parent</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
- <relativePath>../vxquery-parent</relativePath>
- </parent>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
<reportSets>
<reportSet>
<reports>
Modified: incubator/vxquery/trunk/vxquery/vxquery-cli/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-cli/pom.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-cli/pom.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-cli/pom.xml Sat Nov 23 07:22:24 2013
@@ -14,23 +14,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-cli</artifactId>
- <packaging>jar</packaging>
- <version>0.1-incubating-SNAPSHOT</version>
- <name>VXQuery CLI</name>
- <description>Apache Command-Line Utility</description>
<parent>
<groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-parent</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
- <relativePath>../vxquery-parent</relativePath>
+ <artifactId>apache-vxquery</artifactId>
+ <version>0.3-incubating-SNAPSHOT</version>
</parent>
+ <artifactId>apache-vxquery-cli</artifactId>
+ <packaging>jar</packaging>
+ <name>VXQuery CLI</name>
+ <description>Apache VXQuery Command-Line Utility</description>
+
<distributionManagement>
<site>
<id>vxquery.website</id>
@@ -44,7 +41,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
- <version>1.1.1</version>
+ <version>1.3</version>
<executions>
<execution>
<configuration>
@@ -64,34 +61,68 @@
</execution>
</executions>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
</plugin>
+ -->
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.3-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-api</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-common</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-core</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-common</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-dataflow-std</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
</dependencies>
-
+
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
<reportSets>
<reportSet>
<reports>
@@ -102,10 +133,22 @@
</reportSet>
</reportSets>
<configuration>
- <linkOnly>true</linkOnly>
- </configuration>
+ <linkOnly>true</linkOnly>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ </configuration>
</plugin>
</plugins>
</reporting>
-
</project>
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/build-xqts.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/build-xqts.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/build-xqts.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/build-xqts.xml Sat Nov 23 07:22:24 2013
@@ -18,6 +18,12 @@
<project name="vxquery" default="build" basedir=".">
+ <property name="xqts.url" value="http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea" />
+ <property name="xqts.zip.file" value="XQTS_1_0_3.zip" />
+ <property name="testsuites.dir" value="${basedir}/testsuites" />
+ <property name="xqts.dir" value="${basedir}/testsuites/XQTS" />
+ <property name="xqts.catalog.file" value="XQTSCatalog.xml" />
+
<target name="init">
<available file="${testsuites.dir}/${xqts.zip.file}" property="xqts.zip.present"/>
<available file="${xqts.dir}/${xqts.catalog.file}" property="xqts.catalog.present"/>
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/findbugs-exclude.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/findbugs-exclude.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/findbugs-exclude.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/findbugs-exclude.xml Sat Nov 23 07:22:24 2013
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<FindBugsFilter>
<Match>
<Class name="~org.apache.vxquery.xmlquery.query.*" />
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/pom.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/pom.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/pom.xml Sat Nov 23 07:22:24 2013
@@ -14,23 +14,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-core</artifactId>
- <packaging>jar</packaging>
- <version>0.1-incubating-SNAPSHOT</version>
- <name>VXQuery Core</name>
- <description>Apache VXQuery Processor</description>
<parent>
<groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-parent</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
- <relativePath>../vxquery-parent</relativePath>
+ <artifactId>apache-vxquery</artifactId>
+ <version>0.3-incubating-SNAPSHOT</version>
</parent>
+ <artifactId>apache-vxquery-core</artifactId>
+ <packaging>jar</packaging>
+ <name>VXQuery Core</name>
+ <description>Apache VXQuery Processor</description>
+
<distributionManagement>
<site>
<id>vxquery.website</id>
@@ -42,11 +39,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<version>2.6</version>
@@ -64,37 +56,18 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
<executions>
<execution>
<id>generate-code</id>
<phase>generate-sources</phase>
<configuration>
<target>
- <ant antfile="build-xslt.xml" target="build">
- <property name="build.gen-src.dir" value="${project.build.directory}/generated-sources/main/java" />
- <property name="src.code.dir" value="${basedir}/src/main/java" />
- <property name="xslt.dir" value="${basedir}/src/main/xslt" />
- <property name="classpath.xslt" refid="maven.compile.classpath" />
- </ant>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>get-xqts</id>
- <phase>generate-test-resources</phase>
- <configuration>
- <target>
- <ant antfile="build-xqts.xml" target="build">
- <property name="xqts.url" value="http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea" />
- <property name="xqts.zip.file" value="XQTS_1_0_3.zip" />
- <property name="testsuites.dir" value="${basedir}/../../testsuites" />
- <property name="xqts.dir" value="${basedir}/../../testsuites/XQTS" />
- <property name="xqts.catalog.file" value="XQTSCatalog.xml" />
- </ant>
+ <ant antfile="build-xslt.xml" target="build">
+ <property name="build.gen-src.dir" value="${project.build.directory}/generated-sources/main/java" />
+ <property name="src.code.dir" value="${basedir}/src/main/java" />
+ <property name="xslt.dir" value="${basedir}/src/main/xslt" />
+ <property name="classpath.xslt" refid="maven.compile.classpath" />
+ </ant>
</target>
</configuration>
<goals>
@@ -106,12 +79,12 @@
<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" />
- <property name="src.code.dir" value="${basedir}/src/main/java" />
- <property name="xslt.dir" value="${basedir}/src/main/xslt" />
- <property name="classpath.xslt" refid="maven.compile.classpath" />
- </ant>
+ <ant antfile="build-site.xml" target="build">
+ <property name="build.gen-site.dir" value="${project.build.directory}/generated-site/apt" />
+ <property name="src.code.dir" value="${basedir}/src/main/java" />
+ <property name="xslt.dir" value="${basedir}/src/main/xslt" />
+ <property name="classpath.xslt" refid="maven.compile.classpath" />
+ </ant>
</target>
</configuration>
<goals>
@@ -144,59 +117,81 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
</plugin>
+ -->
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>[1.6,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
-
+
<dependencies>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-common</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-core</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-data</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-rewriter</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>algebricks-runtime</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-api</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-data-std</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-dataflow-common</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-dataflow-std</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>ant</groupId>
<artifactId>ant-trax</artifactId>
<version>1.6.5</version>
@@ -234,21 +229,21 @@
</dependency>
<dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
</dependency>
<dependency>
@@ -258,7 +253,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<reporting>
<plugins>
<plugin>
@@ -269,12 +264,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.9</version>
+ <version>2.12.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
<reportSets>
<reportSet>
<reports>
@@ -285,13 +279,13 @@
</reportSet>
</reportSets>
<configuration>
- <linkOnly>true</linkOnly>
- </configuration>
+ <linkOnly>true</linkOnly>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.5.2</version>
<configuration>
<effort>Min</effort>
<threshold>Normal</threshold>
@@ -304,14 +298,20 @@
<version>0.7</version>
<configuration>
<excludes>
- <exclude>findbugs-exclude.xml</exclude>
<exclude>testsuites/**/*</exclude>
<exclude>reports/**/*</exclude>
</excludes>
<numUnapprovedLicenses>0</numUnapprovedLicenses>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
-
</project>
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java Sat Nov 23 07:22:24 2013
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.vxquery.runtime.functions.strings;
public class LowerCaseCharacterIterator extends AbstractTranscodingCharacterIterator implements ICharacterIterator {
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java Sat Nov 23 07:22:24 2013
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.vxquery.runtime.functions.strings;
public class UpperCaseCharacterIterator extends AbstractTranscodingCharacterIterator implements ICharacterIterator {
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/site/site.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/site/site.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/site/site.xml Sat Nov 23 07:22:24 2013
@@ -28,6 +28,12 @@ limitations under the License.
<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>
+
<body>
<menu ref="reports"/>
<menu name="Open Items">
Modified: incubator/vxquery/trunk/vxquery/vxquery-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-server/pom.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-server/pom.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-server/pom.xml Sat Nov 23 07:22:24 2013
@@ -17,20 +17,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-server</artifactId>
- <packaging>jar</packaging>
- <version>0.1-incubating-SNAPSHOT</version>
- <name>VXQuery Server</name>
- <description>Apache VXQuery Server</description>
<parent>
<groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-parent</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
- <relativePath>../vxquery-parent</relativePath>
+ <artifactId>apache-vxquery</artifactId>
+ <version>0.3-incubating-SNAPSHOT</version>
</parent>
+ <artifactId>apache-vxquery-server</artifactId>
+ <packaging>jar</packaging>
+ <name>VXQuery Server</name>
+ <description>Apache VXQuery Server</description>
+
<distributionManagement>
<site>
<id>vxquery.website</id>
@@ -88,7 +86,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -97,7 +103,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.3-incubating-SNAPSHOT</version>
</dependency>
<dependency>
@@ -122,7 +128,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
<reportSets>
<reportSet>
<reports>
Modified: incubator/vxquery/trunk/vxquery/vxquery-xtest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-xtest/pom.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-xtest/pom.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-xtest/pom.xml Sat Nov 23 07:22:24 2013
@@ -14,23 +14,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-xtest</artifactId>
- <packaging>jar</packaging>
- <version>0.1-incubating-SNAPSHOT</version>
- <name>VXQuery XTest</name>
- <description>Apache VXQuery Test Driver</description>
<parent>
<groupId>org.apache.vxquery</groupId>
- <artifactId>apache-vxquery-parent</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
- <relativePath>../vxquery-parent</relativePath>
+ <artifactId>apache-vxquery</artifactId>
+ <version>0.3-incubating-SNAPSHOT</version>
</parent>
+ <artifactId>apache-vxquery-xtest</artifactId>
+ <packaging>jar</packaging>
+ <name>VXQuery XTest</name>
+ <description>Apache VXQuery Test Driver</description>
+
<distributionManagement>
<site>
<id>vxquery.website</id>
@@ -44,7 +41,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
- <version>1.1.1</version>
+ <version>1.3</version>
<executions>
<execution>
<configuration>
@@ -64,19 +61,45 @@
</execution>
</executions>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
+ </plugin>
+ -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.3-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-api</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-control-common</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.uci.ics.hyracks</groupId>
+ <artifactId>hyracks-dataflow-std</artifactId>
+ <version>${hyracks.version}</version>
</dependency>
<dependency>
@@ -92,7 +115,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.4</version>
<reportSets>
<reportSet>
<reports>
@@ -103,8 +125,21 @@
</reportSet>
</reportSets>
<configuration>
- <linkOnly>true</linkOnly>
- </configuration>
+ <linkOnly>true</linkOnly>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ </configuration>
</plugin>
</plugins>
</reporting>
Modified: incubator/vxquery/trunk/vxquery/vxquery-xtest/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-xtest/src/site/site.xml?rev=1544754&r1=1544753&r2=1544754&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-xtest/src/site/site.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-xtest/src/site/site.xml Sat Nov 23 07:22:24 2013
@@ -27,6 +27,12 @@ limitations under the License.
<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>
+
<body>
<menu ref="reports"/>
</body>