You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by pa...@apache.org on 2016/11/21 09:46:26 UTC

falcon git commit: FALCON-2189 Falcon build fix to rearrange startup.properties for extension store now depends on jpa service

Repository: falcon
Updated Branches:
  refs/heads/master cec771caa -> 03c4ca6fe


FALCON-2189 Falcon build fix to rearrange startup.properties for extension store now depends on jpa service

Author: sandeep <sa...@gmail.com>

Reviewers: @pallavi-rao

Closes #302 from sandeepSamudrala/FALCON-2189 and squashes the following commits:

91b10b1 [sandeep] FALCON-2189 fixing startup.properties in scheduler
6d7543b [sandeep] FALCON-2189 fixing startup.properties in extensions too
5577adc [sandeep] FALCON-2189 Falcon build fix to rearrange startup.properties for extension store now depends on jpa service
3a7be21 [sandeep] Merge branch 'master' of https://github.com/apache/falcon into FALCON-2187
2baea85 [sandeep] Merge branch 'master' of https://github.com/apache/falcon into FALCON-2187
8aacd75 [sandeep] FALCON-2183 Incorporated review comments
f3d7268 [sandeep] FALCON-2183 Incorporated review comments
11e7b3f [sandeep] FALCON-2183 Extension Builder changes to support new user extensions
250cc46 [sandeep] Merge branch 'master' of https://github.com/apache/falcon
d0393e9 [sandeep] Merge branch 'master' of https://github.com/apache/falcon
a178805 [sandeep] Merge branch 'master' of https://github.com/apache/falcon
d6dc8bf [sandeep] Merge branch 'master' of https://github.com/apache/falcon
1bb8d3c [sandeep] Merge branch 'master' of https://github.com/apache/falcon
c065566 [sandeep] reverting last line changes made
1a4dcd2 [sandeep] rebased and resolved the conflicts from master
271318b [sandeep] FALCON-2097. Adding UT to the new method for getting next instance time with Delay.
a94d4fe [sandeep] rebasing from master
9e68a57 [sandeep] FALCON-298. Feed update with replication delay creates holes


Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/03c4ca6f
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/03c4ca6f
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/03c4ca6f

Branch: refs/heads/master
Commit: 03c4ca6fe1ebb5145ecc4f5568b8e87b818baa1a
Parents: cec771c
Author: sandeep <sa...@gmail.com>
Authored: Mon Nov 21 15:16:19 2016 +0530
Committer: Pallavi Rao <pa...@inmobi.com>
Committed: Mon Nov 21 15:16:19 2016 +0530

----------------------------------------------------------------------
 common/src/main/resources/startup.properties     | 4 ++--
 extensions/src/test/resources/startup.properties | 4 ++--
 prism/src/test/resources/startup.properties      | 4 ++--
 scheduler/src/test/resources/startup.properties  | 4 ++--
 src/conf/startup.properties                      | 1 +
 webapp/src/test/resources/startup.properties     | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/03c4ca6f/common/src/main/resources/startup.properties
----------------------------------------------------------------------
diff --git a/common/src/main/resources/startup.properties b/common/src/main/resources/startup.properties
index 9fb1c0a..5d5da5a 100644
--- a/common/src/main/resources/startup.properties
+++ b/common/src/main/resources/startup.properties
@@ -34,6 +34,7 @@
 *.application.services=org.apache.falcon.security.AuthenticationInitializationService,\
                         org.apache.falcon.workflow.WorkflowJobEndNotificationService, \
                         org.apache.falcon.service.ProcessSubscriberService,\
+                        org.apache.falcon.service.FalconJPAService,\
                         org.apache.falcon.extensions.ExtensionService,\
                         org.apache.falcon.service.EntitySLAMonitoringService,\
                         org.apache.falcon.service.LifecyclePolicyMap,\
@@ -43,8 +44,7 @@
                         org.apache.falcon.metadata.MetadataMappingService,\
                         org.apache.falcon.service.LogCleanupService,\
                         org.apache.falcon.service.GroupsService,\
-                        org.apache.falcon.service.ProxyUserService,\
-                        org.apache.falcon.service.FalconJPAService
+                        org.apache.falcon.service.ProxyUserService
 ##Add if you want to send data to graphite
 #                        org.apache.falcon.metrics.MetricNotificationService\
 ## Add if you want to use Falcon Azure integration ##

http://git-wip-us.apache.org/repos/asf/falcon/blob/03c4ca6f/extensions/src/test/resources/startup.properties
----------------------------------------------------------------------
diff --git a/extensions/src/test/resources/startup.properties b/extensions/src/test/resources/startup.properties
index 58daf32..7a726c3 100644
--- a/extensions/src/test/resources/startup.properties
+++ b/extensions/src/test/resources/startup.properties
@@ -33,6 +33,7 @@
 *.application.services=org.apache.falcon.security.AuthenticationInitializationService,\
                         org.apache.falcon.workflow.WorkflowJobEndNotificationService, \
                         org.apache.falcon.service.ProcessSubscriberService,\
+                        org.apache.falcon.service.FalconJPAService,\
                         org.apache.falcon.entity.store.ConfigurationStore,\
                         org.apache.falcon.rerun.service.RetryService,\
                         org.apache.falcon.rerun.service.LateRunService,\
