From f83dc7e86bd51a5b2c18d65acdd2d2e33993f6b2 Mon Sep 17 00:00:00 2001 From: Miguel Rodriguez Date: Thu, 15 Jan 2015 10:42:17 +0100 Subject: [PATCH 1/3] Adding folders_to_ignore property --- deploy/lib/server_config.rb | 3 ++- deploy/sample/build.sample.properties | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index 7f9931eb..6636e002 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -480,6 +480,7 @@ def xqsync def deploy_modules ignore_us = [] ignore_us = ["^#{@properties['ml.xquery-test.dir']}.*$"] if @properties['ml.xquery-test.dir'] + ignore_us << "^#{@properties['folders_to_ignore']}$" if @properties['folders_to_ignore'] app_config_file = "#{@properties['ml.xquery.dir']}/app/config/config.xqy" ignore_us << "^#{app_config_file}$" load_data @properties["ml.xquery.dir"], { @@ -937,4 +938,4 @@ def self.properties properties = ServerConfig.substitute_properties(properties, properties, "ml.") end -end \ No newline at end of file +end diff --git a/deploy/sample/build.sample.properties b/deploy/sample/build.sample.properties index c46d8c2d..850f8511 100644 --- a/deploy/sample/build.sample.properties +++ b/deploy/sample/build.sample.properties @@ -70,4 +70,7 @@ authentication-method=digest local-server=localhost #dev-server= #cert-server= -#prod-server= \ No newline at end of file +#prod-server= + +# folder to ignore when deploying into modules database +#ignore-folders=.*/src/(node_modules|.tmp)/.* From 087603fc7da24b27fd8dcfaaa812405f52a6b1ec Mon Sep 17 00:00:00 2001 From: Miguel Rodriguez Date: Fri, 16 Jan 2015 10:49:02 +0100 Subject: [PATCH 2/3] Revert "Adding folders_to_ignore property" This reverts commit f83dc7e86bd51a5b2c18d65acdd2d2e33993f6b2. --- deploy/lib/server_config.rb | 3 +-- deploy/sample/build.sample.properties | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index 6636e002..7f9931eb 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -480,7 +480,6 @@ def xqsync def deploy_modules ignore_us = [] ignore_us = ["^#{@properties['ml.xquery-test.dir']}.*$"] if @properties['ml.xquery-test.dir'] - ignore_us << "^#{@properties['folders_to_ignore']}$" if @properties['folders_to_ignore'] app_config_file = "#{@properties['ml.xquery.dir']}/app/config/config.xqy" ignore_us << "^#{app_config_file}$" load_data @properties["ml.xquery.dir"], { @@ -938,4 +937,4 @@ def self.properties properties = ServerConfig.substitute_properties(properties, properties, "ml.") end -end +end \ No newline at end of file diff --git a/deploy/sample/build.sample.properties b/deploy/sample/build.sample.properties index 850f8511..c46d8c2d 100644 --- a/deploy/sample/build.sample.properties +++ b/deploy/sample/build.sample.properties @@ -70,7 +70,4 @@ authentication-method=digest local-server=localhost #dev-server= #cert-server= -#prod-server= - -# folder to ignore when deploying into modules database -#ignore-folders=.*/src/(node_modules|.tmp)/.* +#prod-server= \ No newline at end of file From 421acc1f62ab4bf006059a89c91c4ab7a36df5b3 Mon Sep 17 00:00:00 2001 From: Miguel Rodriguez Date: Fri, 16 Jan 2015 10:55:09 +0100 Subject: [PATCH 3/3] Adding folders_to_ignore property --- deploy/lib/server_config.rb | 2 ++ deploy/sample/build.sample.properties | 3 +++ 2 files changed, 5 insertions(+) diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index 31a86343..ae4a9275 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -1158,12 +1158,14 @@ def deploy_src load_html_as_xml = @properties['ml.load-html-as-xml'] load_js_as_binary = @properties['ml.load-js-as-binary'] load_css_as_binary = @properties['ml.load-css-as-binary'] + folders_to_ignore = @properties['ml.ignore-folders'] modules_databases.each do |dest_db| ignore_us = [] ignore_us << "^#{test_dir}.*$" unless test_dir.blank? || deploy_tests?(dest_db) ignore_us << "^#{app_config_file}$" ignore_us << "^#{test_config_file}$" + ignore_us << "^#{folders_to_ignore}$" unless folders_to_ignore.blank? src_permissions = permissions(@properties['ml.app-role'], Roxy::ContentCapability::ER) diff --git a/deploy/sample/build.sample.properties b/deploy/sample/build.sample.properties index e0970f2a..e3860ffa 100644 --- a/deploy/sample/build.sample.properties +++ b/deploy/sample/build.sample.properties @@ -154,3 +154,6 @@ local-server=localhost # mlcp-home=/usr/local/mlcp mlcp-vmargs=-Xmx512m + +# folder to ignore when deploying into modules database +#ignore-folders=.*/src/(node_modules|.tmp)/.*