You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2017/07/20 19:48:59 UTC
[1/2] incubator-atlas git commit: Replace misleading license headers
in markdown files
Repository: incubator-atlas
Updated Branches:
refs/heads/feature-odf f24d94fad -> cac4bee57
Replace misleading license headers in markdown files
(cherry picked from commit d74f50a94d13c527f0227f68227bbda1b01dd67e)
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/14e70b6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/14e70b6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/14e70b6a
Branch: refs/heads/feature-odf
Commit: 14e70b6a1c319821f0d06f948eed373a3c387243
Parents: f24d94f
Author: Robert Kern <ro...@de.ibm.com>
Authored: Mon Jul 3 19:33:19 2017 +0200
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu Jul 20 12:48:34 2017 -0700
----------------------------------------------------------------------
odf/odf-doc/src/site/markdown/api-reference.md | 30 ++++---
odf/odf-doc/src/site/markdown/build.md | 40 ++++-----
odf/odf-doc/src/site/markdown/configuration.md | 30 ++++---
odf/odf-doc/src/site/markdown/data-model.md | 30 ++++---
.../site/markdown/discovery-service-tutorial.md | 30 ++++---
.../src/site/markdown/discovery-services.md | 30 ++++---
odf/odf-doc/src/site/markdown/examples.md | 30 ++++---
.../site/markdown/first-analysis-tutorial.md | 30 ++++---
odf/odf-doc/src/site/markdown/first-steps.md | 30 ++++---
odf/odf-doc/src/site/markdown/index.md | 31 ++++---
odf/odf-doc/src/site/markdown/install.md | 30 ++++---
odf/odf-doc/src/site/markdown/jenkins-build.md | 93 --------------------
.../src/site/markdown/odf-metadata-api.md | 30 ++++---
odf/odf-doc/src/site/markdown/operations.md | 30 ++++---
.../spark-discovery-service-tutorial.md | 30 ++++---
odf/odf-doc/src/site/markdown/test-env.md | 30 ++++---
.../src/site/markdown/troubleshooting.md | 30 ++++---
odf/odf-doc/src/site/site.xml | 3 -
18 files changed, 273 insertions(+), 314 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/api-reference.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/api-reference.md b/odf/odf-doc/src/site/markdown/api-reference.md
index f0bb24f..c03ada2 100755
--- a/odf/odf-doc/src/site/markdown/api-reference.md
+++ b/odf/odf-doc/src/site/markdown/api-reference.md
@@ -1,16 +1,20 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# API reference
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/build.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/build.md b/odf/odf-doc/src/site/markdown/build.md
index 4a6d7ac..8571973 100755
--- a/odf/odf-doc/src/site/markdown/build.md
+++ b/odf/odf-doc/src/site/markdown/build.md
@@ -1,16 +1,20 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Build
@@ -31,15 +35,6 @@ If you run these commands and you see similar output you should be all set:
$ git --version
git version 2.7.4
-The build currently depends on the [IA data quality project][3] (https://github.com/YSAILLET/dataquality) to be available. This can be achieved in two ways:
-1. Make sure that you can reach the [IIS Maven Repository][1]. If this doesn't work, try to authenticate against the Littleton firewall, e.g., by opening the [RTC dashboard][2].
-2. Build the [IA data quality project][3] on your local machine, typically with these commands
-
- git clone https://github.com/dataquality
- cd dataquality
- mvn clean install
-
-
### Additional Prerequisites on Windows
- For the build: The directory C:\tmp needs to exist
@@ -110,4 +105,3 @@ maven provided by the m2e plugin. Instead you will have to do this:
[1]: http://iis-repo.swg.usma.ibm.com:8080/archiva/repository/all/
[2]: https://ips-rtc.swg.usma.ibm.com/jazz/web/projects
- [3]: https://github.ibm.com/YSAILLET/dataquality
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/configuration.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/configuration.md b/odf/odf-doc/src/site/markdown/configuration.md
index c4d0c72..4a61bb2 100755
--- a/odf/odf-doc/src/site/markdown/configuration.md
+++ b/odf/odf-doc/src/site/markdown/configuration.md
@@ -1,15 +1,19 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Configuration
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/data-model.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/data-model.md b/odf/odf-doc/src/site/markdown/data-model.md
index 5905799..4629abf 100755
--- a/odf/odf-doc/src/site/markdown/data-model.md
+++ b/odf/odf-doc/src/site/markdown/data-model.md
@@ -1,16 +1,20 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Data Model
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/discovery-service-tutorial.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/discovery-service-tutorial.md b/odf/odf-doc/src/site/markdown/discovery-service-tutorial.md
index 2ab8775..381e5dc 100755
--- a/odf/odf-doc/src/site/markdown/discovery-service-tutorial.md
+++ b/odf/odf-doc/src/site/markdown/discovery-service-tutorial.md
@@ -1,16 +1,20 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Tutorial: Build and run your first Discovery Service
This tutorial shows how you can create your first discovery service in Java that analyzes a data set and creates a single annotation of a new type.
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/discovery-services.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/discovery-services.md b/odf/odf-doc/src/site/markdown/discovery-services.md
index 1afa36c..acdc259 100755
--- a/odf/odf-doc/src/site/markdown/discovery-services.md
+++ b/odf/odf-doc/src/site/markdown/discovery-services.md
@@ -1,15 +1,19 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Discovery services
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/examples.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/examples.md b/odf/odf-doc/src/site/markdown/examples.md
index 084af75..c1a0bdc 100755
--- a/odf/odf-doc/src/site/markdown/examples.md
+++ b/odf/odf-doc/src/site/markdown/examples.md
@@ -1,15 +1,19 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Examples
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/first-analysis-tutorial.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/first-analysis-tutorial.md b/odf/odf-doc/src/site/markdown/first-analysis-tutorial.md
index b299bfa..75e2666 100755
--- a/odf/odf-doc/src/site/markdown/first-analysis-tutorial.md
+++ b/odf/odf-doc/src/site/markdown/first-analysis-tutorial.md
@@ -1,16 +1,20 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Run your first ODF analysis
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/first-steps.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/first-steps.md b/odf/odf-doc/src/site/markdown/first-steps.md
index 00ced52..7284c6f 100755
--- a/odf/odf-doc/src/site/markdown/first-steps.md
+++ b/odf/odf-doc/src/site/markdown/first-steps.md
@@ -1,16 +1,20 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# First Steps
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/index.md b/odf/odf-doc/src/site/markdown/index.md
index 4c7656c..780f13c 100755
--- a/odf/odf-doc/src/site/markdown/index.md
+++ b/odf/odf-doc/src/site/markdown/index.md
@@ -1,16 +1,21 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
+
# Overview
The "Open Discovery Framework" is an open metadata-based framework that strives to be a common home for different analytics technologies that discover characteristics of data sets and relationships between them (think "AppStore for discovery algorithms"). Using ODF, applications can leverage new discovery algorithms and their results with minimal integration effort.
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/install.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/install.md b/odf/odf-doc/src/site/markdown/install.md
index 8c521ba..a8ca26f 100755
--- a/odf/odf-doc/src/site/markdown/install.md
+++ b/odf/odf-doc/src/site/markdown/install.md
@@ -1,16 +1,20 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Install ODF manually
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/jenkins-build.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/jenkins-build.md b/odf/odf-doc/src/site/markdown/jenkins-build.md
deleted file mode 100755
index 1b22bb2..0000000
--- a/odf/odf-doc/src/site/markdown/jenkins-build.md
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Licensed 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.
-#
-
-# ODF Jenkins build
-
-## General
-The Jenkins build is set up at
-[https://shared-discovery-platform-jenkins.swg-devops.com:8443](https://shared-discovery-platform-jenkins.swg-devops.com:8443).
-
-### Available jobs
-The following jobs are available:
-
-1. **Open-Discovery-Framework**: The main build on the master branch with the test environment.
-Built on Linux.
-2. **Open-Discovery-Framework-Parameters**: Job you can trigger manually for private branches
-and platforms. Using the `nodelabel` parameter with value `odfbuild` triggers the build on Linux.
-3. **Open-Discovery-Framework-Testenv**: Manages and/or installs the test env. This job is currently scheduled
-to install the current testenv on the [machine associated with label `odftestenv`](http://sdp1.rtp.raleigh.ibm.com:58081/odf-web-0.1.0-SNAPSHOT) every night at 10PM EST.
-
-The parameter `nodelabel` defines the nodes the test env is / should be installed:
-
-- `odftestenv` for testing your private builds on [https://sdp1.rtp.raleigh.ibm.com:58081/odf-web-0.1.0-SNAPSHOT](https://sdp1.rtp.raleigh.ibm.com:58081/odf-web-0.1.0-SNAPSHOT).
-- `odfdemo` for the stable demo on [https://odfdemo.rtp.raleigh.ibm.com:58081/odf-web-0.1.0-SNAPSHOT](https://odfdemo.rtp.raleigh.ibm.com:58081/odf-web-0.1.0-SNAPSHOT).
-
-Possible actions selectable through the `action` parameter are:
-
-- `start`: (re)start the test env
-- `stop`: stop the test env
-- `cleanconfig`: (re)starts with clean configuration and Kafka topics
-- `cleanmetadata`: (re)starts with clean metadata
-- `cleanall`: (re)starts with cleanconfig plus cleanmetadata
-- `install`: Installs the build as specified in the `jenkinsjob` and `buildnumber` parameters.
-
-4. **Open-Discovery-Framework-BuildStarter**: Job polling for changes in the master branch and triggering
-the automated build. Starts the Open-Discovery-Framework Linux build. *You should typically not have to trigger this job manually!*
-
-You can find these jobs in Jenkins in the [1-ODF](https://shared-discovery-platform-jenkins.swg-devops.com:8443/view/1-ODF/) tab.
-
-### Node labels
-This Jenkins system currently contains two kinds of slaves which are distinguished by a
-so called [node label](https://www.safaribooksonline.com/library/view/jenkins-the-definitive/9781449311155/ch11s04.html).
-
-We currently have these node labels:
-
-1. `odfbuild`: Linux build
-2. `odftestenv`: Machine sdp1.rtp.raleigh.ibm.com where test envs can be deployed regularly for internal testing.
-
-
-### Some Important Settings
-
-- Use the profile `jenkinsbuild`. This is currently only used in the Bluemix Services and requires that the Bluemix password is not read from the `cf.password` system property but rather from the env var `CFPASSWORD`. This is only done so that the password doesn't appear in the log.
-- The firewall is smashed with a script called `smashlittletonfirewall.sh` (see below). You have to set the env var
-`INTRANETCREDENTIALS` from Jenkins as a combined credential variable (of the form user:password). The reason
-why this is a script and not put into the command line directly is that the user / password don't appear in the log
-
-
-### Build Slave Machines
-The build slave machines are:
-
-1. BuildNode: `sdp1.rtp.raleigh.ibm.com`
-2. BuildNode2: `sdpbuild2.rtp.raleigh.ibm.com`
-3. ODFTestEnv: `sdpdemo.rtp.raleigh.ibm.com`
-4. BuildNodeWin1: `sdpwin1.rtp.raleigh.ibm.com`
-
-Access user: ibmadmin / adm4sdp
-
-These VMs can be managed through [vLaunch](https://vlaunch.rtp.raleigh.ibm.com/).
-
-
-### Scripts / settings required on the build slave
-
-#### Windows
-On the windows slaves, install Git from IBM iRAM, e.g., [here](https://w3-03.ibm.com/tools/cm/iram/oslc/assets/503004E8-5971-230E-3D16-6F3FBDBE2E2C/2.5.1)
-and make sure that the *bin* directory of the installation (typically something like `C:\Program Files (x86)\Git\bin`) is in the path.
-This takes care that `sh.exe` is in the path and picked up by the Jenkins jobs.
-
-#### `smashlittletonfirewall.sh`
-
-Used to smash the Littleton firewall. Put this somewhere in the path, e.g., `~/bin`. The reason why this exists
-at all is so that the intranet credentials don't appear in the build log. The file consists of this one line:
-
- curl -i -L --user $INTRANETCREDENTIALS --insecure -X GET http://ips-rtc.swg.usma.ibm.com/jazz/web/projects
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/odf-metadata-api.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/odf-metadata-api.md b/odf/odf-doc/src/site/markdown/odf-metadata-api.md
index 6c5fa91..d9914cf 100755
--- a/odf/odf-doc/src/site/markdown/odf-metadata-api.md
+++ b/odf/odf-doc/src/site/markdown/odf-metadata-api.md
@@ -1,16 +1,20 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# ODF Metadata API
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/operations.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/operations.md b/odf/odf-doc/src/site/markdown/operations.md
index f28699b..d5190c2 100755
--- a/odf/odf-doc/src/site/markdown/operations.md
+++ b/odf/odf-doc/src/site/markdown/operations.md
@@ -1,15 +1,19 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Operations
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/spark-discovery-service-tutorial.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/spark-discovery-service-tutorial.md b/odf/odf-doc/src/site/markdown/spark-discovery-service-tutorial.md
index 45f272b..2a778c2 100755
--- a/odf/odf-doc/src/site/markdown/spark-discovery-service-tutorial.md
+++ b/odf/odf-doc/src/site/markdown/spark-discovery-service-tutorial.md
@@ -1,16 +1,20 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Tutorial: Creating Spark discovery services
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/test-env.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/test-env.md b/odf/odf-doc/src/site/markdown/test-env.md
index a0697bf..a6160c8 100755
--- a/odf/odf-doc/src/site/markdown/test-env.md
+++ b/odf/odf-doc/src/site/markdown/test-env.md
@@ -1,16 +1,20 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Test environment
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/markdown/troubleshooting.md
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/markdown/troubleshooting.md b/odf/odf-doc/src/site/markdown/troubleshooting.md
index 971bfc6..1c8d95e 100755
--- a/odf/odf-doc/src/site/markdown/troubleshooting.md
+++ b/odf/odf-doc/src/site/markdown/troubleshooting.md
@@ -1,16 +1,20 @@
-#
-# Licensed 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.
-#
+<!--
+ ~ 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.
+ -->
# Troubleshooting
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/14e70b6a/odf/odf-doc/src/site/site.xml
----------------------------------------------------------------------
diff --git a/odf/odf-doc/src/site/site.xml b/odf/odf-doc/src/site/site.xml
index c810e66..0a23228 100755
--- a/odf/odf-doc/src/site/site.xml
+++ b/odf/odf-doc/src/site/site.xml
@@ -54,9 +54,6 @@
<item name="Discovery Services" href="discovery-services.html" />
<item name="Data Model" href="data-model.html" />
</menu>
- <menu name="Internal">
- <item name="Jenkins build" href="jenkins-build.html" />
- </menu>
<footer>All rights reserved.</footer>
</body>
</project>
[2/2] incubator-atlas git commit: Fix ODF build issues introduced by
package rename
Posted by ma...@apache.org.
Fix ODF build issues introduced by package rename
(cherry picked from commit 21925d18fd9527e16a7a7a19ae2ec5f1da4c6e92)
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/cac4bee5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/cac4bee5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/cac4bee5
Branch: refs/heads/feature-odf
Commit: cac4bee572845f2fa0859cf7a5a14b8536d7a618
Parents: 14e70b6
Author: Robert Kern <ro...@de.ibm.com>
Authored: Mon Jul 3 18:11:06 2017 +0200
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu Jul 20 12:48:44 2017 -0700
----------------------------------------------------------------------
.../src/test/resources/projects/it1/goal.txt | 13 -----
.../atlas/odf/odf-implementation.properties | 2 +-
.../atlas/odf/core/ODFInternalFactory.java | 2 +-
.../core/store/DefaultConfigurationStorage.java | 50 ++++++++++++++++++++
.../odf-default-implementation.properties | 32 +++++++------
.../internal/odf-initial-configuration.json | 2 +-
.../org/apache/atlas/odf/core/odfversion.txt | 15 +-----
.../test/configuration/ValidationTests.java | 2 +-
.../DeclarativeRequestMapperTest.java | 2 +-
.../DiscoveryServiceManagerTest.java | 4 +-
.../resources/META-INF/odf/odf-runtimes.txt | 2 +-
.../internal/odf-initial-configuration.json | 14 +++---
.../odf/core/test/messaging/kafka/tracker1.json | 2 +-
.../atlas/odf/odf-implementation.properties | 8 ++--
.../atlas/odf/odf-implementation.properties | 2 +-
.../atlas/odf/odf-implementation.properties | 6 +--
odf/odf-spark-example-application/pom.xml | 2 +-
.../atlas/odf/odf-implementation.properties | 2 +-
.../atlas/odf/odf-implementation.properties | 2 +-
.../atlas/odf/odf-implementation.properties | 2 +-
odf/odf-web/.gitignore | 1 +
odf/odf-web/package.json | 9 ++--
odf/odf-web/pom.xml | 4 +-
23 files changed, 104 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-archetype-discoveryservice/src/test/resources/projects/it1/goal.txt
----------------------------------------------------------------------
diff --git a/odf/odf-archetype-discoveryservice/src/test/resources/projects/it1/goal.txt b/odf/odf-archetype-discoveryservice/src/test/resources/projects/it1/goal.txt
index 3cb5141..31ed2f8 100755
--- a/odf/odf-archetype-discoveryservice/src/test/resources/projects/it1/goal.txt
+++ b/odf/odf-archetype-discoveryservice/src/test/resources/projects/it1/goal.txt
@@ -1,14 +1 @@
-#
-# Licensed 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.
-#
clean verify
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-atlas/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
----------------------------------------------------------------------
diff --git a/odf/odf-atlas/src/main/resources/org/apache/atlas/odf/odf-implementation.properties b/odf/odf-atlas/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
index 500aae7..8587cc8 100755
--- a/odf/odf-atlas/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
+++ b/odf/odf-atlas/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
@@ -12,4 +12,4 @@
# limitations under the License.
#
# Overwrite default implementation
-MetadataStore=org.apache.atlas.odf.core.metadata.atlas.AtlasMetadataStore
+org.apache.atlas.odf.api.metadata.MetadataStore=org.apache.atlas.odf.core.metadata.atlas.AtlasMetadataStore
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/main/java/org/apache/atlas/odf/core/ODFInternalFactory.java
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/main/java/org/apache/atlas/odf/core/ODFInternalFactory.java b/odf/odf-core/src/main/java/org/apache/atlas/odf/core/ODFInternalFactory.java
index 4fd09a7..9023b5d 100755
--- a/odf/odf-core/src/main/java/org/apache/atlas/odf/core/ODFInternalFactory.java
+++ b/odf/odf-core/src/main/java/org/apache/atlas/odf/core/ODFInternalFactory.java
@@ -34,7 +34,7 @@ public class ODFInternalFactory {
Logger logger = Logger.getLogger(ODFInternalFactory.class.getName());
ClassLoader cl = ODFInternalFactory.class.getClassLoader();
- String overwriteConfig = "org/apahe/atlas/odf/odf-implementation.properties";
+ String overwriteConfig = "org/apache/atlas/odf/odf-implementation.properties";
overwrittenImplementations = new ODFImplementations(overwriteConfig, cl);
if (overwrittenImplementations.getImplementations().isEmpty()) {
overwrittenImplementations = null;
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/main/java/org/apache/atlas/odf/core/store/DefaultConfigurationStorage.java
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/main/java/org/apache/atlas/odf/core/store/DefaultConfigurationStorage.java b/odf/odf-core/src/main/java/org/apache/atlas/odf/core/store/DefaultConfigurationStorage.java
new file mode 100644
index 0000000..8428a3f
--- /dev/null
+++ b/odf/odf-core/src/main/java/org/apache/atlas/odf/core/store/DefaultConfigurationStorage.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed 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.odf.core.store;
+
+import org.apache.atlas.odf.core.configuration.ConfigContainer;
+
+public class DefaultConfigurationStorage implements ODFConfigurationStorage {
+
+ @Override
+ public void storeConfig(ConfigContainer container) {
+
+ }
+
+ @Override
+ public ConfigContainer getConfig(ConfigContainer defaultConfiguration) {
+ return defaultConfiguration;
+ }
+
+ @Override
+ public void onConfigChange(ConfigContainer container) {
+
+ }
+
+ @Override
+ public void addPendingConfigChange(String changeId) {
+
+ }
+
+ @Override
+ public void removePendingConfigChange(String changeId) {
+
+ }
+
+ @Override
+ public boolean isConfigChangePending(String changeId) {
+ return false;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/internal/odf-default-implementation.properties
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/internal/odf-default-implementation.properties b/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/internal/odf-default-implementation.properties
index c9c21d0..7cb9477 100755
--- a/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/internal/odf-default-implementation.properties
+++ b/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/internal/odf-default-implementation.properties
@@ -13,18 +13,20 @@
#
# default implementations
-AnalysisRequestTrackerStore=org.apache.atlas.odf.core.controlcenter.DefaultStatusQueueStore
-ThreadManager=org.apache.atlas.odf.core.controlcenter.DefaultThreadManager
-MetadataStore=org.apache.atlas.odf.core.metadata.DefaultMetadataStore
-AnnotationStore=org.apache.atlas.odf.core.controlcenter.DefaultStatusQueueStore
-JDBCMetadataImporter=org.apache.atlas.odf.core.metadata.JDBCMetadataImporterImpl
-org.apache.atlas.odf.core.connectivity.DataSetRetriever=com.ibm.iis.odf.core.connectivity.DataSetRetrieverImpl
-SparkServiceExecutor=SparkServiceExecutorImpl
-Environment=org.apache.atlas.odf.core.StandaloneEnvironment
-AnalysisManager=org.apache.atlas.odf.core.analysis.AnalysisManagerImpl
-EngineManager=org.apache.atlas.odf.core.engine.EngineManagerImpl
-DiscoveryServiceManager=org.apache.atlas.odf.core.discoveryservice.DiscoveryServiceManagerImpl
-SettingsManager=org.apache.atlas.odf.core.settings.SettingsManagerImpl
-MessageEncryption=org.apache.atlas.odf.core.messaging.DefaultMessageEncryption
-TransactionContextExecutor=org.apache.atlas.odf.core.controlcenter.DefaultTransactionContextExecutor
-NotificationManager=org.apache.atlas.odf.core.notification.DefaultNotificationManager
+org.apache.atlas.odf.core.controlcenter.AnalysisRequestTrackerStore=org.apache.atlas.odf.core.controlcenter.DefaultStatusQueueStore
+org.apache.atlas.odf.core.controlcenter.ThreadManager=org.apache.atlas.odf.core.controlcenter.DefaultThreadManager
+org.apache.atlas.odf.api.metadata.MetadataStore=org.apache.atlas.odf.core.metadata.DefaultMetadataStore
+org.apache.atlas.odf.api.annotation.AnnotationStore=org.apache.atlas.odf.core.controlcenter.DefaultStatusQueueStore
+org.apache.atlas.odf.core.controlcenter.DiscoveryServiceMessageStore=org.apache.atlas.odf.core.controlcenter.DefaultStatusQueueStore
+org.apache.atlas.odf.api.metadata.importer.JDBCMetadataImporter=org.apache.atlas.odf.core.metadata.JDBCMetadataImporterImpl
+org.apache.atlas.odf.core.connectivity.DataSetRetriever=org.apache.atlas.odf.core.connectivity.DataSetRetrieverImpl
+org.apache.atlas.odf.api.spark.SparkServiceExecutor=org.apache.atlas.odf.core.spark.SparkServiceExecutorImpl
+org.apache.atlas.odf.core.Environment=org.apache.atlas.odf.core.StandaloneEnvironment
+org.apache.atlas.odf.api.analysis.AnalysisManager=org.apache.atlas.odf.core.analysis.AnalysisManagerImpl
+org.apache.atlas.odf.api.engine.EngineManager=org.apache.atlas.odf.core.engine.EngineManagerImpl
+org.apache.atlas.odf.api.discoveryservice.DiscoveryServiceManager=org.apache.atlas.odf.core.discoveryservice.DiscoveryServiceManagerImpl
+org.apache.atlas.odf.api.settings.SettingsManager=org.apache.atlas.odf.core.settings.SettingsManagerImpl
+org.apache.atlas.odf.core.messaging.MessageEncryption=org.apache.atlas.odf.core.messaging.DefaultMessageEncryption
+org.apache.atlas.odf.core.controlcenter.TransactionContextExecutor=org.apache.atlas.odf.core.controlcenter.DefaultTransactionContextExecutor
+org.apache.atlas.odf.core.notification.NotificationManager=org.apache.atlas.odf.core.notification.DefaultNotificationManager
+org.apache.atlas.odf.core.store.ODFConfigurationStorage=org.apache.atlas.odf.core.store.DefaultConfigurationStorage
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/internal/odf-initial-configuration.json
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/internal/odf-initial-configuration.json b/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/internal/odf-initial-configuration.json
index 0a81029..5bd1d0d 100755
--- a/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/internal/odf-initial-configuration.json
+++ b/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/internal/odf-initial-configuration.json
@@ -11,7 +11,7 @@
"runNewServicesOnRegistration": false,
"enableAnnotationPropagation": true,
"messagingConfiguration": {
- "type": "com.ibm.iis.odf.api.settings.KafkaMessagingConfiguration",
+ "type": "org.apache.atlas.odf.api.settings.KafkaMessagingConfiguration",
"analysisRequestRetentionMs": 86400000,
"kafkaBrokerTopicReplication": 1,
"queueConsumerWaitMs": 5000,
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/odfversion.txt
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/odfversion.txt b/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/odfversion.txt
index 27b38ad..48d6e85 100755
--- a/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/odfversion.txt
+++ b/odf/odf-core/src/main/resources/org/apache/atlas/odf/core/odfversion.txt
@@ -1,14 +1 @@
-#
-# Licensed 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.
-#
-1.2.0-SNAPSHOT
+1.2.0-SNAPSHOT
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/configuration/ValidationTests.java
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/configuration/ValidationTests.java b/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/configuration/ValidationTests.java
index 3db5778..e844e05 100755
--- a/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/configuration/ValidationTests.java
+++ b/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/configuration/ValidationTests.java
@@ -62,7 +62,7 @@ public class ValidationTests extends TimerTestBase {
" \"description\": \"The async test service\",\r\n" +
" \"endpoint\": {\r\n" +
" \"runtimeName\": \"Java\",\r\n" +
- " \"className\": \"TestAsyncDiscoveryService1\"\r\n" +
+ " \"className\": \"org.apache.atlas.odf.core.test.discoveryservice.TestAsyncDiscoveryService1\"\r\n" +
" }\r\n" +
" }";
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/controlcenter/DeclarativeRequestMapperTest.java
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/controlcenter/DeclarativeRequestMapperTest.java b/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/controlcenter/DeclarativeRequestMapperTest.java
index 347fb84..e3b3549 100755
--- a/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/controlcenter/DeclarativeRequestMapperTest.java
+++ b/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/controlcenter/DeclarativeRequestMapperTest.java
@@ -38,7 +38,7 @@ import org.apache.atlas.odf.api.discoveryservice.DiscoveryServiceProperties;
import org.apache.atlas.odf.api.discoveryservice.ServiceNotFoundException;
public class DeclarativeRequestMapperTest extends ODFTestBase {
- final private static String SERVICE_CLASSNAME = "TestAsyncDiscoveryService1";
+ final private static String SERVICE_CLASSNAME = "org.apache.atlas.odf.core.test.discoveryservice.TestAsyncDiscoveryService1";
final private static String[] EXPECTED_SERVICE_SEQUENCES = new String[] { "pre3,ser1", "alt1,ser1", "pre4,pre1,ser1",
"pre3,ser1,ser3", "pre3,ser1,ser5", "alt1,ser1,ser3", "alt1,ser1,ser5", "pre3,pre2,ser4", "alt1,pre2,ser4",
"pre4,pre1,ser1,ser3", "pre4,pre1,ser1,ser5", "pre3,ser1,alt1,ser3", "pre3,ser1,pre2,ser4", "pre3,ser1,alt1,ser5" };
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/discoveryservice/DiscoveryServiceManagerTest.java
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/discoveryservice/DiscoveryServiceManagerTest.java b/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/discoveryservice/DiscoveryServiceManagerTest.java
index 0f1aa8f..5f923a3 100755
--- a/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/discoveryservice/DiscoveryServiceManagerTest.java
+++ b/odf/odf-core/src/test/java/org/apache/atlas/odf/core/test/discoveryservice/DiscoveryServiceManagerTest.java
@@ -38,10 +38,10 @@ public class DiscoveryServiceManagerTest {
final private static String NEW_SERVICE_ID = "New_Service";
final private static String NEW_SERVICE_NAME = "Name of New Service";
final private static String NEW_SERVICE_DESCRIPTION = "Description of the New Service";
- final private static String NEW_SERVICE_CLASSNAME = "TestAsyncDiscoveryService1";
+ final private static String NEW_SERVICE_CLASSNAME = "org.apache.atlas.odf.core.test.discoveryservice.TestAsyncDiscoveryService1";
final private static String UPDATED_SERVICE_DESCRIPTION = "Updated description of the New Service";
- final private static String UPDATED_SERVICE_CLASSNAME = "TestSyncDiscoveryService1";
+ final private static String UPDATED_SERVICE_CLASSNAME = "org.apache.atlas.odf.core.test.discoveryservice.TestSyncDiscoveryService1";
private void registerDiscoveryService(DiscoveryServiceProperties dsProperties) throws ValidationException {
DiscoveryServiceManager discoveryServicesManager = new ODFFactory().create().getDiscoveryServiceManager();
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/test/resources/META-INF/odf/odf-runtimes.txt
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/test/resources/META-INF/odf/odf-runtimes.txt b/odf/odf-core/src/test/resources/META-INF/odf/odf-runtimes.txt
index d421138..63a0bb3 100755
--- a/odf/odf-core/src/test/resources/META-INF/odf/odf-runtimes.txt
+++ b/odf/odf-core/src/test/resources/META-INF/odf/odf-runtimes.txt
@@ -11,4 +11,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-TestServiceRuntime
+org.apache.atlas.odf.core.test.runtime.TestServiceRuntime
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/test/resources/org/apache/atlas/odf/core/test/internal/odf-initial-configuration.json
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/test/resources/org/apache/atlas/odf/core/test/internal/odf-initial-configuration.json b/odf/odf-core/src/test/resources/org/apache/atlas/odf/core/test/internal/odf-initial-configuration.json
index 9757e51..c7e365f 100755
--- a/odf/odf-core/src/test/resources/org/apache/atlas/odf/core/test/internal/odf-initial-configuration.json
+++ b/odf/odf-core/src/test/resources/org/apache/atlas/odf/core/test/internal/odf-initial-configuration.json
@@ -10,7 +10,7 @@
"discoveryServiceWatcherWaitMs": 2000,
"enableAnnotationPropagation": true,
"messagingConfiguration": {
- "type": "com.ibm.iis.odf.api.settings.KafkaMessagingConfiguration",
+ "type": "org.apache.atlas.odf.api.settings.KafkaMessagingConfiguration",
"analysisRequestRetentionMs": 86400000,
"queueConsumerWaitMs": 2000,
"kafkaBrokerTopicReplication": 1,
@@ -32,7 +32,7 @@
],
"endpoint": {
"runtimeName": "Java",
- "className": "com.ibm.iis.odf.core.test.discoveryservice.TestAsyncDiscoveryService1"
+ "className": "org.apache.atlas.odf.core.test.discoveryservice.TestAsyncDiscoveryService1"
},
"parallelismCount" : 2
},
@@ -42,7 +42,7 @@
"description": "The async test service writing annotations",
"endpoint": {
"runtimeName": "Java",
- "className": "com.ibm.iis.odf.core.test.discoveryservice.TestAsyncDiscoveryServiceWritingAnnotations1"
+ "className": "org.apache.atlas.odf.core.test.discoveryservice.TestAsyncDiscoveryServiceWritingAnnotations1"
},
"parallelismCount" : 2
},
@@ -55,7 +55,7 @@
],
"endpoint": {
"runtimeName": "Java",
- "className": "com.ibm.iis.odf.core.test.discoveryservice.TestSyncDiscoveryService1"
+ "className": "org.apache.atlas.odf.core.test.discoveryservice.TestSyncDiscoveryService1"
},
"parallelismCount" : 2
},
@@ -65,7 +65,7 @@
"description": "The Sync test service writing annotations",
"endpoint": {
"runtimeName": "Java",
- "className": "com.ibm.iis.odf.core.test.discoveryservice.TestSyncDiscoveryServiceWritingAnnotations1"
+ "className": "org.apache.atlas.odf.core.test.discoveryservice.TestSyncDiscoveryServiceWritingAnnotations1"
},
"parallelismCount" : 2
},
@@ -75,7 +75,7 @@
"description": "The Sync test service writing annotations with extension mechanism",
"endpoint": {
"runtimeName": "Java",
- "className": "com.ibm.iis.odf.core.test.annotation.TestSyncDiscoveryServiceWritingExtendedAnnotations"
+ "className": "org.apache.atlas.odf.core.test.annotation.TestSyncDiscoveryServiceWritingExtendedAnnotations"
},
"parallelismCount" : 2
},
@@ -85,7 +85,7 @@
"description": "The Sync test service writing annotations returned from a json file",
"endpoint": {
"runtimeName": "Java",
- "className": "com.ibm.iis.odf.core.test.annotation.TestSyncDiscoveryServiceWritingJsonAnnotations"
+ "className": "org.apache.atlas.odf.core.test.annotation.TestSyncDiscoveryServiceWritingJsonAnnotations"
},
"parallelismCount" : 2
},
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/test/resources/org/apache/atlas/odf/core/test/messaging/kafka/tracker1.json
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/test/resources/org/apache/atlas/odf/core/test/messaging/kafka/tracker1.json b/odf/odf-core/src/test/resources/org/apache/atlas/odf/core/test/messaging/kafka/tracker1.json
index b884aca..be29e1e 100755
--- a/odf/odf-core/src/test/resources/org/apache/atlas/odf/core/test/messaging/kafka/tracker1.json
+++ b/odf/odf-core/src/test/resources/org/apache/atlas/odf/core/test/messaging/kafka/tracker1.json
@@ -4,7 +4,7 @@
"discoveryServiceRequests": [{
"dataSetContainer": {
"dataSet": {
- "javaClass": "com.ibm.iis.odf.core.metadata.models.Document",
+ "javaClass": "org.apache.atlas.odf.core.metadata.models.Document",
"name": "someDocument",
"reference": {
"id": "testdataset"
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-core/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
----------------------------------------------------------------------
diff --git a/odf/odf-core/src/test/resources/org/apache/atlas/odf/odf-implementation.properties b/odf/odf-core/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
index 18109c4..63c84cb 100755
--- a/odf/odf-core/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
+++ b/odf/odf-core/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
@@ -14,7 +14,7 @@
## USE for TESTs only
-ODFConfigurationStorage=MockConfigurationStorage
-DiscoveryServiceQueueManager=MockQueueManager
-SparkServiceExecutor=MockSparkServiceExecutor
-NotificationManager=TestNotificationManager
+org.apache.atlas.odf.core.store.ODFConfigurationStorage=org.apache.atlas.odf.core.test.store.MockConfigurationStorage
+org.apache.atlas.odf.core.messaging.DiscoveryServiceQueueManager=org.apache.atlas.odf.core.test.messaging.MockQueueManager
+org.apache.atlas.odf.api.spark.SparkServiceExecutor=org.apache.atlas.odf.core.test.spark.MockSparkServiceExecutor
+org.apache.atlas.odf.core.notification.NotificationManager=org.apache.atlas.odf.core.test.notification.TestNotificationManager
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-messaging/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
----------------------------------------------------------------------
diff --git a/odf/odf-messaging/src/main/resources/org/apache/atlas/odf/odf-implementation.properties b/odf/odf-messaging/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
index 95c1f71..1c96170 100755
--- a/odf/odf-messaging/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
+++ b/odf/odf-messaging/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
@@ -11,4 +11,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-DiscoveryServiceQueueManager=org.apache.atlas.odf.core.messaging.kafka.KafkaQueueManager
+org.apache.atlas.odf.core.messaging.DiscoveryServiceQueueManager=org.apache.atlas.odf.core.messaging.kafka.KafkaQueueManager
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-messaging/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
----------------------------------------------------------------------
diff --git a/odf/odf-messaging/src/test/resources/org/apache/atlas/odf/odf-implementation.properties b/odf/odf-messaging/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
index 5611c29..69f1860 100755
--- a/odf/odf-messaging/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
+++ b/odf/odf-messaging/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
@@ -13,6 +13,6 @@
#
## USE for TESTs only
-ODFConfigurationStorage=MockConfigurationStorage
-SparkServiceExecutor=MockSparkServiceExecutor
-NotificationManager=TestNotificationManager
+org.apache.atlas.odf.core.store.ODFConfigurationStorage=org.apache.atlas.odf.core.test.store.MockConfigurationStorage
+org.apache.atlas.odf.api.spark.SparkServiceExecutor=org.apache.atlas.odf.core.test.spark.MockSparkServiceExecutor
+org.apache.atlas.odf.core.notification.NotificationManager=org.apache.atlas.odf.core.test.notification.TestNotificationManager
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-spark-example-application/pom.xml
----------------------------------------------------------------------
diff --git a/odf/odf-spark-example-application/pom.xml b/odf/odf-spark-example-application/pom.xml
index a2baa9e..d036d44 100755
--- a/odf/odf-spark-example-application/pom.xml
+++ b/odf/odf-spark-example-application/pom.xml
@@ -16,7 +16,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.apache.atlas.odf</groupId>
+ <groupId>org.apache.atlas.odf</groupId>
<artifactId>odf</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-spark/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
----------------------------------------------------------------------
diff --git a/odf/odf-spark/src/main/resources/org/apache/atlas/odf/odf-implementation.properties b/odf/odf-spark/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
index d6651ee..b050f50 100755
--- a/odf/odf-spark/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
+++ b/odf/odf-spark/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
@@ -11,4 +11,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-SparkServiceExecutor=org.apache.atlas.odf.core.spark.SparkServiceExecutorImpl
+org.apache.atlas.odf.api.spark.SparkServiceExecutor=org.apache.atlas.odf.core.spark.SparkServiceExecutorImpl
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-store/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
----------------------------------------------------------------------
diff --git a/odf/odf-store/src/main/resources/org/apache/atlas/odf/odf-implementation.properties b/odf/odf-store/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
index 65a7b5d..6124d42 100755
--- a/odf/odf-store/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
+++ b/odf/odf-store/src/main/resources/org/apache/atlas/odf/odf-implementation.properties
@@ -11,4 +11,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-ODFConfigurationStorage=org.apache.atlas.odf.core.store.zookeeper34.ZookeeperConfigurationStorage
+org.apache.atlas.odf.core.store.ODFConfigurationStorage=org.apache.atlas.odf.core.store.zookeeper34.ZookeeperConfigurationStorage
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-store/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
----------------------------------------------------------------------
diff --git a/odf/odf-store/src/test/resources/org/apache/atlas/odf/odf-implementation.properties b/odf/odf-store/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
index 2a5f331..894ecb5 100755
--- a/odf/odf-store/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
+++ b/odf/odf-store/src/test/resources/org/apache/atlas/odf/odf-implementation.properties
@@ -13,4 +13,4 @@
#
## USE for TESTs only
-DiscoveryServiceQueueManager=MockQueueManager
+org.apache.atlas.odf.core.messaging.DiscoveryServiceQueueManager=org.apache.atlas.odf.core.test.messaging.MockQueueManager
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-web/.gitignore
----------------------------------------------------------------------
diff --git a/odf/odf-web/.gitignore b/odf/odf-web/.gitignore
index 7322e4f..1d6f10b 100755
--- a/odf/odf-web/.gitignore
+++ b/odf/odf-web/.gitignore
@@ -17,6 +17,7 @@ target
.project
.factorypath
.externalToolBuilders
+package-lock.json
build
build/**
node_modules
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-web/package.json
----------------------------------------------------------------------
diff --git a/odf/odf-web/package.json b/odf/odf-web/package.json
index 1fe599b..fc170b4 100755
--- a/odf/odf-web/package.json
+++ b/odf/odf-web/package.json
@@ -11,16 +11,17 @@
"react-bootstrap": "^0.28.2",
"react-dom": "^0.14.6",
"react-d3-components": "^0.6.1",
- "bootstrap-material-design" : "^0.5.7",
+ "bootstrap-material-design": "^0.5.7",
"roboto-font": "^0.1.0"
},
- "devDependencies": {
- "webpack": "^1.12.11",
- "imports-loader": "^0.6.5",
+ "devDependencies": {
+ "webpack": "^1.12.11",
+ "imports-loader": "^0.6.5",
"babel-core": "^6.4.0",
"babel-preset-es2015": "^6.3.13",
"babel-loader": "^6.2.1",
"babel-preset-react": "^6.3.13",
+ "file-loader": "^0.11.2",
"url-loader": "^0.5.7",
"css-loader": "^0.23.1",
"style-loader": "^0.13.0"
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/cac4bee5/odf/odf-web/pom.xml
----------------------------------------------------------------------
diff --git a/odf/odf-web/pom.xml b/odf/odf-web/pom.xml
index df0b702..d44edcaf 100755
--- a/odf/odf-web/pom.xml
+++ b/odf/odf-web/pom.xml
@@ -294,8 +294,8 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
- <nodeVersion>v0.12.2</nodeVersion>
- <npmVersion>2.7.6</npmVersion>
+ <nodeVersion>v8.1.2</nodeVersion>
+ <npmVersion>5.0.3</npmVersion>
</configuration>
</execution>
<execution>