Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
1dcc3073
Commit
1dcc3073
authored
7 years ago
by
David Radley
Committed by
Madhan Neethiraj
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2112: move the Atlas models to subfolders
Signed-off-by:
Madhan Neethiraj
<
madhan@apache.org
>
parent
9d38c6a9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
16 additions
and
16 deletions
+16
-16
pom.xml
addons/falcon-bridge/pom.xml
+2
-2
pom.xml
addons/hive-bridge/pom.xml
+2
-2
0010-base_model.json
addons/models/0000-Area0/0010-base_model.json
+0
-0
1020-fs_model.json
addons/models/1000-Hadoop/1020-fs_model.json
+0
-0
1030-hive_model.json
addons/models/1000-Hadoop/1030-hive_model.json
+0
-0
1040-sqoop_model.json
addons/models/1000-Hadoop/1040-sqoop_model.json
+0
-0
1050-falcon_model.json
addons/models/1000-Hadoop/1050-falcon_model.json
+0
-0
1060-hbase_model.json
addons/models/1000-Hadoop/1060-hbase_model.json
+0
-0
1070-kafka_model.json
addons/models/1000-Hadoop/1070-kafka_model.json
+0
-0
1080-storm_model.json
addons/models/1000-Hadoop/1080-storm_model.json
+0
-0
001-hive_column_add_position.json
...els/1000-Hadoop/patches/001-hive_column_add_position.json
+0
-0
002-hive_column_table_add_options.json
...000-Hadoop/patches/002-hive_column_table_add_options.json
+0
-0
003-hive_column_update_table_remove_constraint.json
...tches/003-hive_column_update_table_remove_constraint.json
+0
-0
pom.xml
addons/sqoop-bridge/pom.xml
+2
-2
pom.xml
addons/storm-bridge/pom.xml
+2
-2
AtlasTypeDefStoreInitializer.java
...ository/store/bootstrap/AtlasTypeDefStoreInitializer.java
+0
-0
ImportServiceTest.java
...org/apache/atlas/repository/impexp/ImportServiceTest.java
+6
-6
pom.xml
webapp/pom.xml
+2
-2
No files found.
addons/falcon-bridge/pom.xml
View file @
1dcc3073
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
addons/hive-bridge/pom.xml
View file @
1dcc3073
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
addons/models/0010-base_model.json
→
addons/models/00
00-Area0/00
10-base_model.json
View file @
1dcc3073
File moved
This diff is collapsed.
Click to expand it.
addons/models/1020-fs_model.json
→
addons/models/10
00-Hadoop/10
20-fs_model.json
View file @
1dcc3073
File moved
This diff is collapsed.
Click to expand it.
addons/models/1030-hive_model.json
→
addons/models/10
00-Hadoop/10
30-hive_model.json
View file @
1dcc3073
File moved
This diff is collapsed.
Click to expand it.
addons/models/1040-sqoop_model.json
→
addons/models/10
00-Hadoop/10
40-sqoop_model.json
View file @
1dcc3073
File moved
This diff is collapsed.
Click to expand it.
addons/models/1050-falcon_model.json
→
addons/models/10
00-Hadoop/10
50-falcon_model.json
View file @
1dcc3073
File moved
This diff is collapsed.
Click to expand it.
addons/models/1060-hbase_model.json
→
addons/models/10
00-Hadoop/10
60-hbase_model.json
View file @
1dcc3073
File moved
This diff is collapsed.
Click to expand it.
addons/models/1070-kafka_model.json
→
addons/models/10
00-Hadoop/10
70-kafka_model.json
View file @
1dcc3073
File moved
This diff is collapsed.
Click to expand it.
addons/models/1080-storm_model.json
→
addons/models/10
00-Hadoop/10
80-storm_model.json
View file @
1dcc3073
File moved
This diff is collapsed.
Click to expand it.
addons/models/patches/001-hive_column_add_position.json
→
addons/models/
1000-Hadoop/
patches/001-hive_column_add_position.json
View file @
1dcc3073
File moved
This diff is collapsed.
Click to expand it.
addons/models/patches/002-hive_column_table_add_options.json
→
addons/models/
1000-Hadoop/
patches/002-hive_column_table_add_options.json
View file @
1dcc3073
File moved
This diff is collapsed.
Click to expand it.
addons/models/patches/003-hive_column_update_table_remove_constraint.json
→
addons/models/
1000-Hadoop/
patches/003-hive_column_update_table_remove_constraint.json
View file @
1dcc3073
File moved
This diff is collapsed.
Click to expand it.
addons/sqoop-bridge/pom.xml
View file @
1dcc3073
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
addons/storm-bridge/pom.xml
View file @
1dcc3073
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java
View file @
1dcc3073
This diff is collapsed.
Click to expand it.
repository/src/test/java/org/apache/atlas/repository/impexp/ImportServiceTest.java
View file @
1dcc3073
...
...
@@ -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
(
"00
00-Area0/00
10-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
(
"00
00-Area0/00
10-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
(
"00
00-Area0/00
10-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
(
"00
00-Area0/00
10-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
(
"00
00-Area0/00
10-base_model.json"
,
typeDefStore
,
typeRegistry
);
loadModelFromJson
(
"10
00-Hadoop/10
30-hive_model.json"
,
typeDefStore
,
typeRegistry
);
runImportWithNoParameters
(
getImportService
(),
zipSource
);
}
...
...
This diff is collapsed.
Click to expand it.
webapp/pom.xml
View file @
1dcc3073
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment