Fix ODF build issues introduced by package rename
(cherry picked from commit 21925d18fd9527e16a7a7a19ae2ec5f1da4c6e92)
Signed-off-by: Madhan Neethiraj <madhan@apache.org>
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
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
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 @@
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;
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;
+ }
+
+}
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
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,
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
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 @@
" \"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" +
" }";
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.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" };
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 @@
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();
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
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
},
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"
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
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
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
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>
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
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
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
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 @@
.project
.factorypath
.externalToolBuilders
+package-lock.json
build
build/**
node_modules
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"
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>
