Normalize XML Whitespace
Normalize whitespace in project XML files (e.g. pom.xml), to two-spaces
per indentation level.
Cleanup rewriter error messages for user-defined functions
Change-Id: Ic06e3ff4431508d878e0cc614fbf957887a3c682
Reviewed-on: https://asterix-gerrit.ics.uci.edu/836
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: abdullah alamoudi <bamousaa@gmail.com>
diff --git a/hyracks-fullstack/algebricks/algebricks-common/pom.xml b/hyracks-fullstack/algebricks/algebricks-common/pom.xml
index bb792e0..2f75b49 100644
--- a/hyracks-fullstack/algebricks/algebricks-common/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-common/pom.xml
@@ -38,15 +38,14 @@
</licenses>
<properties>
- <root.dir>${basedir}/../..</root.dir>
+ <root.dir>${basedir}/../..</root.dir>
</properties>
-
<dependencies>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-api</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-api</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml b/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml
index 849ae7a..c69619d 100644
--- a/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-compiler/pom.xml
@@ -38,19 +38,19 @@
</licenses>
<properties>
- <root.dir>${basedir}/../..</root.dir>
+ <root.dir>${basedir}/../..</root.dir>
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-rewriter</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-core</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>algebricks-rewriter</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>algebricks-core</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/hyracks-fullstack/algebricks/algebricks-core/pom.xml b/hyracks-fullstack/algebricks/algebricks-core/pom.xml
index c56f6c3..ec5d9d6 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-core/pom.xml
@@ -38,34 +38,34 @@
</licenses>
<properties>
- <root.dir>${basedir}/../..</root.dir>
+ <root.dir>${basedir}/../..</root.dir>
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-storage-am-btree</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-storage-am-rtree</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-dataflow-std</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-runtime</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-common</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-storage-am-btree</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-storage-am-rtree</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-dataflow-std</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>algebricks-runtime</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>algebricks-common</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/hyracks-fullstack/algebricks/algebricks-data/pom.xml b/hyracks-fullstack/algebricks/algebricks-data/pom.xml
index 2f08ec9..45b160c 100644
--- a/hyracks-fullstack/algebricks/algebricks-data/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-data/pom.xml
@@ -38,19 +38,19 @@
</licenses>
<properties>
- <root.dir>${basedir}/../..</root.dir>
+ <root.dir>${basedir}/../..</root.dir>
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-common</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-data-std</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>algebricks-common</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-data-std</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml b/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml
index d87c17e..4016369 100644
--- a/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-examples/piglet-example/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>piglet-example</artifactId>
<name>piglet-example</name>
- <parent>
+ <parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-examples</artifactId>
<version>0.2.18-SNAPSHOT</version>
</parent>
<properties>
- <root.dir>${basedir}/../../..</root.dir>
+ <root.dir>${basedir}/../../..</root.dir>
</properties>
<build>
@@ -95,7 +95,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -116,10 +116,10 @@
<artifactId>algebricks-compiler</artifactId>
<version>0.2.18-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-util</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-util</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/hyracks-fullstack/algebricks/algebricks-examples/pom.xml b/hyracks-fullstack/algebricks/algebricks-examples/pom.xml
index 5a1cd27..5439497 100644
--- a/hyracks-fullstack/algebricks/algebricks-examples/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-examples/pom.xml
@@ -22,15 +22,15 @@
<artifactId>algebricks-examples</artifactId>
<packaging>pom</packaging>
<name>algebricks-examples</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-core</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>algebricks-core</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
- <parent>
+ <parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks</artifactId>
<version>0.2.18-SNAPSHOT</version>
@@ -46,7 +46,7 @@
</licenses>
<properties>
- <root.dir>${basedir}/../..</root.dir>
+ <root.dir>${basedir}/../..</root.dir>
</properties>
<modules>
diff --git a/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml b/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml
index f1333a5..80cb967 100644
--- a/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-rewriter/pom.xml
@@ -38,15 +38,14 @@
</licenses>
<properties>
- <root.dir>${basedir}/../..</root.dir>
+ <root.dir>${basedir}/../..</root.dir>
</properties>
-
<dependencies>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-core</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>algebricks-core</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml b/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml
index b700675..bea0618 100644
--- a/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml
@@ -38,35 +38,34 @@
</licenses>
<properties>
- <root.dir>${basedir}/../..</root.dir>
+ <root.dir>${basedir}/../..</root.dir>
</properties>
-
<dependencies>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-storage-am-btree</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-storage-am-rtree</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-dataflow-std</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-common</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-data</artifactId>
- <version>0.2.18-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-storage-am-btree</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-storage-am-rtree</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-dataflow-std</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>algebricks-common</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>algebricks-data</artifactId>
+ <version>0.2.18-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
diff --git a/hyracks-fullstack/algebricks/algebricks-tests/build-script.xml b/hyracks-fullstack/algebricks/algebricks-tests/build-script.xml
index 753e8a3..9407094 100644
--- a/hyracks-fullstack/algebricks/algebricks-tests/build-script.xml
+++ b/hyracks-fullstack/algebricks/algebricks-tests/build-script.xml
@@ -20,45 +20,45 @@
<project name="asterix" default="build" basedir=".">
- <target name="init">
- <condition property="isWindows">
- <os family="windows" />
- </condition>
- <condition property="isUnix">
- <os family="unix" />
- </condition>
- </target>
+ <target name="init">
+ <condition property="isWindows">
+ <os family="windows"/>
+ </condition>
+ <condition property="isUnix">
+ <os family="unix"/>
+ </condition>
+ </target>
- <target name="win" depends="init" if="isWindows">
- <property name="os.family" value="windows" />
- <property name="source.ext" value=".cmd" />
- <property name="target.ext" value=".cmd" />
- </target>
+ <target name="win" depends="init" if="isWindows">
+ <property name="os.family" value="windows"/>
+ <property name="source.ext" value=".cmd"/>
+ <property name="target.ext" value=".cmd"/>
+ </target>
- <target name="unix" depends="init" if="isUnix">
- <property name="os.family" value="unix" />
- <property name="source.ext" value=".sh" />
- <property name="target.ext" value="" />
- </target>
+ <target name="unix" depends="init" if="isUnix">
+ <property name="os.family" value="unix"/>
+ <property name="source.ext" value=".sh"/>
+ <property name="target.ext" value=""/>
+ </target>
- <target name="build" depends="win,unix">
- <mkdir dir="${target.dir}"/>
- <pathconvert targetos="${os.family}" property="classpath">
- <path>
- <pathelement path="${script.classpath}"/>
- </path>
- </pathconvert>
- <copy file="${source}${source.ext}" tofile="${target.dir}/${target}${target.ext}">
- <filterset>
- <filter token="main.class" value="${main.class}"/>
- <filter token="classpath" value="${classpath}"/>
- <filter token="jvm.params" value="${jvm.params}"/>
- <filter token="program.params" value="${program.params}"/>
- </filterset>
- </copy>
- <chmod perm="ugo+x">
- <fileset dir="${target.dir}"/>
- </chmod>
- </target>
+ <target name="build" depends="win,unix">
+ <mkdir dir="${target.dir}"/>
+ <pathconvert targetos="${os.family}" property="classpath">
+ <path>
+ <pathelement path="${script.classpath}"/>
+ </path>
+ </pathconvert>
+ <copy file="${source}${source.ext}" tofile="${target.dir}/${target}${target.ext}">
+ <filterset>
+ <filter token="main.class" value="${main.class}"/>
+ <filter token="classpath" value="${classpath}"/>
+ <filter token="jvm.params" value="${jvm.params}"/>
+ <filter token="program.params" value="${program.params}"/>
+ </filterset>
+ </copy>
+ <chmod perm="ugo+x">
+ <fileset dir="${target.dir}"/>
+ </chmod>
+ </target>
</project>
diff --git a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml
index b60b135..374eca1 100644
--- a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml
+++ b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml
@@ -38,7 +38,7 @@
</licenses>
<properties>
- <root.dir>${basedir}/../..</root.dir>
+ <root.dir>${basedir}/../..</root.dir>
</properties>
<build>
@@ -51,13 +51,13 @@
<configuration>
<tasks>
<ant antfile="build-script.xml" target="build">
- <property name="main.class" value="org.apache.hyracks.algebricks.tests.script.IdentityStreamingScript" />
- <property name="script.classpath" refid="maven.compile.classpath" />
- <property name="jvm.params" value="" />
- <property name="program.params" value="" />
- <property name="source" value="${basedir}/src/main/scripts/run" />
- <property name="target.dir" value="${basedir}/target/testscripts" />
- <property name="target" value="idscript" />
+ <property name="main.class" value="org.apache.hyracks.algebricks.tests.script.IdentityStreamingScript"/>
+ <property name="script.classpath" refid="maven.compile.classpath"/>
+ <property name="jvm.params" value=""/>
+ <property name="program.params" value=""/>
+ <property name="source" value="${basedir}/src/main/scripts/run"/>
+ <property name="target.dir" value="${basedir}/target/testscripts"/>
+ <property name="target" value="idscript"/>
</ant>
</tasks>
</configuration>
@@ -69,37 +69,37 @@
</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.3,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
+ <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.3,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
</build>
<dependencies>
diff --git a/hyracks-fullstack/algebricks/pom.xml b/hyracks-fullstack/algebricks/pom.xml
index 41469a8..af7e110 100644
--- a/hyracks-fullstack/algebricks/pom.xml
+++ b/hyracks-fullstack/algebricks/pom.xml
@@ -54,7 +54,7 @@
</build>
<properties>
- <root.dir>${basedir}/..</root.dir>
+ <root.dir>${basedir}/..</root.dir>
</properties>
<modules>