Repository: incubator-atlas Updated Branches: refs/heads/dal [created] 1866666b2
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/src/test/python/scripts/TestMetadata.py ---------------------------------------------------------------------- diff --git a/src/test/python/scripts/TestMetadata.py b/src/test/python/scripts/TestMetadata.py index 3c54d8e..92cfe8b 100644 --- a/src/test/python/scripts/TestMetadata.py +++ b/src/test/python/scripts/TestMetadata.py @@ -22,7 +22,7 @@ import sys from mock import patch import unittest import logging -import metadata_config as mc +import atlas_config as mc import metadata_start as metadata import platform @@ -47,13 +47,13 @@ class TestMetadata(unittest.TestCase): self.assertTrue(java_mock.called) if IS_WINDOWS: java_mock.assert_called_with( - 'org.apache.hadoop.metadata.Main', + 'org.apache.atlas.Main', ['-app', 'metadata_home/server/webapp/metadata'], 'metadata_home/conf:metadata_home/server/webapp/metadata/WEB-INF/classes:metadata_home/server/webapp/metadata/WEB-INF/lib\\*:metadata_home/libext\\*', ['-Dmetadata.log.dir=metadata_home/logs', '-Dmetadata.log.file=application.log', '-Dmetadata.home=metadata_home', '-Dmetadata.conf=metadata_home/conf', '-Xmx1024m'], 'metadata_home/logs') else: java_mock.assert_called_with( - 'org.apache.hadoop.metadata.Main', + 'org.apache.atlas.Main', ['-app', 'metadata_home/server/webapp/metadata'], 'metadata_home/conf:metadata_home/server/webapp/metadata/WEB-INF/classes:metadata_home/server/webapp/metadata/WEB-INF/lib/*:metadata_home/libext/*', ['-Dmetadata.log.dir=metadata_home/logs', '-Dmetadata.log.file=application.log', '-Dmetadata.home=metadata_home', '-Dmetadata.conf=metadata_home/conf', '-Xmx1024m'], 'metadata_home/logs') http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index b40c9e0..90fd396 100755 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -24,24 +24,24 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.hadoop.metadata</groupId> - <artifactId>metadata-governance</artifactId> + <groupId>org.apache.atlas</groupId> + <artifactId>apache-atlas</artifactId> <version>0.1-incubating-SNAPSHOT</version> </parent> - <artifactId>metadata-tools</artifactId> - <description>Apache Metadata Type System Tools Module</description> - <name>Apache Metadata Type System Tools</name> + <artifactId>atlas-tools</artifactId> + <description>Apache Atlas Type System Tools Module</description> + <name>Apache Atlas Type System Tools</name> <packaging>jar</packaging> <dependencies> <dependency> - <groupId>org.apache.hadoop.metadata</groupId> - <artifactId>metadata-typesystem</artifactId> + <groupId>org.apache.atlas</groupId> + <artifactId>atlas-typesystem</artifactId> </dependency> <dependency> - <groupId>org.apache.hadoop.metadata</groupId> - <artifactId>metadata-repository</artifactId> + <groupId>org.apache.atlas</groupId> + <artifactId>atlas-repository</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/tools/src/main/scala/org/apache/atlas/tools/cli/Console.scala ---------------------------------------------------------------------- diff --git a/tools/src/main/scala/org/apache/atlas/tools/cli/Console.scala b/tools/src/main/scala/org/apache/atlas/tools/cli/Console.scala new file mode 100755 index 0000000..df10239 --- /dev/null +++ b/tools/src/main/scala/org/apache/atlas/tools/cli/Console.scala @@ -0,0 +1,67 @@ +/* + * 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.atlas.tools.cli + +import org.apache.atlas.repository.memory.MemRepository +import org.apache.atlas.typesystem.types.TypeSystem + +import scala.tools.nsc.Settings +import scala.tools.nsc.interpreter.{ILoop, IMain} + +object Console extends App { + val settings = new Settings + settings.usejavacp.value = true + settings.deprecation.value = true + settings.bootclasspath.value += """/Users/hbutani/.m2/repository/org/apache/atlas/1.0-SNAPSHOT/atlas-1.0-SNAPSHOT.jar:/Users/hbutani/.m2/repository/org/scala-lang/scala-compiler/2.10.4/scala-compiler-2.10.4.jar:/Users/hbutani/.m2/repository/org/scala-lang/scala-reflect/2.10.4/scala-reflect-2.10.4.jar:/Users/hbutani/.m2/repository/org/scala-lang/jline/2.10.4/jline-2.10.4.jar:/Users/hbutani/.m2/repository/org/fusesource/jansi/jansi/1.4/jansi-1.4.jar:/Users/hbutani/.m2/repository/org/scala-lang/scala-library/2.10.4/scala-library-2.10.4.jar:/Users/hbutani/.m2/repository/org/scala-lang/scala-actors/2.10.4/scala-actors-2.10.4.jar:/Users/hbutani/.m2/repository/org/scala-lang/scalap/2.10.4/scalap-2.10.4.jar:/Users/hbutani/.m2/repository/org/scalatest/scalatest_2.10/2.2.0/scalatest_2.10-2.2.0.jar:/Users/hbutani/.m2/repository/org/scalamacros/quasiquotes_2.10/2.0.1/quasiquotes_2.10-2.0.1.jar:/Users/hbutani/.m2/repository/org/json4s/json4s-native_2.10/3.2.11/json4s-native_2.10-3.2.11.jar:/ Users/hbutani/.m2/repository/org/json4s/json4s-core_2.10/3.2.11/json4s-core_2.10-3.2.11.jar:/Users/hbutani/.m2/repository/org/json4s/json4s-ast_2.10/3.2.11/json4s-ast_2.10-3.2.11.jar:/Users/hbutani/.m2/repository/com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.jar:/Users/hbutani/.m2/repository/com/github/nscala-time/nscala-time_2.10/1.6.0/nscala-time_2.10-1.6.0.jar:/Users/hbutani/.m2/repository/joda-time/joda-time/2.5/joda-time-2.5.jar:/Users/hbutani/.m2/repository/org/joda/joda-convert/1.2/joda-convert-1.2.jar:/Users/hbutani/.m2/repository/com/typesafe/config/1.2.1/config-1.2.1.jar:/Users/hbutani/.m2/repository/com/typesafe/akka/akka-actor_2.10/2.3.7/akka-actor_2.10-2.3.7.jar:/Users/hbutani/.m2/repository/com/typesafe/akka/akka-testkit_2.10/2.3.7/akka-testkit_2.10-2.3.7.jar:/Users/hbutani/.m2/repository/com/typesafe/akka/akka-slf4j_2.10/2.3.7/akka-slf4j_2.10-2.3.7.jar:/Users/hbutani/.m2/repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar:/Users/hbutani/.m2/repository/io /spray/spray-routing/1.3.1/spray-routing-1.3.1.jar:/Users/hbutani/.m2/repository/io/spray/spray-http/1.3.1/spray-http-1.3.1.jar:/Users/hbutani/.m2/repository/org/parboiled/parboiled-scala_2.10/1.1.6/parboiled-scala_2.10-1.1.6.jar:/Users/hbutani/.m2/repository/org/parboiled/parboiled-core/1.1.6/parboiled-core-1.1.6.jar:/Users/hbutani/.m2/repository/io/spray/spray-util/1.3.1/spray-util-1.3.1.jar:/Users/hbutani/.m2/repository/com/chuusai/shapeless_2.10/1.2.4/shapeless_2.10-1.2.4.jar:/Users/hbutani/.m2/repository/io/spray/spray-can/1.3.1/spray-can-1.3.1.jar:/Users/hbutani/.m2/repository/io/spray/spray-io/1.3.1/spray-io-1.3.1.jar:/Users/hbutani/.m2/repository/io/spray/spray-httpx/1.3.1/spray-httpx-1.3.1.jar:/Users/hbutani/.m2/repository/org/jvnet/mimepull/mimepull/1.9.4/mimepull-1.9.4.jar:/Users/hbutani/.m2/repository/io/spray/spray-testkit/1.3.1/spray-testkit-1.3.1.jar:/Users/hbutani/.m2/repository/com/google/guava/guava/11.0.2/guava-11.0.2.jar:/Users/hbutani/.m2/repository/com/google/c ode/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar:/Users/hbutani/.m2/repository/junit/junit/4.10/junit-4.10.jar:/Users/hbutani/.m2/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar""" + + val in = new IMain(settings) { + override protected def parentClassLoader = settings.getClass.getClassLoader() + } + + new SampleILoop().process(settings) +} + +class SampleILoop extends ILoop { + val ts: TypeSystem = TypeSystem.getInstance() + + //intp = Console.in + val mr: MemRepository = new MemRepository(ts) + + override def prompt = "==> " + + addThunk { + intp.beQuietDuring { + intp.addImports("java.lang.Math._") + intp.addImports("org.json4s.native.Serialization.{read, write => swrite}") + intp.addImports("org.json4s._") + intp.addImports("org.json4s.native.JsonMethods._") + intp.addImports("org.apache.atlas.tools.dsl._") + //intp.bindValue("service", ms) + //intp.bindValue("cp", intp.compilerClasspath) + } + } + + override def printWelcome() { + echo("\n" + + " \\,,,/\n" + + " (o o)\n" + + "-----oOOo-(_)-oOOo-----") + } + +} http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/tools/src/main/scala/org/apache/hadoop/metadata/tools/cli/Console.scala ---------------------------------------------------------------------- diff --git a/tools/src/main/scala/org/apache/hadoop/metadata/tools/cli/Console.scala b/tools/src/main/scala/org/apache/hadoop/metadata/tools/cli/Console.scala deleted file mode 100755 index c23fb65..0000000 --- a/tools/src/main/scala/org/apache/hadoop/metadata/tools/cli/Console.scala +++ /dev/null @@ -1,67 +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.hadoop.metadata.tools.cli - -import org.apache.hadoop.metadata.repository.memory.MemRepository -import org.apache.hadoop.metadata.typesystem.types.TypeSystem - -import scala.tools.nsc.Settings -import scala.tools.nsc.interpreter.{ILoop, IMain} - -object Console extends App { - val settings = new Settings - settings.usejavacp.value = true - settings.deprecation.value = true - settings.bootclasspath.value += """/Users/hbutani/.m2/repository/org/apache/metadata/1.0-SNAPSHOT/metadata-1.0-SNAPSHOT.jar:/Users/hbutani/.m2/repository/org/scala-lang/scala-compiler/2.10.4/scala-compiler-2.10.4.jar:/Users/hbutani/.m2/repository/org/scala-lang/scala-reflect/2.10.4/scala-reflect-2.10.4.jar:/Users/hbutani/.m2/repository/org/scala-lang/jline/2.10.4/jline-2.10.4.jar:/Users/hbutani/.m2/repository/org/fusesource/jansi/jansi/1.4/jansi-1.4.jar:/Users/hbutani/.m2/repository/org/scala-lang/scala-library/2.10.4/scala-library-2.10.4.jar:/Users/hbutani/.m2/repository/org/scala-lang/scala-actors/2.10.4/scala-actors-2.10.4.jar:/Users/hbutani/.m2/repository/org/scala-lang/scalap/2.10.4/scalap-2.10.4.jar:/Users/hbutani/.m2/repository/org/scalatest/scalatest_2.10/2.2.0/scalatest_2.10-2.2.0.jar:/Users/hbutani/.m2/repository/org/scalamacros/quasiquotes_2.10/2.0.1/quasiquotes_2.10-2.0.1.jar:/Users/hbutani/.m2/repository/org/json4s/json4s-native_2.10/3.2.11/json4s-native_2.10-3.2.11 .jar:/Users/hbutani/.m2/repository/org/json4s/json4s-core_2.10/3.2.11/json4s-core_2.10-3.2.11.jar:/Users/hbutani/.m2/repository/org/json4s/json4s-ast_2.10/3.2.11/json4s-ast_2.10-3.2.11.jar:/Users/hbutani/.m2/repository/com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.jar:/Users/hbutani/.m2/repository/com/github/nscala-time/nscala-time_2.10/1.6.0/nscala-time_2.10-1.6.0.jar:/Users/hbutani/.m2/repository/joda-time/joda-time/2.5/joda-time-2.5.jar:/Users/hbutani/.m2/repository/org/joda/joda-convert/1.2/joda-convert-1.2.jar:/Users/hbutani/.m2/repository/com/typesafe/config/1.2.1/config-1.2.1.jar:/Users/hbutani/.m2/repository/com/typesafe/akka/akka-actor_2.10/2.3.7/akka-actor_2.10-2.3.7.jar:/Users/hbutani/.m2/repository/com/typesafe/akka/akka-testkit_2.10/2.3.7/akka-testkit_2.10-2.3.7.jar:/Users/hbutani/.m2/repository/com/typesafe/akka/akka-slf4j_2.10/2.3.7/akka-slf4j_2.10-2.3.7.jar:/Users/hbutani/.m2/repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar:/Users/hbutani/.m2/reposit ory/io/spray/spray-routing/1.3.1/spray-routing-1.3.1.jar:/Users/hbutani/.m2/repository/io/spray/spray-http/1.3.1/spray-http-1.3.1.jar:/Users/hbutani/.m2/repository/org/parboiled/parboiled-scala_2.10/1.1.6/parboiled-scala_2.10-1.1.6.jar:/Users/hbutani/.m2/repository/org/parboiled/parboiled-core/1.1.6/parboiled-core-1.1.6.jar:/Users/hbutani/.m2/repository/io/spray/spray-util/1.3.1/spray-util-1.3.1.jar:/Users/hbutani/.m2/repository/com/chuusai/shapeless_2.10/1.2.4/shapeless_2.10-1.2.4.jar:/Users/hbutani/.m2/repository/io/spray/spray-can/1.3.1/spray-can-1.3.1.jar:/Users/hbutani/.m2/repository/io/spray/spray-io/1.3.1/spray-io-1.3.1.jar:/Users/hbutani/.m2/repository/io/spray/spray-httpx/1.3.1/spray-httpx-1.3.1.jar:/Users/hbutani/.m2/repository/org/jvnet/mimepull/mimepull/1.9.4/mimepull-1.9.4.jar:/Users/hbutani/.m2/repository/io/spray/spray-testkit/1.3.1/spray-testkit-1.3.1.jar:/Users/hbutani/.m2/repository/com/google/guava/guava/11.0.2/guava-11.0.2.jar:/Users/hbutani/.m2/repository/com/go ogle/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar:/Users/hbutani/.m2/repository/junit/junit/4.10/junit-4.10.jar:/Users/hbutani/.m2/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar""" - - val in = new IMain(settings) { - override protected def parentClassLoader = settings.getClass.getClassLoader() - } - - new SampleILoop().process(settings) -} - -class SampleILoop extends ILoop { - val ts: TypeSystem = TypeSystem.getInstance() - - //intp = Console.in - val mr: MemRepository = new MemRepository(ts) - - override def prompt = "==> " - - addThunk { - intp.beQuietDuring { - intp.addImports("java.lang.Math._") - intp.addImports("org.json4s.native.Serialization.{read, write => swrite}") - intp.addImports("org.json4s._") - intp.addImports("org.json4s.native.JsonMethods._") - intp.addImports("org.apache.hadoop.metadata.tools.dsl._") - //intp.bindValue("service", ms) - //intp.bindValue("cp", intp.compilerClasspath) - } - } - - override def printWelcome() { - echo("\n" + - " \\,,,/\n" + - " (o o)\n" + - "-----oOOo-(_)-oOOo-----") - } - -} http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/typesystem/pom.xml ---------------------------------------------------------------------- diff --git a/typesystem/pom.xml b/typesystem/pom.xml index 9842f84..e875f23 100755 --- a/typesystem/pom.xml +++ b/typesystem/pom.xml @@ -24,13 +24,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.hadoop.metadata</groupId> - <artifactId>metadata-governance</artifactId> + <groupId>org.apache.atlas</groupId> + <artifactId>apache-atlas</artifactId> <version>0.1-incubating-SNAPSHOT</version> </parent> - <artifactId>metadata-typesystem</artifactId> - <description>Apache Metadata Typesystem Module</description> - <name>Apache Metadata Typesystem</name> + <artifactId>atlas-typesystem</artifactId> + <description>Apache Atlas Typesystem Module</description> + <name>Apache Atlas Typesystem</name> <packaging>jar</packaging> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/typesystem/src/main/java/org/apache/atlas/typesystem/ITypedInstance.java ---------------------------------------------------------------------- diff --git a/typesystem/src/main/java/org/apache/atlas/typesystem/ITypedInstance.java b/typesystem/src/main/java/org/apache/atlas/typesystem/ITypedInstance.java new file mode 100755 index 0000000..5ea76a1 --- /dev/null +++ b/typesystem/src/main/java/org/apache/atlas/typesystem/ITypedInstance.java @@ -0,0 +1,85 @@ +/** + * 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.atlas.typesystem; + +import org.apache.atlas.MetadataException; +import org.apache.atlas.typesystem.types.FieldMapping; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Date; + +/** + * An instance whose structure is associated with a IDataType. + * This is obtained by a call to 'createInstance' or the result of a Query. + * A ITypedInstance can only contain information on attributes of the associated Type. + * Instance can still be invalid because of missing required fields or incorrect multiplicity. + * But user can only get/set on a known field of the associated type. Type values have to match + * the IDataType of the associated attribute. + */ +public interface ITypedInstance extends IInstance { + + FieldMapping fieldMapping(); + + void setNull(String attrName) throws MetadataException; + + boolean getBoolean(String attrName) throws MetadataException; + + byte getByte(String attrName) throws MetadataException; + + short getShort(String attrName) throws MetadataException; + + int getInt(String attrName) throws MetadataException; + + long getLong(String attrName) throws MetadataException; + + float getFloat(String attrName) throws MetadataException; + + double getDouble(String attrName) throws MetadataException; + + BigInteger getBigInt(String attrName) throws MetadataException; + + BigDecimal getBigDecimal(String attrName) throws MetadataException; + + Date getDate(String attrName) throws MetadataException; + + String getString(String attrName) throws MetadataException; + + void setBoolean(String attrName, boolean val) throws MetadataException; + + void setByte(String attrName, byte val) throws MetadataException; + + void setShort(String attrName, short val) throws MetadataException; + + void setInt(String attrName, int val) throws MetadataException; + + void setLong(String attrName, long val) throws MetadataException; + + void setFloat(String attrName, float val) throws MetadataException; + + void setDouble(String attrName, double val) throws MetadataException; + + void setBigInt(String attrName, BigInteger val) throws MetadataException; + + void setBigDecimal(String attrName, BigDecimal val) throws MetadataException; + + void setDate(String attrName, Date val) throws MetadataException; + + void setString(String attrName, String val) throws MetadataException; +} http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/typesystem/src/main/java/org/apache/hadoop/metadata/typesystem/ITypedInstance.java ---------------------------------------------------------------------- diff --git a/typesystem/src/main/java/org/apache/hadoop/metadata/typesystem/ITypedInstance.java b/typesystem/src/main/java/org/apache/hadoop/metadata/typesystem/ITypedInstance.java deleted file mode 100755 index 206ef2a..0000000 --- a/typesystem/src/main/java/org/apache/hadoop/metadata/typesystem/ITypedInstance.java +++ /dev/null @@ -1,85 +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.hadoop.metadata.typesystem; - -import org.apache.hadoop.metadata.MetadataException; -import org.apache.hadoop.metadata.typesystem.types.FieldMapping; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Date; - -/** - * An instance whose structure is associated with a IDataType. - * This is obtained by a call to 'createInstance' or the result of a Query. - * A ITypedInstance can only contain information on attributes of the associated Type. - * Instance can still be invalid because of missing required fields or incorrect multiplicity. - * But user can only get/set on a known field of the associated type. Type values have to match - * the IDataType of the associated attribute. - */ -public interface ITypedInstance extends IInstance { - - FieldMapping fieldMapping(); - - public void setNull(String attrName) throws MetadataException; - - public boolean getBoolean(String attrName) throws MetadataException; - - public byte getByte(String attrName) throws MetadataException; - - public short getShort(String attrName) throws MetadataException; - - public int getInt(String attrName) throws MetadataException; - - public long getLong(String attrName) throws MetadataException; - - public float getFloat(String attrName) throws MetadataException; - - public double getDouble(String attrName) throws MetadataException; - - public BigInteger getBigInt(String attrName) throws MetadataException; - - public BigDecimal getBigDecimal(String attrName) throws MetadataException; - - public Date getDate(String attrName) throws MetadataException; - - public String getString(String attrName) throws MetadataException; - - public void setBoolean(String attrName, boolean val) throws MetadataException; - - public void setByte(String attrName, byte val) throws MetadataException; - - public void setShort(String attrName, short val) throws MetadataException; - - public void setInt(String attrName, int val) throws MetadataException; - - public void setLong(String attrName, long val) throws MetadataException; - - public void setFloat(String attrName, float val) throws MetadataException; - - public void setDouble(String attrName, double val) throws MetadataException; - - public void setBigInt(String attrName, BigInteger val) throws MetadataException; - - public void setBigDecimal(String attrName, BigDecimal val) throws MetadataException; - - public void setDate(String attrName, Date val) throws MetadataException; - - public void setString(String attrName, String val) throws MetadataException; -} http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/typesystem/src/main/resources/application.properties ---------------------------------------------------------------------- diff --git a/typesystem/src/main/resources/application.properties b/typesystem/src/main/resources/application.properties index e14d13a..29c933f 100644 --- a/typesystem/src/main/resources/application.properties +++ b/typesystem/src/main/resources/application.properties @@ -18,8 +18,8 @@ ######### Graph Database Configs ######### # Graph Storage -metadata.graph.storage.backend=inmemory +atlas.graph.storage.backend=inmemory # Graph Search Index -metadata.graph.index.search.backend=lucene -metadata.graph.index.search.directory=target/data/lucene +atlas.graph.index.search.backend=lucene +atlas.graph.index.search.directory=target/data/lucene http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/typesystem/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/typesystem/src/main/resources/log4j.xml b/typesystem/src/main/resources/log4j.xml index 7254fad..742f674 100755 --- a/typesystem/src/main/resources/log4j.xml +++ b/typesystem/src/main/resources/log4j.xml @@ -64,7 +64,7 @@ <appender-ref ref="console"/> </logger> - <logger name="org.apache.hadoop.metadata" additivity="false"> + <logger name="org.apache.atlas" additivity="false"> <level value="debug"/> <appender-ref ref="console"/> </logger> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/typesystem/src/test/resources/sampleTypes.json ---------------------------------------------------------------------- diff --git a/typesystem/src/test/resources/sampleTypes.json b/typesystem/src/test/resources/sampleTypes.json index 5ebab67..d0ac311 100755 --- a/typesystem/src/test/resources/sampleTypes.json +++ b/typesystem/src/test/resources/sampleTypes.json @@ -324,7 +324,7 @@ "B", "C" ], - "hierarchicalMetaTypeName": "org.apache.hadoop.metadata.types.TraitType", + "hierarchicalMetaTypeName": "org.apache.atlas.types.TraitType", "typeName": "D", "attributeDefinitions": [ { @@ -339,7 +339,7 @@ { "superTypes": [ ], - "hierarchicalMetaTypeName": "org.apache.hadoop.metadata.types.TraitType", + "hierarchicalMetaTypeName": "org.apache.atlas.types.TraitType", "typeName": "A", "attributeDefinitions": [ { @@ -376,7 +376,7 @@ "superTypes": [ "A" ], - "hierarchicalMetaTypeName": "org.apache.hadoop.metadata.types.TraitType", + "hierarchicalMetaTypeName": "org.apache.atlas.types.TraitType", "typeName": "B", "attributeDefinitions": [ { @@ -392,7 +392,7 @@ "superTypes": [ "A" ], - "hierarchicalMetaTypeName": "org.apache.hadoop.metadata.types.TraitType", + "hierarchicalMetaTypeName": "org.apache.atlas.types.TraitType", "typeName": "C", "attributeDefinitions": [ { @@ -407,7 +407,7 @@ { "superTypes": [ ], - "hierarchicalMetaTypeName": "org.apache.hadoop.metadata.types.TraitType", + "hierarchicalMetaTypeName": "org.apache.atlas.types.TraitType", "typeName": "SecurityClearance", "attributeDefinitions": [ { @@ -425,7 +425,7 @@ "superTypes": [ "Person" ], - "hierarchicalMetaTypeName": "org.apache.hadoop.metadata.types.ClassType", + "hierarchicalMetaTypeName": "org.apache.atlas.types.ClassType", "typeName": "Manager", "attributeDefinitions": [ { @@ -440,7 +440,7 @@ { "superTypes": [ ], - "hierarchicalMetaTypeName": "org.apache.hadoop.metadata.types.ClassType", + "hierarchicalMetaTypeName": "org.apache.atlas.types.ClassType", "typeName": "Department", "attributeDefinitions": [ { @@ -462,7 +462,7 @@ { "superTypes": [ ], - "hierarchicalMetaTypeName": "org.apache.hadoop.metadata.types.ClassType", + "hierarchicalMetaTypeName": "org.apache.atlas.types.ClassType", "typeName": "t4", "attributeDefinitions": [ { @@ -603,7 +603,7 @@ { "superTypes": [ ], - "hierarchicalMetaTypeName": "org.apache.hadoop.metadata.types.ClassType", + "hierarchicalMetaTypeName": "org.apache.atlas.types.ClassType", "typeName": "Person", "attributeDefinitions": [ { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index f305c53..e200b69 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -24,13 +24,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.hadoop.metadata</groupId> - <artifactId>metadata-governance</artifactId> + <groupId>org.apache.atlas</groupId> + <artifactId>apache-atlas</artifactId> <version>0.1-incubating-SNAPSHOT</version> </parent> - <artifactId>metadata-webapp</artifactId> - <description>Apache Metadata Web Application</description> - <name>Apache Metadata Web Application</name> + <artifactId>atlas-webapp</artifactId> + <description>Apache Atlas Web Application</description> + <name>Apache Atlas Web Application</name> <packaging>war</packaging> <properties> @@ -39,18 +39,18 @@ <dependencies> <dependency> - <groupId>org.apache.hadoop.metadata</groupId> - <artifactId>metadata-typesystem</artifactId> + <groupId>org.apache.atlas</groupId> + <artifactId>atlas-typesystem</artifactId> </dependency> <dependency> - <groupId>org.apache.hadoop.metadata</groupId> - <artifactId>metadata-repository</artifactId> + <groupId>org.apache.atlas</groupId> + <artifactId>atlas-repository</artifactId> </dependency> <dependency> - <groupId>org.apache.hadoop.metadata</groupId> - <artifactId>metadata-client</artifactId> + <groupId>org.apache.atlas</groupId> + <artifactId>atlas-client</artifactId> <type>test-jar</type> </dependency> @@ -198,7 +198,7 @@ <includeTransitiveDependencySources>false</includeTransitiveDependencySources> <includeDependencySources>true</includeDependencySources> <dependencySourceIncludes> - <dependencySourceInclude>org.apache.hadoop.metadata:*</dependencySourceInclude> + <dependencySourceInclude>org.apache.atlas:*</dependencySourceInclude> </dependencySourceIncludes> </configuration> </execution> @@ -260,11 +260,11 @@ </execution> </executions> <configuration> - <dname>cn=metadata.incubator.apache.org</dname> - <keystore>${project.build.directory}/metadata.keystore</keystore> + <dname>cn=atlas.incubator.apache.org</dname> + <keystore>${project.build.directory}/atlas.keystore</keystore> <keypass>keypass</keypass> <storepass>keypass</storepass> - <alias>metadata</alias> + <alias>atlas</alias> <keyalg>RSA</keyalg> <validity>100000</validity> </configuration> @@ -282,9 +282,9 @@ <connector implementation="org.mortbay.jetty.security.SslSocketConnector"> <port>21443</port> <maxIdleTime>60000</maxIdleTime> - <keystore>${project.build.directory}/../../webapp/target/metadata.keystore</keystore> - <keyPassword>metadata-passwd</keyPassword> - <password>metadata-passwd</password> + <keystore>${project.build.directory}/../../webapp/target/atlas.keystore</keystore> + <keyPassword>atlas-passwd</keyPassword> + <password>atlas-passwd</password> </connector> --> <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> @@ -292,29 +292,29 @@ <maxIdleTime>60000</maxIdleTime> </connector> </connectors> - <webApp>${project.build.directory}/metadata-webapp-${project.version}</webApp> + <webApp>${project.build.directory}/atlas-webapp-${project.version}</webApp> <contextPath>/</contextPath> <useTestClasspath>true</useTestClasspath> <systemProperties> <systemProperty> - <name>metadata.log.dir</name> + <name>atlas.log.dir</name> <value>${project.build.directory}/logs</value> </systemProperty> <systemProperty> <name>keystore.file</name> - <value>${project.build.directory}/../../webapp/target/metadata.keystore + <value>${project.build.directory}/../../webapp/target/atlas.keystore </value> </systemProperty> <systemProperty> <name>truststore.file</name> - <value>${project.build.directory}/../../webapp/target/metadata.keystore</value> + <value>${project.build.directory}/../../webapp/target/atlas.keystore </value> </systemProperty> <systemProperty> - <name>metadata.home</name> + <name>atlas.home</name> <value>${project.build.directory}</value> </systemProperty> </systemProperties> - <stopKey>metadata-stop</stopKey> + <stopKey>atlas-stop</stopKey> <stopPort>41001</stopPort> <daemon>${debug.jetty.daemon}</daemon> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/webapp/src/main/resources/application.properties ---------------------------------------------------------------------- diff --git a/webapp/src/main/resources/application.properties b/webapp/src/main/resources/application.properties index 51681dc..9ade2a7 100755 --- a/webapp/src/main/resources/application.properties +++ b/webapp/src/main/resources/application.properties @@ -18,30 +18,30 @@ ######### Graph Database Configs ######### # Graph Storage -metadata.graph.storage.backend=berkeleyje -metadata.graph.storage.directory=target/data/berkley +atlas.graph.storage.backend=berkeleyje +atlas.graph.storage.directory=target/data/berkley # Graph Search Index -metadata.graph.index.search.backend=elasticsearch -metadata.graph.index.search.directory=target/data/es -metadata.graph.index.search.elasticsearch.client-only=false -metadata.graph.index.search.elasticsearch.local-mode=true -metadata.graph.index.search.elasticsearch.create.sleep=2000 +atlas.graph.index.search.backend=elasticsearch +atlas.graph.index.search.directory=target/data/es +atlas.graph.index.search.elasticsearch.client-only=false +atlas.graph.index.search.elasticsearch.local-mode=true +atlas.graph.index.search.elasticsearch.create.sleep=2000 ######### Hive Lineage Configs ######### # This models reflects the base super types for Data and Process -#metadata.lineage.hive.table.type.name=DataSet -#metadata.lineage.hive.process.type.name=Process -#metadata.lineage.hive.process.inputs.name=inputs -#metadata.lineage.hive.process.outputs.name=outputs +#atlas.lineage.hive.table.type.name=DataSet +#atlas.lineage.hive.process.type.name=Process +#atlas.lineage.hive.process.inputs.name=inputs +#atlas.lineage.hive.process.outputs.name=outputs ## Schema -#metadata.lineage.hive.table.schema.query=hive_table where name=?, columns +#atlas.lineage.hive.table.schema.query=hive_table where name=?, columns ######### Security Properties ######### # SSL config -metadata.enableTLS=false +atlas.enableTLS=false ######### Security Properties ######### http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/webapp/src/main/resources/atlas-buildinfo.properties ---------------------------------------------------------------------- diff --git a/webapp/src/main/resources/atlas-buildinfo.properties b/webapp/src/main/resources/atlas-buildinfo.properties new file mode 100755 index 0000000..f179d53 --- /dev/null +++ b/webapp/src/main/resources/atlas-buildinfo.properties @@ -0,0 +1,28 @@ +# +# 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.name=${pom.parent.name} +project.description=${pom.parent.description} +build.user=${user.name} +build.epoch=${timestamp} +project.version=${pom.version} +build.version=${pom.version}-r${buildNumber} +vc.revision=${buildNumber} +vc.source.url=${scm.connection} +###################### http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/webapp/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/webapp/src/main/resources/log4j.xml b/webapp/src/main/resources/log4j.xml index 441a5f8..42d3c47 100755 --- a/webapp/src/main/resources/log4j.xml +++ b/webapp/src/main/resources/log4j.xml @@ -28,7 +28,7 @@ </appender> <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="File" value="${metadata.log.dir}/application.log"/> + <param name="File" value="${atlas.log.dir}/application.log"/> <param name="Append" value="true"/> <param name="Threshold" value="debug"/> <layout class="org.apache.log4j.PatternLayout"> @@ -37,7 +37,7 @@ </appender> <appender name="AUDIT" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="File" value="${metadata.log.dir}/audit.log"/> + <param name="File" value="${atlas.log.dir}/audit.log"/> <param name="Append" value="true"/> <param name="Threshold" value="debug"/> <layout class="org.apache.log4j.PatternLayout"> @@ -45,7 +45,7 @@ </layout> </appender> - <logger name="org.apache.hadoop.metadata" additivity="false"> + <logger name="org.apache.atlas" additivity="false"> <level value="debug"/> <appender-ref ref="FILE"/> </logger> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/webapp/src/main/resources/metadata-buildinfo.properties ---------------------------------------------------------------------- diff --git a/webapp/src/main/resources/metadata-buildinfo.properties b/webapp/src/main/resources/metadata-buildinfo.properties deleted file mode 100755 index f179d53..0000000 --- a/webapp/src/main/resources/metadata-buildinfo.properties +++ /dev/null @@ -1,28 +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.name=${pom.parent.name} -project.description=${pom.parent.description} -build.user=${user.name} -build.epoch=${timestamp} -project.version=${pom.version} -build.version=${pom.version}-r${buildNumber} -vc.revision=${buildNumber} -vc.source.url=${scm.connection} -###################### http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/26048109/webapp/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml index 13a268c..855a068 100755 --- a/webapp/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -21,13 +21,13 @@ "http://java.sun.com/dtd/web-app_2_3.dtd";> <web-app> - <display-name>Apache Metadata Placeholder</display-name> - <description>Apache Metadata Placeholder</description> + <display-name>Apache Atlas</display-name> + <description>Metadata Management and Data Governance Platform over Hadoop</description> <context-param> <param-name>guice.packages</param-name> <param-value> - org.apache.hadoop.metadata.web.resources,org.apache.hadoop.metadata.web.params + org.apache.atlas.web.resources,org.apache.atlas.web.params </param-value> </context-param> @@ -48,6 +48,6 @@ </filter-mapping> <listener> - <listener-class>org.apache.hadoop.metadata.web.listeners.GuiceServletConfig</listener-class> + <listener-class>org.apache.atlas.web.listeners.GuiceServletConfig</listener-class> </listener> </web-app>
