Skip to content

A
atlas
Commit 1dcc3073 by David Radley Committed by Madhan Neethiraj
Options

ATLAS-2112: move the Atlas models to subfolders

Signed-off-by: 's avatarMadhan Neethiraj <madhan@apache.org>
parent 9d38c6a9
master
No related merge requests found
Showing with 16 additions and 16 deletions
addons/falcon-bridge/pom.xml
......@@ -368,10 +368,10 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/models</outputDirectory>
<outputDirectory>${basedir}/target/models/1000-Hadoop</outputDirectory>
<resources>
<resource>
<directory>${basedir}/../models</directory>
<directory>${basedir}/../models/1000-Hadoop</directory>
<filtering>true</filtering>
</resource>
</resources>
......
addons/hive-bridge/pom.xml
......@@ -417,10 +417,10 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/models</outputDirectory>
<outputDirectory>${basedir}/target/models/1000-Hadoop</outputDirectory>
<resources>
<resource>
<directory>${basedir}/../models</directory>
<directory>${basedir}/../models/1000-Hadoop</directory>
<filtering>true</filtering>
</resource>
</resources>
......
addons/sqoop-bridge/pom.xml
......@@ -429,10 +429,10 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/models</outputDirectory>
<outputDirectory>${basedir}/target/models/1000-Hadoop</outputDirectory>
<resources>
<resource>
<directory>${basedir}/../models</directory>
<directory>${basedir}/../models/1000-Hadoop</directory>
<filtering>true</filtering>
</resource>
</resources>
......
addons/storm-bridge/pom.xml
......@@ -501,10 +501,10 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/models</outputDirectory>
<outputDirectory>${basedir}/target/models/1000-Hadoop</outputDirectory>
<resources>
<resource>
<directory>${basedir}/../models</directory>
<directory>${basedir}/../models/1000-Hadoop</directory>
<filtering>true</filtering>
</resource>
</resources>
......
repository/src/test/java/org/apache/atlas/repository/impexp/ImportServiceTest.java
......@@ -68,7 +68,7 @@ public class ImportServiceTest {
@Test(dataProvider = "sales")
public void importDB1(ZipSource zipSource) throws AtlasBaseException, IOException {
loadModelFromJson("0010-base_model.json", typeDefStore, typeRegistry);
loadModelFromJson("0000-Area0/0010-base_model.json", typeDefStore, typeRegistry);
runAndVerifyQuickStart_v1_Import(new ImportService(typeDefStore, entityStore, typeRegistry), zipSource);
}
......@@ -79,7 +79,7 @@ public class ImportServiceTest {
@Test(dataProvider = "reporting")
public void importDB2(ZipSource zipSource) throws AtlasBaseException, IOException {
loadModelFromJson("0010-base_model.json", typeDefStore, typeRegistry);
loadModelFromJson("0000-Area0/0010-base_model.json", typeDefStore, typeRegistry);
runAndVerifyQuickStart_v1_Import(new ImportService(typeDefStore, entityStore, typeRegistry), zipSource);
}
......@@ -90,7 +90,7 @@ public class ImportServiceTest {
@Test(dataProvider = "logging")
public void importDB3(ZipSource zipSource) throws AtlasBaseException, IOException {
loadModelFromJson("0010-base_model.json", typeDefStore, typeRegistry);
loadModelFromJson("0000-Area0/0010-base_model.json", typeDefStore, typeRegistry);
runAndVerifyQuickStart_v1_Import(new ImportService(typeDefStore, entityStore, typeRegistry), zipSource);
}
......@@ -101,7 +101,7 @@ public class ImportServiceTest {
@Test(dataProvider = "salesNewTypeAttrs", dependsOnMethods = "importDB1")
public void importDB4(ZipSource zipSource) throws AtlasBaseException, IOException {
loadModelFromJson("0010-base_model.json", typeDefStore, typeRegistry);
loadModelFromJson("0000-Area0/0010-base_model.json", typeDefStore, typeRegistry);
runImportWithParameters(new ImportService(typeDefStore, entityStore, typeRegistry), getDefaultImportRequest(), zipSource);
}
......@@ -150,8 +150,8 @@ public class ImportServiceTest {
@Test(dataProvider = "ctas")
public void importCTAS(ZipSource zipSource) throws IOException, AtlasBaseException {
loadModelFromJson("0010-base_model.json", typeDefStore, typeRegistry);
loadModelFromJson("1030-hive_model.json", typeDefStore, typeRegistry);
loadModelFromJson("0000-Area0/0010-base_model.json", typeDefStore, typeRegistry);
loadModelFromJson("1000-Hadoop/1030-hive_model.json", typeDefStore, typeRegistry);
runImportWithNoParameters(getImportService(), zipSource);
}
......
webapp/pom.xml
......@@ -688,10 +688,10 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/models</outputDirectory>
<outputDirectory>${basedir}/target/models/1000-Hadoop</outputDirectory>
<resources>
<resource>
<directory>${basedir}/../addons/models</directory>
<directory>${basedir}/../addons/models/1000-Hadoop</directory>
<filtering>true</filtering>
</resource>
</resources>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment