asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject [5/5] asterixdb git commit: [NO ISSUE] Remove asterix-yarn
Date Thu, 30 Nov 2017 02:01:06 GMT
[NO ISSUE]
Remove asterix-yarn

This installer method really isn't as popular as we'd hoped, and it relies
in large part on managix style config, so in lieu of adapting it to INI style
it is being removed.

Change-Id: I480cf780b0a6a1d66b1978df782737479d0fece1
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2186
Reviewed-by: Michael Blow <mblow@apache.org>
Integration-Tests: Michael Blow <mblow@apache.org>
Tested-by: Michael Blow <mblow@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/6b765f34
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/6b765f34
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/6b765f34

Branch: refs/heads/master
Commit: 6b765f34d31f65035519bb281dae2ca7726e009c
Parents: 7650420
Author: Ian Maxon <imaxon@apache.org>
Authored: Wed Nov 29 15:03:11 2017 -0800
Committer: Ian Maxon <imaxon@apache.org>
Committed: Wed Nov 29 17:59:52 2017 -0800

----------------------------------------------------------------------
 asterixdb/asterix-yarn/pom.xml                  |  474 ------
 .../src/main/assembly/binary-assembly.xml       |  116 --
 .../org/apache/asterix/aoya/AConstants.java     |  120 --
 .../asterix/aoya/AsterixApplicationMaster.java  | 1334 -----------------
 .../apache/asterix/aoya/AsterixYARNClient.java  | 1407 ------------------
 .../java/org/apache/asterix/aoya/Deleter.java   |   49 -
 .../org/apache/asterix/aoya/HDFSBackup.java     |  112 --
 .../java/org/apache/asterix/aoya/Utils.java     |  494 ------
 .../resources/base-asterix-configuration.xml    |  253 ----
 .../configs/asterix-client-log4j.properties     |   26 -
 .../configs/base-asterix-configuration.xml      |  253 ----
 .../src/main/resources/configs/local.xml        |   49 -
 .../configs/my_awesome_cluster_desc.xml         |   41 -
 .../src/main/resources/scripts/asterix          |   42 -
 .../src/main/resources/scripts/asterix.cmd      |  103 --
 .../aoya/test/AsterixYARNInstanceUtil.java      |  132 --
 .../aoya/test/AsterixYARNLibraryTestIT.java     |  110 --
 .../aoya/test/AsterixYARNLifecycleIT.java       |  142 --
 .../apache/asterix/aoya/test/YARNCluster.java   |   90 --
 .../test/resources/hadoop/conf/core-site.xml    |   31 -
 .../test/resources/hadoop/conf/hdfs-site.xml    |   36 -
 .../test/resources/hadoop/conf/log4j.properties |  111 --
 .../test/resources/hadoop/conf/mapred-site.xml  |   43 -
 .../typed_adapter/typed_adapter.1.ddl.aql       |   39 -
 .../typed_adapter/typed_adapter.2.update.aql    |   34 -
 .../typed_adapter/typed_adapter.3.query.aql     |   32 -
 .../feed_ingest/feed_ingest.1.ddl.aql           |   54 -
 .../feed_ingest/feed_ingest.2.update.aql        |   33 -
 .../feed_ingest/feed_ingest.3.query.aql         |   31 -
 .../getCapital/getCapital.1.ddl.aql             |   24 -
 .../getCapital/getCapital.2.query.aql           |   23 -
 .../insert-from-select.1.ddl.aql                |   27 -
 .../insert-from-select.2.update.aql             |   24 -
 .../insert-from-select.3.update.aql             |   25 -
 .../insert-from-select.4.query.aql              |   24 -
 .../library-functions/mysum/mysum.1.query.aql   |   22 -
 .../library-functions/toUpper/toUpper.1.ddl.aql |   25 -
 .../toUpper/toUpper.2.query.aql                 |   23 -
 .../dataverseDataset.1.query.aql                |   21 -
 .../functionDataset/functionDataset.1.query.aql |   21 -
 .../libraryDataset/libraryDataset.1.query.aql   |   21 -
 .../typed_adapter/typed_adapter.1.adm           |    5 -
 .../library-feeds/feed_ingest/feed_ingest.1.adm |   12 -
 .../getCapital/getCapital.1.adm                 |    6 -
 .../insert-from-select/insert-from-select.1.adm |    1 -
 .../results/library-functions/mysum/mysum.1.adm |    1 -
 .../library-functions/toUpper/toUpper.1.adm     |    1 -
 .../dataverseDataset/dataverseDataset.1.adm     |    3 -
 .../functionDataset/functionDataset.1.adm       |    8 -
 .../libraryDataset/libraryDataset.1.adm         |    1 -
 .../src/test/resources/library/testsuite.xml    |   74 -
 asterixdb/pom.xml                               |   12 -
 52 files changed, 6195 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/6b765f34/asterixdb/asterix-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml
