You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ve...@apache.org on 2015/06/16 23:40:52 UTC
[2/2] incubator-atlas git commit: ATLAS-13 Add project website.
Contributed by Venkatesh Seetharam
ATLAS-13 Add project website. Contributed by Venkatesh Seetharam
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/caff3c20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/caff3c20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/caff3c20
Branch: refs/heads/master
Commit: caff3c20be2e22bdee20bf33c7fdaf81586e864d
Parents: d55f4b0
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Tue Jun 16 14:39:49 2015 -0700
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Tue Jun 16 14:39:49 2015 -0700
----------------------------------------------------------------------
InstallationSteps.txt | 12 +-
docs/pom.xml | 90 +++++++
docs/src/site/resources/images/atlas-logo.png | Bin 0 -> 3115 bytes
docs/src/site/resources/images/falcon-logo.png | Bin 13293 -> 0 bytes
docs/src/site/site.xml | 73 +++++-
docs/src/site/twiki/InstallationSteps.twiki | 155 ++++++++++++
pom.xml | 262 +++++++++++++++++++-
release-log.txt | 1 +
src/conf/atlas-env.sh | 8 +-
9 files changed, 580 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/caff3c20/InstallationSteps.txt
----------------------------------------------------------------------
diff --git a/InstallationSteps.txt b/InstallationSteps.txt
index 9ffac1d..b9b630a 100755
--- a/InstallationSteps.txt
+++ b/InstallationSteps.txt
@@ -44,16 +44,20 @@ Once the build successfully completes, artifacts can be packaged for deployment.
* mvn clean assembly:assembly -DskipTests -DskipITs
-Tar can be found in {project dir}/target/apache-atlas-${project.version}-bin.tar.gz
+Tar can be found in atlas/target/apache-atlas-${project.version}-bin.tar.gz
Tar is structured as follows
|- bin
- |- atlas-start.sh
- |- atlas-stop.sh
+ |- atlas_start.py
+ |- atlas_stop.py
+ |- atlas_config.py
+ |- quick_start.py
+ |- cputil.py
|- conf
|- application.properties
- |- graph.properties
+ |- client.properties
+ |- atlas-env.sh
|- log4j.xml
|- docs
|- server
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/caff3c20/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index e52bf1f..55f5f8d 100755
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -34,6 +34,7 @@
<skipTests>true</skipTests>
</properties>
+<!--
<build>
<plugins>
<plugin>
@@ -62,4 +63,93 @@
</plugin>
</plugins>
</build>
+-->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-twiki</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>2.6</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <!--<outputDirectory>../../site</outputDirectory>-->
+ <reportPlugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.3</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>project-team</report>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>
+<!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>src/site/resources</directory>
+ <targetPath>pages</targetPath>
+ </resource>
+ <resource>
+ <directory>target/site</directory>
+ <targetPath>pages</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+-->
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/caff3c20/docs/src/site/resources/images/atlas-logo.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/atlas-logo.png b/docs/src/site/resources/images/atlas-logo.png
new file mode 100644
index 0000000..50c0ffd
Binary files /dev/null and b/docs/src/site/resources/images/atlas-logo.png differ
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/caff3c20/docs/src/site/resources/images/falcon-logo.png
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/falcon-logo.png b/docs/src/site/resources/images/falcon-logo.png
deleted file mode 100755
index 0a9f6cf..0000000
Binary files a/docs/src/site/resources/images/falcon-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/caff3c20/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 3469f49..c2ab126 100755
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -29,14 +29,24 @@
<custom>
<fluidoSkin>
- <project>Apache Metadata and Governance</project>
+ <project>Apache Atlas</project>
+ <topBarEnabled>true</topBarEnabled>
+ <topBarContainerStyle>width: 68%;</topBarContainerStyle>
<sideBarEnabled>false</sideBarEnabled>
+ <leftColumnClass>span2</leftColumnClass>
+ <bodyColumnClass>span10</bodyColumnClass>
+ <googleSearch>
+ <sitesearch>http://atlas.incubator.apache.org</sitesearch>
+ </googleSearch>
+ <facebookLike/>
+ <googlePlusOne/>
</fluidoSkin>
</custom>
<bannerLeft>
- <name>DGC - Metadata</name>
- <src>./images/metadata-logo.png</src>
+ <name>Apache Atlas</name>
+ <src>./images/atlas-logo.png</src>
+ <href>http://atlas.incubator.apache.org</href>
<width>200px</width>
<height>45px</height>
</bannerLeft>
@@ -57,14 +67,63 @@
</script>
</head>
- <breadcrumbs position="left">
- <item name="MetadataGovernance" title="Apache Metadata and Governance" href="index.html"/>
+ <breadcrumbs>
+ <item name="Apache" href="http://www.apache.org"/>
+ <item name="Atlas" title="Apache Atlas" href="index.html"/>
</breadcrumbs>
+ <menu name="Atlas">
+ <item name="About" href="index.html"/>
+ <item name="Wiki" href="https://cwiki.apache.org/confluence/display/ATLAS"/>
+ <item name="News" href="https://cwiki.apache.org/confluence/display/ATLAS"/>
+ <item name="Git" href="https://git-wip-us.apache.org/repos/asf/incubator-atlas.git" />
+ <item name="Svn" href="https://svn.apache.org/repos/asf/incubator/atlas" />
+ <item name="Jira" href="https://issues.apache.org/jira/browse/ATLAS" />
+ <item name="Powered by" href="https://cwiki.apache.org/confluence/display/ATLAS/PoweredBy" />
+ <item name="Blog" href="http://blogs.apache.org/atlas/" />
+ </menu>
+
+ <menu name="Project Information">
+ <item name="Summary" href="project-info.html" />
+ <item name="Mailing Lists" href="mail-lists.html" />
+ <item name="IRC" href="http://webchat.freenode.net?channels=apacheatlas&uio=d4" />
+ <item name="Team" href="team-list.html" />
+ <item name="Issue Tracking" href="issue-tracking.html" />
+ <item name="Source Repository" href="source-repository.html" />
+ <item name="License" href="license.html" />
+ </menu>
+
+ <menu name="Releases">
+ <item name="Coming soon" href="https://cwiki.apache.org/confluence/display/ATLAS"/>
+ </menu>
+
+ <menu name="Documentation">
+ <!-- current points to latest release -->
+ <item name="current" href="index.html"/>
+ </menu>
+
+ <menu name="Resources">
+ <item name="Overview" href="index.html"/>
+ <item name="Getting Started" href="./QuickStart.html"/>
+ <item name="Architecture" href="./Architecture.html"/>
+ <item name="Installation" href="./InstallationSteps.html"/>
+ <item name="Type System" href="./TypeSystem.html"/>
+ <item name="Configuration" href="./Configuration.html"/>
+ <item name="Security" href="./Security.html"/>
+ <item name="Rest API" href="./api/rest.html"/>
+ </menu>
+
+ <menu name="ASF">
+ <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html"/>
+ <item name="Foundation" href="http://www.apache.org/foundation/"/>
+ <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+ </menu>
+
<footer>
- © 2011-2012 The Apache Software Foundation. Apache Metadata and Governance, Apache,
+ © 2011-2012 The Apache Software Foundation. Apache Atlas, Atlas, Apache,
the Apache feather logo, and the Apache Metadata and Governance project logo are
trademarks of The Apache Software Foundation.
</footer>
</body>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/caff3c20/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
new file mode 100644
index 0000000..23df1a9
--- /dev/null
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -0,0 +1,155 @@
+---++ Building & Installing Apache Atlas
+
+---+++ Building Atlas
+
+<verbatim>
+git clone https://git-wip-us.apache.org/repos/asf/incubator-atlas.git atlas
+
+cd atlas
+
+export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" && mvn clean install
+</verbatim>
+
+Once the build successfully completes, artifacts can be packaged for deployment.
+
+<verbatim>
+
+mvn clean assembly:assembly -DskipTests
+
+</verbatim>
+
+Tar can be found in atlas/target/apache-atlas-${project.version}-bin.tar.gz
+
+Tar is structured as follows
+
+<verbatim>
+
+|- bin
+ |- atlas_start.py
+ |- atlas_stop.py
+ |- atlas_config.py
+ |- quick_start.py
+ |- cputil.py
+|- conf
+ |- application.properties
+ |- client.properties
+ |- atlas-env.sh
+ |- log4j.xml
+|- docs
+|- server
+ |- webapp
+ |- atlas.war
+|- README
+|- NOTICE.txt
+|- LICENSE.txt
+|- DISCLAIMER.txt
+|- CHANGES.txt
+
+</verbatim>
+
+---+++ Installing & Running Atlas
+
+*Installing Atlas*
+<verbatim>
+tar -xzvf apache-atlas-${project.version}-bin.tar.gz
+* cd atlas-${project.version}
+</verbatim>
+
+*Configuring Atlas*
+
+By default config directory used by Atlas is {package dir}/conf. To override this set environment
+variable METADATA_CONF to the path of the conf dir.
+
+atlas-env.sh has been added to the Atlas conf. This file can be used to set various environment
+variables that you need for you services. In addition you can set any other environment
+variables you might need. This file will be sourced by atlas scripts before any commands are
+executed. The following environment variables are available to set.
+
+<verbatim>
+# The java implementation to use. If JAVA_HOME is not found we expect java and jar to be in path
+#export JAVA_HOME=
+
+# any additional java opts you want to set. This will apply to both client and server operations
+#export METADATA_OPTS=
+
+# any additional java opts that you want to set for client only
+#export METADATA_CLIENT_OPTS=
+
+# java heap size we want to set for the client. Default is 1024MB
+#export METADATA_CLIENT_HEAP=
+
+# any additional opts you want to set for atlas service.
+#export METADATA_SERVER_OPTS=
+
+# java heap size we want to set for the atlas server. Default is 1024MB
+#export METADATA_SERVER_HEAP=
+
+# What is is considered as atlas home dir. Default is the base locaion of the installed software
+#export METADATA_HOME_DIR=
+
+# Where log files are stored. Defatult is logs directory under the base install location
+#export METADATA_LOG_DIR=
+
+# Where pid files are stored. Defatult is logs directory under the base install location
+#export METADATA_PID_DIR=
+
+# where the atlas titan db data is stored. Defatult is logs/data directory under the base install location
+#export METADATA_DATA_DIR=
+
+# Where do you want to expand the war file. By Default it is in /server/webapp dir under the base install dir.
+#export METADATA_EXPANDED_WEBAPP_DIR=
+</verbatim>
+
+
+*NOTE for Mac OS users*
+<verbatim>
+If you are using a Mac OS, you will need to configure the METADATA_SERVER_OPTS (explained above).
+
+In {package dir}/conf/atlas-env.sh uncomment the following line
+#export METADATA_SERVER_OPTS=
+
+and change it to look as below
+export METADATA_SERVER_OPTS="-Djava.awt.headless=true -Djava.security.krb5.realm= -Djava.security.krb5.kdc="
+</verbatim>
+
+*Starting Atlas Server*
+<verbatim>
+bin/atlas_start.py [-port <port>]
+</verbatim>
+
+By default,
+* To change the port, use -port option.
+* atlas server starts with conf from {package dir}/conf. To override this (to use the same conf
+with multiple atlas upgrades), set environment variable METADATA_CONF to the path of conf dir
+
+*Using Atlas*
+<verbatim>
+* Verify if the server is up and running
+ curl -v http://localhost:21000/api/atlas/admin/version
+ {"Version":"v0.1"}
+
+* List the types in the repository
+ curl -v http://localhost:21000/api/atlas/types
+ {"list":["biginteger","short","byte","int","string","bigdecimal","boolean","date","double","long","float"],"requestId":"902580786@qtp-1479771328-0"}
+
+* List the instances for a given type
+ curl -v http://localhost:21000/api/atlas/entities?type=hive_table
+ {"requestId":"788558007@qtp-44808654-5","list":["cb9b5513-c672-42cb-8477-b8f3e537a162","ec985719-a794-4c98-b98f-0509bd23aac0","48998f81-f1d3-45a2-989a-223af5c1ed6e","a54b386e-c759-4651-8779-a099294244c4"]}
+
+ curl -v http://localhost:21000/api/atlas/entities/list/hive_db
+
+* Search for entities (instances) in the repository
+ curl -v http://localhost:21000/api/atlas/discovery/search/dsl?query="from hive_table"
+</verbatim>
+
+
+*Dashboard*
+
+Once atlas is started, you can view the status of atlas entities using the Web-based
+dashboard. \You can open your browser at the corresponding port to use the web UI.
+
+
+*Stopping Atlas Server*
+<verbatim>
+bin/atlas_stop.py
+</verbatim>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/caff3c20/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b7b40de..0342ab6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
<description>Metadata Management and Data Governance Platform over Hadoop</description>
<name>apache-atlas</name>
<packaging>pom</packaging>
- <url>http://www.apache.org/</url>
+ <url>http://atlas.incubator.apache.org</url>
<prerequisites>
<maven>3.0.4</maven>
@@ -54,22 +54,268 @@
<issueManagement>
<system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/XXX</url>
+ <url>https://issues.apache.org/jira/browse/ATLAS</url>
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://builds.apache.org/job/XXX</url>
+ <url>https://builds.apache.org/job/atlas</url>
</ciManagement>
<inceptionYear>2015</inceptionYear>
+ <mailingLists>
+ <mailingList>
+ <name>atlas-dev</name>
+ <subscribe>dev-subscribe@atlas.incubator.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@atlas.incubator.apache.org</unsubscribe>
+ <post>dev@atlas.incubator.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/atlas-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>atlas-commits</name>
+ <subscribe>commits-subscribe@atlas.incubator.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@atlas.incubator.apache.org</unsubscribe>
+ <post>commits@atlas.incubator.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/atlas-commits/</archive>
+ </mailingList>
+ </mailingLists>
+
<scm>
- <connection>scm:git:https://github.com/apache/incubator-atlas</connection>
- <developerConnection>scm:git:https://github.com/apache/incubator-atlas</developerConnection>
- <url>https://github.com/apache/incubator-atlas</url>
+ <connection>scm:https://git-wip-us.apache.org/repos/asf/incubator-atlas.git</connection>
+ <developerConnection>scm:https://git-wip-us.apache.org/repos/asf/incubator-atlas.git</developerConnection>
+ <tag>HEAD</tag>
+ <url>https://git-wip-us.apache.org/repos/asf/incubator-atlas.git</url>
</scm>
+ <developers>
+ <developer>
+ <id>venkatesh</id>
+ <name>Venkatesh Seetharam</name>
+ <email>venkatesh@apache.org</email>
+ <timezone>-8</timezone>
+ <roles>
+ <role>committer</role>
+ <role>PPMC</role>
+ </roles>
+ <organization>Hortonworks Inc.</organization>
+ <!--<organizationUrl>http://www.hortonworks.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>rhbutani</id>
+ <name>Harish Butani</name>
+ <email>rhbutani@apache.org</email>
+ <timezone>-8</timezone>
+ <roles>
+ <role>committer</role>
+ <role>PPMC</role>
+ </roles>
+ <organization>Hortonworks Inc.</organization>
+ <!--<organizationUrl>http://www.hortonworks.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>shwethags</id>
+ <name>Shwetha GS</name>
+ <email>shwethags@apache.org</email>
+ <timezone>+05:30</timezone>
+ <roles>
+ <role>committer</role>
+ <role>PPMC</role>
+ </roles>
+ <organization>Hortonworks Inc.</organization>
+ <!--<organizationUrl>http://www.hortonworks.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>jmaron</id>
+ <name>Jon Maron</name>
+ <email>jmaron@hortonworks.com</email>
+ <timezone>-5</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Hortonworks Inc.</organization>
+ <!--<organizationUrl>http://www.hortonworks.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>AAhn</id>
+ <name>Andrew Ahn</name>
+ <email>aahn@hortonworks.com</email>
+ <timezone>-8</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Hortonworks Inc.</organization>
+ <!--<organizationUrl>http://www.hortonworks.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>dkaspar</id>
+ <name>David Kaspar</name>
+ <email>dkaspar@merk.com</email>
+ <timezone>+1</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Merck & Co Inc.</organization>
+ <!--<organizationUrl>http://www.merck.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>ilasek</id>
+ <name>Ivo Lasek</name>
+ <email>ilasek@merck.com</email>
+ <timezone>+1</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Merck & Co Inc.</organization>
+ <!--<organizationUrl>http://www.merck.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>dfusaro</id>
+ <name>Dennis Fusaro</name>
+ <email>dfusaro@aetna.com</email>
+ <timezone>-5</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Aetna Inc.</organization>
+ <!--<organizationUrl>http://www.aetna.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>chyzer</id>
+ <name>Chris Hyzer</name>
+ <email>chyzer@aetna.com</email>
+ <timezone>-5</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Aetna Inc.</organization>
+ <!--<organizationUrl>http://www.aetna.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>dmarkwat</id>
+ <name>Daniel Markwat</name>
+ <email>dmarkwat@aetna.com</email>
+ <timezone>-5</timezone>
+ <roles>
+ <role>committer</role>
+
+ </roles>
+ <organization>Aetna Inc.</organization>
+ <!--<organizationUrl>http://www.aetna.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>gsenia</id>
+ <name>Greg Senia</name>
+ <email>gsenia@aetna.com</email>
+ <timezone>-5</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Aetna Inc.</organization>
+ <!--<organizationUrl>http://www.aetna.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>james</id>
+ <name>James Vollmer</name>
+ <email>james@target.com</email>
+ <timezone>-6</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Target Inc.</organization>
+ <!--<organizationUrl>http://www.target.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>adossett</id>
+ <name>Aaron Dossett</name>
+ <email>adossett@target.com</email>
+ <timezone>-6</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Target Inc.</organization>
+ <!--<organizationUrl>http://www.target.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>mschussler</id>
+ <name>Mitch Schussler</name>
+ <email>mschussler@apache.org</email>
+ <timezone>-5</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>JPMC</organization>
+ <!--<organizationUrl>http://</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>vavasarala</id>
+ <name>Viswanath Avasarala</name>
+ <email>vavasarala@slb.com</email>
+ <timezone>-6</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Schlumberger Inc.</organization>
+ <!--<organizationUrl>http://www.slb.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>avarma</id>
+ <name>Anil Varma</name>
+ <email>avarma@slb.com</email>
+ <timezone>-6</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Schlumberger Inc.</organization>
+ <!--<organizationUrl>http://www.slb.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>bstortz</id>
+ <name>Barbara Stortz</name>
+ <email>bstortz@sap</email>
+ <timezone>-8</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>SAP Inc.</organization>
+ <!--<organizationUrl>http://www.sap.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>sriksun</id>
+ <name>Srikanth Sundarrajan</name>
+ <email>sriksun@apache.org</email>
+ <timezone>+05:30</timezone>
+ <roles>
+ <role>committer</role>
+ <role>PPMC</role>
+ </roles>
+ <organization>InMobi</organization>
+ <!--<organizationUrl>http://www.inmobi.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>ssuresh</id>
+ <name>Suresh Srinivas</name>
+ <email> ssuresh@apache.org</email>
+ <timezone>-8</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Hortonworks Inc.</organization>
+ <!--<organizationUrl>http://www.hortonworks.com</organizationUrl>-->
+ </developer>
+ <developer>
+ <id>vranganathan</id>
+ <name>Venkat Ranganathan</name>
+ <email> vranganathan@apache.org</email>
+ <timezone>-8</timezone>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <organization>Hortonworks Inc.</organization>
+ <!--<organizationUrl>http://www.hortonworks.com</organizationUrl>-->
+ </developer>
+ </developers>
+
<properties>
<!-- platform encoding override -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -474,6 +720,10 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
+ <exclusion> <!-- GPL license imported from ganglia -->
+ <groupId>org.acplt</groupId>
+ <artifactId>oncrpc</artifactId>
+ </exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/caff3c20/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 6fa010a..237528a 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -13,6 +13,7 @@ ATLAS-10 Update trunk version to 0.6-incubating-SNAPSHOT (shwethags)
ALL CHANGES:
+ATLAS-13 Add project website (Venkatesh Seetharam)
ATLAS-12 Update the copyright in Notice and License files (Venkatesh Seetharam)
ATLAS-9 Create branch-0.5 and update version to 0.5-incubating (shwethags)
ATLAS-14 Change the github repo url in installation steps to point to Apache repo (ajayyadava via shwethags)
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/caff3c20/src/conf/atlas-env.sh
----------------------------------------------------------------------
diff --git a/src/conf/atlas-env.sh b/src/conf/atlas-env.sh
index e425969..4b82e0c 100644
--- a/src/conf/atlas-env.sh
+++ b/src/conf/atlas-env.sh
@@ -27,13 +27,13 @@
# java heap size we want to set for the client. Default is 1024MB
#export METADATA_CLIENT_HEAP=
-# any additional opts you want to set for falcon service.
+# any additional opts you want to set for atlas service.
#export METADATA_SERVER_OPTS=
-# java heap size we want to set for the falcon server. Default is 1024MB
+# java heap size we want to set for the atlas server. Default is 1024MB
#export METADATA_SERVER_HEAP=
-# What is is considered as falcon home dir. Default is the base locaion of the installed software
+# What is is considered as atlas home dir. Default is the base locaion of the installed software
#export METADATA_HOME_DIR=
# Where log files are stored. Defatult is logs directory under the base install location
@@ -42,7 +42,7 @@
# Where pid files are stored. Defatult is logs directory under the base install location
#export METADATA_PID_DIR=
-# where the falcon active mq data is stored. Defatult is logs/data directory under the base install location
+# where the atlas titan db data is stored. Defatult is logs/data directory under the base install location
#export METADATA_DATA_DIR=
# Where do you want to expand the war file. By Default it is in /server/webapp dir under the base install dir.