@@ -40,8 +41,7 @@
                         org.apache.falcon.notification.service.impl.SchedulerService,\
                         org.apache.falcon.notification.service.impl.AlarmService,\
                         org.apache.falcon.notification.service.impl.DataAvailabilityService,\
-                        org.apache.falcon.execution.FalconExecutionService,\
-                        org.apache.falcon.service.FalconJPAService
+                        org.apache.falcon.execution.FalconExecutionService
 
 ##### Falcon Configuration Store Change listeners #####
 *.configstore.listeners=org.apache.falcon.entity.v0.EntityGraph,\

http://git-wip-us.apache.org/repos/asf/falcon/blob/03c4ca6f/prism/src/test/resources/startup.properties
----------------------------------------------------------------------
diff --git a/prism/src/test/resources/startup.properties b/prism/src/test/resources/startup.properties
index 5258b96..63fcd3b 100644
--- a/prism/src/test/resources/startup.properties
+++ b/prism/src/test/resources/startup.properties
@@ -34,6 +34,7 @@
 *.application.services=org.apache.falcon.security.AuthenticationInitializationService,\
                         org.apache.falcon.workflow.WorkflowJobEndNotificationService, \
                         org.apache.falcon.service.ProcessSubscriberService,\
+                        org.apache.falcon.service.FalconJPAService,\
                         org.apache.falcon.extensions.ExtensionService,\
                         org.apache.falcon.service.EntitySLAMonitoringService,\
                         org.apache.falcon.service.LifecyclePolicyMap,\
@@ -43,8 +44,7 @@
                         org.apache.falcon.metadata.MetadataMappingService,\
                         org.apache.falcon.service.LogCleanupService,\
                         org.apache.falcon.service.GroupsService,\
-                        org.apache.falcon.service.ProxyUserService,\
-                        org.apache.falcon.service.FalconJPAService
+                        org.apache.falcon.service.ProxyUserService
 ##Add if you want to send data to graphite
 #                        org.apache.falcon.metrics.MetricNotificationService\
 ## Add if you want to use Falcon Azure integration ##

http://git-wip-us.apache.org/repos/asf/falcon/blob/03c4ca6f/scheduler/src/test/resources/startup.properties
----------------------------------------------------------------------
diff --git a/scheduler/src/test/resources/startup.properties b/scheduler/src/test/resources/startup.properties
index 46031e3..2da3e2e 100644
--- a/scheduler/src/test/resources/startup.properties
+++ b/scheduler/src/test/resources/startup.properties
@@ -33,6 +33,7 @@
 *.application.services=org.apache.falcon.security.AuthenticationInitializationService,\
                         org.apache.falcon.workflow.WorkflowJobEndNotificationService, \
                         org.apache.falcon.service.ProcessSubscriberService,\
+                        org.apache.falcon.service.FalconJPAService,\
                         org.apache.falcon.entity.store.ConfigurationStore,\
                         org.apache.falcon.rerun.service.RetryService,\
                         org.apache.falcon.rerun.service.LateRunService,\
@@ -40,8 +41,7 @@
                         org.apache.falcon.notification.service.impl.SchedulerService,\
                         org.apache.falcon.notification.service.impl.AlarmService,\
                         org.apache.falcon.notification.service.impl.DataAvailabilityService,\
-                        org.apache.falcon.execution.FalconExecutionService,\
-                        org.apache.falcon.service.FalconJPAService
+                        org.apache.falcon.execution.FalconExecutionService
 
 ##### Falcon Configuration Store Change listeners #####
 *.configstore.listeners=org.apache.falcon.entity.v0.EntityGraph,\

http://git-wip-us.apache.org/repos/asf/falcon/blob/03c4ca6f/src/conf/startup.properties
----------------------------------------------------------------------
diff --git a/src/conf/startup.properties b/src/conf/startup.properties
index 8eb58b9..6a95cce 100644
--- a/src/conf/startup.properties
+++ b/src/conf/startup.properties
@@ -42,6 +42,7 @@
 *.application.services=org.apache.falcon.security.AuthenticationInitializationService,\
                         org.apache.falcon.workflow.WorkflowJobEndNotificationService, \
                         org.apache.falcon.service.ProcessSubscriberService,\
+                        org.apache.falcon.service.FalconJPAService,\
                         org.apache.falcon.extensions.ExtensionService,\
                         org.apache.falcon.service.LifecyclePolicyMap,\
                         org.apache.falcon.entity.store.ConfigurationStore,\

http://git-wip-us.apache.org/repos/asf/falcon/blob/03c4ca6f/webapp/src/test/resources/startup.properties
----------------------------------------------------------------------
diff --git a/webapp/src/test/resources/startup.properties b/webapp/src/test/resources/startup.properties
index 1cfebab..5751d9c 100644
--- a/webapp/src/test/resources/startup.properties
+++ b/webapp/src/test/resources/startup.properties
@@ -32,8 +32,8 @@
 *.application.services=org.apache.falcon.security.AuthenticationInitializationService,\
                         org.apache.falcon.workflow.WorkflowJobEndNotificationService, \
                         org.apache.falcon.service.ProcessSubscriberService,\
-                        org.apache.falcon.extensions.ExtensionService,\
                         org.apache.falcon.service.FalconJPAService,\
+                        org.apache.falcon.extensions.ExtensionService,\
                         org.apache.falcon.entity.store.ConfigurationStore,\
                         org.apache.falcon.rerun.service.RetryService,\
                         org.apache.falcon.rerun.service.LateRunService,\