deleted file mode 100644
index 5e67c8e..0000000
--- a/asterixdb/asterix-yarn/pom.xml
+++ /dev/null
@@ -1,474 +0,0 @@
-<!--
- ! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements.See the NOTICE file
- ! distributed with this work for additional information
- ! regarding copyright ownership.The ASF licenses this file
- ! to you under the Apache License, Version 2.0 (the
- ! "License"); you may not use this file except in compliance
- ! with the License.You may obtain a copy of the License at
- !
- !http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing,
- ! software distributed under the License is distributed on an
- ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ! KIND, either express or implied.See the License for the
- ! specific language governing permissions and limitations
- ! under the License.
- !-->
-<project 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>apache-asterixdb</artifactId>
-    <groupId>org.apache.asterix</groupId>
-    <version>0.9.3-SNAPSHOT</version>
-  </parent>
-  <artifactId>asterix-yarn</artifactId>
-
-  <properties>
-    <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>aoya</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <classifier>aoya</classifier>
-              <archive>
-                <manifest>
-                  <MainClass>org.apache.asterix.aoya.Client</MainClass>
-                </manifest>
-              </archive>
-              <includes>
-                <include>**/org/apache/asterix/aoya/*</include>
-                <include>**/README*</include>
-                <include>**/LICENSE*</include>
-                <include>**/NOTICE*</include>
-                <include>**/DEPENDENCIES*</include>
-              </includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/binary-assembly.xml</descriptor>
-              </descriptors>
-            </configuration>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.hyracks</groupId>
-        <artifactId>license-automation-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <templateRootDir>${basedir}/../src/main/licenses/templates</templateRootDir>
-          <generatedFiles>
-            <generatedFile>
-              <template>asterix-license.ftl</template>
-              <outputFile>LICENSE</outputFile>
-            </generatedFile>
-            <generatedFile>
-              <template>asterix-notice.ftl</template>
-              <outputFile>NOTICE</outputFile>
-            </generatedFile>
-          </generatedFiles>
-          <location>repo/</location>
-          <timeoutSecs>10</timeoutSecs>
-          <extraLicenseMaps>
-            <extraLicenseMap>
-              <file>${basedir}/../asterix-server/target/generated-resources/license_map.json</file>
-              <location>asterix/asterix-server-${project.version}-binary-assembly.zip::repo/</location>
-            </extraLicenseMap>
-          </extraLicenseMaps>
-          <downloadDir>${project.build.directory}/generated-resources/license</downloadDir>
-          <excludedScopes>
-            <excludedScope>test</excludedScope>
-          </excludedScopes>
-          <excludes>
-            <exclude>org.apache.asterix:*</exclude>
-            <exclude>org.apache.algebricks:*</exclude>
-            <exclude>org.apache.hyracks:*</exclude>
-          </excludes>
-          <licenseDirectory>${basedir}/../src/main/licenses/content</licenseDirectory>
-          <dependencySets>
-            <dependencySet>
-              <includes>
-                <!-- NOTE! Any changes here must be mirrored in src/main/assembly/binary-assembly.xml
-->
-                <include>org.apache.asterix:asterix-yarn</include>
-                <include>org.apache.asterix:asterix-common</include>
-                <include>log4j:log4j</include>
-                <include>org.slf4j:slf4j-api</include>
-                <include>org.slf4j:slf4j-simple</include>
-                <include>commons-io:commons-io</include>
-                <include>commons-cli:commons-cli</include>
-                <include>commons-configuration:commons-configuration</include>
-                <include>commons-collections:commons-collections</include>
-                <include>commons-logging:commons-logging</include>
-                <include>commons-codec:commons-codec</include>
-                <include>commons-lang:commons-lang</include>
-                <include>org.apache.hadoop:hadoop-common</include>
-                <include>org.apache.hadoop:hadoop-hdfs</include>
-                <include>org.apache.hadoop:hadoop-auth</include>
-                <include>org.apache.hadoop:hadoop-yarn-common</include>
-                <include>org.apache.hadoop:hadoop-yarn-api</include>
-                <include>org.apache.httpcomponents:httpcore</include>
-                <include>org.apache.httpcomponents:httpclient</include>
-                <include>commons-httpclient:commons-httpclient</include>
-                <include>com.google.protobuf:protobuf-java</include>
-                <include>com.google.guava:guava</include>
-              </includes>
-              <location>lib</location>
-            </dependencySet>
-          </dependencySets>
-          <models>
-            <model>${basedir}/../src/main/appended-resources/supplemental-models.xml</model>
-          </models>
-          <overrides>
-            <override>
-              <gav>commons-configuration:commons-configuration:1.6</gav>
-              <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            </override>
-            <override>
-              <gav>com.google.protobuf:protobuf-java:2.5.0</gav>
-              <url>https://github.com/google/protobuf/blob/v2.5.0/COPYING.txt</url>
-            </override>
-          </overrides>
-          <licenses>
-            <license>
-              <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-              <aliasUrls>http://www.apache.org/licenses/LICENSE-2.0</aliasUrls>
-            </license>
-          </licenses>
-          <templateProperties>
-            <packageName>Apache AsterixDB YARN Install</packageName>
-            <asterixAppLocation>repo/asterix-app-${project.version}.jar, within asterix/asterix-server-${project.version}-binary-assembly.zip</asterixAppLocation>
-            <hyracksControlCcLocation>repo/hyracks-control-cc-${project.version}.jar,
within asterix/asterix-server-${project.version}-binary-assembly.zip</hyracksControlCcLocation>
-            <hivecompatLocation>repo/asterix-hivecompat-${project.version}.jar, within
asterix/asterix-server-${project.version}-binary-assembly.zip</hivecompatLocation>
-          </templateProperties>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-external-testlib</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeClassifiers>testlib</includeClassifiers>
-              <outputDirectory>target/resources/externallib</outputDirectory>
-              <stripVersion>true</stripVersion>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <ignoredDependencies>
-            <ignoredDependency>org.apache.hive:hive-exec:*</ignoredDependency>
-          </ignoredDependencies>
-          <usedDependencies>
-            <usedDependency>commons-codec:commons-codec</usedDependency>
-            <usedDependency>commons-collections:commons-collections</usedDependency>
-            <usedDependency>commons-configuration:commons-configuration</usedDependency>
-            <usedDependency>commons-lang:commons-lang</usedDependency>
-            <usedDependency>commons-logging:commons-logging-api</usedDependency>
-            <usedDependency>commons-net:commons-net</usedDependency>
-            <usedDependency>org.apache.asterix:asterix-events</usedDependency>
-            <usedDependency>org.apache.asterix:asterix-runtime</usedDependency>
-            <usedDependency>org.apache.asterix:asterix-server</usedDependency>
-            <usedDependency>org.apache.commons:commons-math</usedDependency>
-            <usedDependency>org.apache.hadoop:hadoop-minicluster</usedDependency>
-            <usedDependency>org.apache.httpcomponents:httpclient</usedDependency>
-            <usedDependency>org.apache.httpcomponents:httpcore</usedDependency>
-            <usedDependency>org.slf4j:slf4j-simple</usedDependency>
-          </usedDependencies>
-          <ignoredUnusedDeclaredDependencies>
-            <ignoredUnusedDeclaredDependency>org.apache.asterix:asterix-external-data:zip:*</ignoredUnusedDeclaredDependency>
-          </ignoredUnusedDeclaredDependencies>
-        </configuration>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.hyracks</groupId>
-                    <artifactId>license-automation-plugin</artifactId>
-                    <versionRange>[0.0,)</versionRange>
-                    <goals>
-                      <goal>generate</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <repositories>
-    <repository>
-      <id>central</id>
-      <url>http://repo1.maven.org/maven2</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-        <checksumPolicy>warn</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-        <updatePolicy>never</updatePolicy>
-        <checksumPolicy>fail</checksumPolicy>
-      </snapshots>
-      <id>HDPReleases</id>
-      <name>HDP Releases</name>
-      <url>http://repo.hortonworks.com/content/repositories/releases</url>
-      <layout>default</layout>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.asterix</groupId>
-      <artifactId>asterix-events</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.asterix</groupId>
-      <artifactId>asterix-app</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.asterix</groupId>
-      <artifactId>asterix-test-framework</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.asterix</groupId>
-      <artifactId>asterix-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-configuration</groupId>
-      <artifactId>commons-configuration</artifactId>
-      <version>1.6</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-math</artifactId>
-      <version>2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.asterix</groupId>
-      <artifactId>asterix-server</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-      <classifier>binary-assembly</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.asterix</groupId>
-      <artifactId>asterix-runtime</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.asterix</groupId>
-      <artifactId>asterix-app</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdfs</artifactId>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-api</artifactId>
-      <version>${hadoop.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-server-tests</artifactId>
-      <version>${hadoop.version}</version>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
-      <version>${hadoop.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.asterix</groupId>
-      <artifactId>asterix-external-data</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-      <classifier>testlib</classifier>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hyracks</groupId>
-      <artifactId>hyracks-control-cc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hyracks</groupId>
-      <artifactId>algebricks-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdfs</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hyracks</groupId>
-      <artifactId>hyracks-control-nc</artifactId>
-    </dependency>
-  </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/6b765f34/asterixdb/asterix-yarn/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-yarn/src/main/assembly/binary-assembly.xml b/asterixdb/asterix-yarn/src/main/assembly/binary-assembly.xml
deleted file mode 100644
index 1ca8c0e..0000000
--- a/asterixdb/asterix-yarn/src/main/assembly/binary-assembly.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--
- ! Licensed to the Apache Software Foundation (ASF) under one
- ! or more contributor license agreements.  See the NOTICE file
- ! distributed with this work for additional information
- ! regarding copyright ownership.  The ASF licenses this file
- ! to you under the Apache License, Version 2.0 (the
- ! "License"); you may not use this file except in compliance
- ! with the License.  You may obtain a copy of the License at
- !
- !   http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing,
- ! software distributed under the License is distributed on an
- ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ! KIND, either express or implied.  See the License for the
- ! specific language governing permissions and limitations
- ! under the License.
- !-->
-<assembly>
-  <id>binary-assembly</id>
-  <formats>
-    <format>dir</format>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>target/generated-sources</directory>
-      <outputDirectory>.</outputDirectory>
-      <includes>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/resources/scripts</directory>
-      <fileMode>0755</fileMode>
-      <includes>
-        <include>asterix</include>
-      </includes>
-      <outputDirectory>bin</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/resources/configs</directory>
-      <fileMode>0755</fileMode>
-      <includes>
-        <include>local.xml</include>
-      </includes>
-      <outputDirectory>configs</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/resources/</directory>
-      <fileMode>0755</fileMode>
-      <includes>
-        <include>base-asterix-configuration.xml</include>
-      </includes>
-      <outputDirectory>conf</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/resources/configs</directory>
-      <fileMode>0755</fileMode>
-      <includes>
-        <include>my_awesome_cluster_desc.xml</include>
-      </includes>
-      <outputDirectory>configs</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/resources/configs</directory>
-      <fileMode>0755</fileMode>
-      <includes>
-        <include>asterix-client-log4j.properties</include>
-      </includes>
-      <outputDirectory>conf</outputDirectory>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <includes>
-        <!-- NOTE! Any changes here must be mirrored in src/main/assembly/binary-assembly.xml
-->
-        <include>org.apache.asterix:asterix-yarn</include>
-        <include>org.apache.asterix:asterix-common</include>
-        <include>log4j:log4j</include>
-        <include>org.slf4j:slf4j-api</include>
-        <include>org.slf4j:slf4j-simple</include>
-        <include>commons-io:commons-io</include>
-        <include>commons-cli:commons-cli</include>
-        <include>commons-configuration:commons-configuration</include>
-        <include>commons-collections:commons-collections</include>
-        <include>commons-logging:commons-logging</include>
-        <include>commons-codec:commons-codec</include>
-        <include>commons-lang:commons-lang</include>
-        <include>org.apache.hadoop:hadoop-common</include>
-        <include>org.apache.hadoop:hadoop-hdfs</include>
-        <include>org.apache.hadoop:hadoop-auth</include>
-        <include>org.apache.hadoop:hadoop-yarn-client</include>
-        <include>org.apache.hadoop:hadoop-yarn-common</include>
-        <include>org.apache.hadoop:hadoop-yarn-api</include>
-        <include>org.apache.httpcomponents:httpcore</include>
-        <include>org.apache.httpcomponents:httpclient</include>
-        <include>org.htrace:htrace-core</include>
-        <include>commons-httpclient:commons-httpclient</include>
-        <include>com.google.guava:guava</include>
-        <include>com.google.protobuf:protobuf-java</include>
-      </includes>
-      <outputDirectory>lib</outputDirectory>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>asterix</outputDirectory>
-      <includes>
-        <include>org.apache.asterix:asterix-server*</include>
-      </includes>
-      <unpack>false</unpack>
-      <useTransitiveDependencies>false</useTransitiveDependencies>
-    </dependencySet>
-  </dependencySets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/6b765f34/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AConstants.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AConstants.java
b/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AConstants.java
deleted file mode 100644
index ccbca9e..0000000
--- a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AConstants.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.asterix.aoya;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
-
-/**
- * Constants used in both Client and Application Master
- */
-@InterfaceAudience.LimitedPrivate(value = { "For simplicity between Client and AM." })
-@InterfaceStability.Unstable
-public class AConstants {
-    /**
-     * Environment key name pointing to the the app master jar location
-     */
-    public static final String APPLICATIONMASTERJARLOCATION = "APPLICATIONMASTERJARLOCATION";
-
-    /**
-     * Environment key name denoting the file timestamp for the the app master jar.
-     * Used to validate the local resource.
-     */
-    public static final String APPLICATIONMASTERJARTIMESTAMP = "APPLICATIONMASTERJARTIMESTAMP";
-
-    /**
-     * Environment key name denoting the file content length for the app master jar.
-     * Used to validate the local resource.
-     */
-    public static final String APPLICATIONMASTERJARLEN = "APPLICATIONMASTERJARLEN";
-    /**
-     * Environment key name pointing to the Asterix distributable tar
-     */
-    public static final String TARLOCATION = "TARLOCATION";
-
-    /**
-     * Environment key name denoting the file timestamp for the Asterix tar.
-     * Used to validate the local resource.
-     */
-    public static final String TARTIMESTAMP = "TARTIMESTAMP";
-
-    /**
-     * Environment key name denoting the file content length for the Asterix tar.
-     * Used to validate the local resource.
-     */
-    public static final String TARLEN = "TARLEN";
-
-    /**
-     * Environment key name pointing to the Asterix cluster configuration file
-     */
-    public static final String CONFLOCATION = "CONFLOCATION";
-
-    /**
-     * Environment key name denoting the file timestamp for the Asterix config.
-     * Used to validate the local resource.
-     */
-
-    public static final String CONFTIMESTAMP = "CONFTIMESTAMP";
-
-    /**
-     * Environment key name denoting the file content length for the Asterix config.
-     * Used to validate the local resource.
-     */
-
-    public static final String CONFLEN = "CONFLEN";
-
-    /**
-     * Environment key name pointing to the Asterix parameters file
-     */
-
-    public static final String PARAMLOCATION = "PARAMLOCATION";
-
-    /**
-     * Environment key name denoting the file timestamp for the Asterix parameters.
-     * Used to validate the local resource.
-     */
-
-    public static final String PARAMTIMESTAMP = "PARAMTIMESTAMP";
-
-    /**
-     * Environment key name denoting the file content length for the Asterix parameters.
-     * Used to validate the local resource.
-     */
-
-    public static final String PARAMLEN = "PARAMLEN";
-
-    public static final String PATHSUFFIX = "PATHSUFFIX";
-
-    public static final String INSTANCESTORE = "INSTANCESTORE";
-
-    public static final String RMADDRESS = "RMADDRESS";
-
-    public static final String RMSCHEDULERADDRESS = "RMSCHEDULERADDRESS";
-
-    public static final String DFS_BASE = "DFSBASE";
-
-    public static final String NC_JAVA_OPTS = "NCJAVAOPTS";
-
-    public static final String CC_JAVA_OPTS = "CCJAVAOPTS";
-
-    public static final String NC_CONTAINER_MEM = "NC_CONTAINER_MEM";
-
-    public static final String CC_CONTAINER_MEM = "CC_CONTAINER_MEM";
-
-}


Mime
View raw message