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/hyracks/hyracks-dist/pom.xml b/hyracks-fullstack/hyracks/hyracks-dist/pom.xml
index c2cc563..99f8eca 100644
--- a/hyracks-fullstack/hyracks/hyracks-dist/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-dist/pom.xml
@@ -18,12 +18,12 @@
!-->
<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>hyracks</artifactId>
- <groupId>org.apache.hyracks</groupId>
- <version>0.2.18-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>hyracks</artifactId>
+ <groupId>org.apache.hyracks</groupId>
+ <version>0.2.18-SNAPSHOT</version>
+ </parent>
<licenses>
<license>
@@ -34,58 +34,57 @@
</license>
</licenses>
+ <artifactId>hyracks-dist</artifactId>
+ <name>hyracks-dist</name>
- <artifactId>hyracks-dist</artifactId>
- <name>hyracks-dist</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <root.dir>${basedir}/../..</root.dir>
+ </properties>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <root.dir>${basedir}/../..</root.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <executions>
- <execution>
- <id>copy-scripts</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>target/appassembler/</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <directoryMode>0755</directoryMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>process-test-classes</id>
- <phase>package</phase>
- <configuration>
- <target>
- <chmod file="target/appassembler/bin/*)" perm="755" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>copy-scripts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/appassembler/</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <directoryMode>0755</directoryMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>process-test-classes</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <chmod file="target/appassembler/bin/*)" perm="755"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/conf/topology-template.xml b/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/conf/topology-template.xml
index 07edd4e..69aaadb 100755
--- a/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/conf/topology-template.xml
+++ b/hyracks-fullstack/hyracks/hyracks-dist/src/main/resources/conf/topology-template.xml
@@ -18,9 +18,9 @@
!-->
<cluster-topology>
- <network-switch name="Global">
- <network-switch name="local">
- <terminal name="127.0.0.1"/>
- </network-switch>
+ <network-switch name="Global">
+ <network-switch name="local">
+ <terminal name="127.0.0.1"/>
</network-switch>
+ </network-switch>
</cluster-topology>
\ No newline at end of file