From 6e99103b6ca429bdfd88d3d29be24767e48febf8 Mon Sep 17 00:00:00 2001 From: Geert Josten Date: Tue, 24 Feb 2015 16:48:23 +0100 Subject: [PATCH 1/3] Fixed #375: updated CHANGELOG --- CHANGELOG.mdown | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/CHANGELOG.mdown b/CHANGELOG.mdown index 5975ea94..4f427535 100644 --- a/CHANGELOG.mdown +++ b/CHANGELOG.mdown @@ -1,6 +1,48 @@ # Roxy Changes This file describes changes made to Roxy per release +## 1.7.2 + + +### New Features + +* [#380](https://github.com/marklogic/roxy/issues/380) Ignore replica forests when bootstrapping to standalone +* [#376](https://github.com/marklogic/roxy/issues/376) Suppressing prompts +* [#375](https://github.com/marklogic/roxy/issues/375) Create ML8 Roxy release +* [#374](https://github.com/marklogic/roxy/issues/374) RFE: show app_specific.rb methods in help output +* [#365](https://github.com/marklogic/roxy/issues/365) Add howto command to show Roxy wiki pages +* [#362](https://github.com/marklogic/roxy/issues/362) Support a new type of application for those which are neither REST nor MVC +* [#337](https://github.com/marklogic/roxy/pull/337) Adding roxy property to ignore certain files or folders +* [#335](https://github.com/marklogic/roxy/issues/335) Raise exception to OS level for integratability +* [#332](https://github.com/marklogic/roxy/issues/332) Make group support work for ML 5 +* [#330](https://github.com/marklogic/roxy/issues/330) Update ml new to select server-version 8 (and drop 4) +* [#328](https://github.com/marklogic/roxy/issues/328) Add group/server/database settings to help +* [#313](https://github.com/marklogic/roxy/issues/313) exposed validate command +* [#312](https://github.com/marklogic/roxy/issues/312) added support for group and host properties, backwards compatible + +### Resolved Issues + +* [#383](https://github.com/marklogic/roxy/issues/383) Reassigning replicas doesn't spread replicas +* [#379](https://github.com/marklogic/roxy/issues/379) Replication forests not created once forests exists +* [#378](https://github.com/marklogic/roxy/issues/378) Forest replication doesn't work unless forests-per-host +* [#377](https://github.com/marklogic/roxy/issues/377) Deploy rest ignores .sjs extensions +* [#370](https://github.com/marklogic/roxy/issues/370) deploy modules throws 404 error after upgrade to ML8 +* [#369](https://github.com/marklogic/roxy/issues/369) Set exit code when setup:do-setup fails +* [#361](https://github.com/marklogic/roxy/issues/361) Is granular replica forest configuration possible? +* [#348](https://github.com/marklogic/roxy/issues/348) ml-config.sample.xml causes roxy to not bootstrap app servers in dev branch +* [#336](https://github.com/marklogic/roxy/issues/336) ML8 doesn't support REST property error-format +* [#334](https://github.com/marklogic/roxy/issues/334) MLCP path with spaces fails +* [#333](https://github.com/marklogic/roxy/issues/333) ml script breaks in gitbash (Windows) +* [#329](https://github.com/marklogic/roxy/issues/329) 'filesystem' db created when when 'filesystem' is specified as the 'modules-db'? +* [#324](https://github.com/marklogic/roxy/issues/324) Command line unit test (ml local test) fails with 404 not found error +* [#323](https://github.com/marklogic/roxy/issues/323) Clear content breaks if (some) forests are read-only +* [#322](https://github.com/marklogic/roxy/issues/322) Bootstrap looses retire status of forest +* [#317](https://github.com/marklogic/roxy/issues/317) restart command not working when variable are provide from command line +* [#355](https://github.com/marklogic/roxy/issues/355) Sample ssl certificate fails +* [#282](https://github.com/marklogic/roxy/issues/282) Orphaned Amps Fix +* [#280](https://github.com/marklogic/roxy/issues/280) Corb.jar not found +* [#265](https://github.com/marklogic/roxy/issues/265) Failing tests in untouched hybrid-project + ## 1.7.1 ### New Features From 36df846b66748d135ada1845bbc27d560d7ac0e4 Mon Sep 17 00:00:00 2001 From: Geert Josten Date: Thu, 30 Apr 2015 09:50:55 +0200 Subject: [PATCH 2/3] Fixed #412: updated copyright years --- CHANGELOG.mdown | 20 ++++++++++++++++--- deploy/lib/MLClient.rb | 2 +- deploy/lib/framework.rb | 2 +- deploy/lib/ml.rb | 2 +- deploy/lib/scaffold.rb | 2 +- deploy/lib/server_config.rb | 2 +- deploy/lib/util.rb | 2 +- deploy/lib/xcc.rb | 2 +- deploy/lib/xquery/cpf.xqy | 2 +- deploy/lib/xquery/setup.xqy | 2 +- license.txt | 2 +- ml | 2 +- src/app/config/config.xqy | 2 +- src/app/controllers/appbuilder.xqy | 2 +- src/app/models/search-lib.xqy | 2 +- src/app/views/appbuilder/main.html.xqy | 2 +- src/app/views/helpers/facet-lib.xqy | 2 +- src/app/views/helpers/form-lib.xqy | 2 +- src/app/views/helpers/pager-lib.xqy | 2 +- src/app/views/helpers/user-lib.xqy | 2 +- src/app/views/layouts/application.html.xqy | 2 +- src/app/views/layouts/soap.xml.xqy | 2 +- src/app/views/layouts/three-column.html.xqy | 2 +- src/app/views/layouts/two-column.html.xqy | 2 +- src/public/css/error.css | 2 +- src/public/css/three-column.less | 2 +- src/public/css/two-column.less | 2 +- src/public/css/vars.less | 2 +- src/public/js/three-column.js | 2 +- src/public/js/two-column.js | 2 +- src/roxy/config/defaults.xqy | 2 +- src/roxy/error.xqy | 2 +- src/roxy/lib/controller-helper.xqy | 2 +- src/roxy/lib/cpf-private.xqy | 2 +- src/roxy/lib/cpf.xqy | 2 +- src/roxy/lib/reflection.xqy | 2 +- src/roxy/lib/request.xqy | 2 +- src/roxy/lib/routing-helper.xqy | 2 +- src/roxy/lib/soap-lib.xqy | 2 +- src/roxy/lib/util.xqy | 2 +- src/roxy/lib/view-helper.xqy | 2 +- src/roxy/query-router.xqy | 2 +- src/roxy/rewrite.xqy | 2 +- src/roxy/router.xqy | 2 +- src/roxy/update-router.xqy | 2 +- src/test/css/tests.css | 2 +- src/test/default.xqy | 2 +- src/test/js/tests.js | 2 +- .../test-data/test-layout.html.xqy | 2 +- .../request-lib/test-data/test-request.xqy | 2 +- src/test/test-config.xqy | 2 +- src/test/test-helper.xqy | 2 +- 52 files changed, 68 insertions(+), 54 deletions(-) diff --git a/CHANGELOG.mdown b/CHANGELOG.mdown index 4f427535..bbe5c73a 100644 --- a/CHANGELOG.mdown +++ b/CHANGELOG.mdown @@ -3,13 +3,15 @@ This file describes changes made to Roxy per release ## 1.7.2 - ### New Features - +* [#410](https://github.com/marklogic/roxy/issues/410) Test .sjs modules using SJS unit testing +* [#404](https://github.com/marklogic/roxy/issues/404) Remove orphaned amps at wipe deployer enhancement +* [#397](https://github.com/marklogic/roxy/issues/397) Dynamically suppress error-format if ML8 deployer enhancement * [#380](https://github.com/marklogic/roxy/issues/380) Ignore replica forests when bootstrapping to standalone * [#376](https://github.com/marklogic/roxy/issues/376) Suppressing prompts * [#375](https://github.com/marklogic/roxy/issues/375) Create ML8 Roxy release * [#374](https://github.com/marklogic/roxy/issues/374) RFE: show app_specific.rb methods in help output +* [#371](https://github.com/marklogic/roxy/issues/371) Deploy modules not honoring modules root deployer enhancement * [#365](https://github.com/marklogic/roxy/issues/365) Add howto command to show Roxy wiki pages * [#362](https://github.com/marklogic/roxy/issues/362) Support a new type of application for those which are neither REST nor MVC * [#337](https://github.com/marklogic/roxy/pull/337) Adding roxy property to ignore certain files or folders @@ -19,9 +21,18 @@ This file describes changes made to Roxy per release * [#328](https://github.com/marklogic/roxy/issues/328) Add group/server/database settings to help * [#313](https://github.com/marklogic/roxy/issues/313) exposed validate command * [#312](https://github.com/marklogic/roxy/issues/312) added support for group and host properties, backwards compatible +* [#231](https://github.com/marklogic/roxy/issues/231) separate deploy modules from rest extensions and transforms enhancement +* [#223](https://github.com/marklogic/roxy/issues/223) Allow capturing modules for any app-type capture +* [#78](https://github.com/marklogic/roxy/issues/78) Integrated with MLCP ### Resolved Issues - +* [#428](https://github.com/marklogic/roxy/issues/428) JSON sending in the request body is not being converted into map:map in ML8 +* [#412](https://github.com/marklogic/roxy/issues/412) Update copyright +* [#405](https://github.com/marklogic/roxy/issues/405) Make sure field-value-searches works at field level bug deployer +* [#400](https://github.com/marklogic/roxy/issues/400) Win8.1 ML7 Roxy rest problem +* [#399](https://github.com/marklogic/roxy/issues/399) ML8 with Roxy on Win8.1 +* [#398](https://github.com/marklogic/roxy/issues/398) Ignore empty settings in version-check bug +* [#391](https://github.com/marklogic/roxy/issues/391) Corb doesn't run against ML8 bug * [#383](https://github.com/marklogic/roxy/issues/383) Reassigning replicas doesn't spread replicas * [#379](https://github.com/marklogic/roxy/issues/379) Replication forests not created once forests exists * [#378](https://github.com/marklogic/roxy/issues/378) Forest replication doesn't work unless forests-per-host @@ -29,7 +40,10 @@ This file describes changes made to Roxy per release * [#370](https://github.com/marklogic/roxy/issues/370) deploy modules throws 404 error after upgrade to ML8 * [#369](https://github.com/marklogic/roxy/issues/369) Set exit code when setup:do-setup fails * [#361](https://github.com/marklogic/roxy/issues/361) Is granular replica forest configuration possible? +* [#355](https://github.com/marklogic/roxy/issues/355) Sample ssl certificate fails bug +* [#353](https://github.com/marklogic/roxy/issues/353) Capture configs is unable to capture users and roles when specified by name capture deployer * [#348](https://github.com/marklogic/roxy/issues/348) ml-config.sample.xml causes roxy to not bootstrap app servers in dev branch +* [#339](https://github.com/marklogic/roxy/issues/339) self-test is failing bug deployer * [#336](https://github.com/marklogic/roxy/issues/336) ML8 doesn't support REST property error-format * [#334](https://github.com/marklogic/roxy/issues/334) MLCP path with spaces fails * [#333](https://github.com/marklogic/roxy/issues/333) ml script breaks in gitbash (Windows) diff --git a/deploy/lib/MLClient.rb b/deploy/lib/MLClient.rb index 18404ca5..c268db7a 100644 --- a/deploy/lib/MLClient.rb +++ b/deploy/lib/MLClient.rb @@ -1,5 +1,5 @@ ############################################################################### -# Copyright 2012 MarkLogic Corporation +# Copyright 2012-2015 MarkLogic Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/deploy/lib/framework.rb b/deploy/lib/framework.rb index 60c44815..6ae900dc 100644 --- a/deploy/lib/framework.rb +++ b/deploy/lib/framework.rb @@ -1,5 +1,5 @@ ############################################################################### -# Copyright 2012 MarkLogic Corporation +# Copyright 2012-2015 MarkLogic Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/deploy/lib/ml.rb b/deploy/lib/ml.rb index 8e53fd1c..65bbfa4b 100755 --- a/deploy/lib/ml.rb +++ b/deploy/lib/ml.rb @@ -1,5 +1,5 @@ ############################################################################### -# Copyright 2012 MarkLogic Corporation +# Copyright 2012-2015 MarkLogic Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/deploy/lib/scaffold.rb b/deploy/lib/scaffold.rb index 28a79d9e..a6fd8fdc 100644 --- a/deploy/lib/scaffold.rb +++ b/deploy/lib/scaffold.rb @@ -1,5 +1,5 @@ ############################################################################### -# Copyright 2012 MarkLogic Corporation +# Copyright 2012-2015 MarkLogic Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index 067584cf..6b7a239e 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -1,5 +1,5 @@ ############################################################################### -# Copyright 2012 MarkLogic Corporation +# Copyright 2012-2015 MarkLogic Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/deploy/lib/util.rb b/deploy/lib/util.rb index 1c64830c..5eab3987 100644 --- a/deploy/lib/util.rb +++ b/deploy/lib/util.rb @@ -1,5 +1,5 @@ ############################################################################### -# Copyright 2012 MarkLogic Corporation +# Copyright 2012-2015 MarkLogic Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/deploy/lib/xcc.rb b/deploy/lib/xcc.rb index a8942b70..1ebf5c38 100644 --- a/deploy/lib/xcc.rb +++ b/deploy/lib/xcc.rb @@ -1,5 +1,5 @@ ############################################################################### -# Copyright 2012 MarkLogic Corporation +# Copyright 2012-2015 MarkLogic Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/deploy/lib/xquery/cpf.xqy b/deploy/lib/xquery/cpf.xqy index 68ec42c5..1b8039af 100644 --- a/deploy/lib/xquery/cpf.xqy +++ b/deploy/lib/xquery/cpf.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/deploy/lib/xquery/setup.xqy b/deploy/lib/xquery/setup.xqy index 328daeba..eca7bc2c 100644 --- a/deploy/lib/xquery/setup.xqy +++ b/deploy/lib/xquery/setup.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/license.txt b/license.txt index 3f3fc395..2d496428 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/ml b/ml index 11a0a52f..0d2c5e75 100755 --- a/ml +++ b/ml @@ -1,6 +1,6 @@ #!/bin/bash ############################################################################### -# Copyright 2012 MarkLogic Corporation +# Copyright 2012-2015 MarkLogic Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/app/config/config.xqy b/src/app/config/config.xqy index 82c5db0a..6fce1a48 100644 --- a/src/app/config/config.xqy +++ b/src/app/config/config.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/app/controllers/appbuilder.xqy b/src/app/controllers/appbuilder.xqy index be4cf5ac..be8be477 100644 --- a/src/app/controllers/appbuilder.xqy +++ b/src/app/controllers/appbuilder.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/app/models/search-lib.xqy b/src/app/models/search-lib.xqy index 5df88ef0..21418d19 100644 --- a/src/app/models/search-lib.xqy +++ b/src/app/models/search-lib.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/app/views/appbuilder/main.html.xqy b/src/app/views/appbuilder/main.html.xqy index 03763881..1f6d2f6f 100644 --- a/src/app/views/appbuilder/main.html.xqy +++ b/src/app/views/appbuilder/main.html.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/app/views/helpers/facet-lib.xqy b/src/app/views/helpers/facet-lib.xqy index cdab80c9..ed8d8337 100644 --- a/src/app/views/helpers/facet-lib.xqy +++ b/src/app/views/helpers/facet-lib.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/app/views/helpers/form-lib.xqy b/src/app/views/helpers/form-lib.xqy index f0feef3d..8a2677c9 100644 --- a/src/app/views/helpers/form-lib.xqy +++ b/src/app/views/helpers/form-lib.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/app/views/helpers/pager-lib.xqy b/src/app/views/helpers/pager-lib.xqy index 836abe12..c293e9b7 100644 --- a/src/app/views/helpers/pager-lib.xqy +++ b/src/app/views/helpers/pager-lib.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/app/views/helpers/user-lib.xqy b/src/app/views/helpers/user-lib.xqy index 271bd873..f61631cc 100644 --- a/src/app/views/helpers/user-lib.xqy +++ b/src/app/views/helpers/user-lib.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/app/views/layouts/application.html.xqy b/src/app/views/layouts/application.html.xqy index bba398a0..e2c3a049 100644 --- a/src/app/views/layouts/application.html.xqy +++ b/src/app/views/layouts/application.html.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/app/views/layouts/soap.xml.xqy b/src/app/views/layouts/soap.xml.xqy index 11d7c619..cf4a524d 100644 --- a/src/app/views/layouts/soap.xml.xqy +++ b/src/app/views/layouts/soap.xml.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/app/views/layouts/three-column.html.xqy b/src/app/views/layouts/three-column.html.xqy index 1e3fc0dd..e7bce272 100644 --- a/src/app/views/layouts/three-column.html.xqy +++ b/src/app/views/layouts/three-column.html.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/app/views/layouts/two-column.html.xqy b/src/app/views/layouts/two-column.html.xqy index dfd9c742..ebf818ec 100644 --- a/src/app/views/layouts/two-column.html.xqy +++ b/src/app/views/layouts/two-column.html.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/public/css/error.css b/src/public/css/error.css index de43b372..d493d78d 100644 --- a/src/public/css/error.css +++ b/src/public/css/error.css @@ -1,5 +1,5 @@ /** -* Copyright 2012 MarkLogic Corporation +* Copyright 2012-2015 MarkLogic Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/public/css/three-column.less b/src/public/css/three-column.less index 1a007a9d..cec7e13d 100644 --- a/src/public/css/three-column.less +++ b/src/public/css/three-column.less @@ -1,5 +1,5 @@ /** -* Copyright 2012 MarkLogic Corporation +* Copyright 2012-2015 MarkLogic Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/public/css/two-column.less b/src/public/css/two-column.less index 77a4da3c..4558a090 100644 --- a/src/public/css/two-column.less +++ b/src/public/css/two-column.less @@ -1,5 +1,5 @@ /** -* Copyright 2012 MarkLogic Corporation +* Copyright 2012-2015 MarkLogic Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/public/css/vars.less b/src/public/css/vars.less index 1841fffe..ca2c5f33 100644 --- a/src/public/css/vars.less +++ b/src/public/css/vars.less @@ -1,5 +1,5 @@ /** -* Copyright 2012 MarkLogic Corporation +* Copyright 2012-2015 MarkLogic Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/public/js/three-column.js b/src/public/js/three-column.js index 11c84f1a..2b62c501 100644 --- a/src/public/js/three-column.js +++ b/src/public/js/three-column.js @@ -1,5 +1,5 @@ /** -* Copyright 2012 MarkLogic Corporation +* Copyright 2012-2015 MarkLogic Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/public/js/two-column.js b/src/public/js/two-column.js index 11c84f1a..2b62c501 100644 --- a/src/public/js/two-column.js +++ b/src/public/js/two-column.js @@ -1,5 +1,5 @@ /** -* Copyright 2012 MarkLogic Corporation +* Copyright 2012-2015 MarkLogic Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/roxy/config/defaults.xqy b/src/roxy/config/defaults.xqy index 0a96e29d..4e8430d8 100644 --- a/src/roxy/config/defaults.xqy +++ b/src/roxy/config/defaults.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/error.xqy b/src/roxy/error.xqy index ceca3c46..197abad5 100644 --- a/src/roxy/error.xqy +++ b/src/roxy/error.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/lib/controller-helper.xqy b/src/roxy/lib/controller-helper.xqy index 91e197f8..0bd80655 100644 --- a/src/roxy/lib/controller-helper.xqy +++ b/src/roxy/lib/controller-helper.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/lib/cpf-private.xqy b/src/roxy/lib/cpf-private.xqy index 140a709e..a001fdb3 100644 --- a/src/roxy/lib/cpf-private.xqy +++ b/src/roxy/lib/cpf-private.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/lib/cpf.xqy b/src/roxy/lib/cpf.xqy index 94782539..5528cb23 100644 --- a/src/roxy/lib/cpf.xqy +++ b/src/roxy/lib/cpf.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/lib/reflection.xqy b/src/roxy/lib/reflection.xqy index c994e477..e05d8d5a 100644 --- a/src/roxy/lib/reflection.xqy +++ b/src/roxy/lib/reflection.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/lib/request.xqy b/src/roxy/lib/request.xqy index 998b0d37..3eb40090 100644 --- a/src/roxy/lib/request.xqy +++ b/src/roxy/lib/request.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/lib/routing-helper.xqy b/src/roxy/lib/routing-helper.xqy index fafa3f05..610ef880 100644 --- a/src/roxy/lib/routing-helper.xqy +++ b/src/roxy/lib/routing-helper.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/lib/soap-lib.xqy b/src/roxy/lib/soap-lib.xqy index f21156eb..b91ce0e3 100644 --- a/src/roxy/lib/soap-lib.xqy +++ b/src/roxy/lib/soap-lib.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/lib/util.xqy b/src/roxy/lib/util.xqy index 4d38bd84..fed73b06 100644 --- a/src/roxy/lib/util.xqy +++ b/src/roxy/lib/util.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/lib/view-helper.xqy b/src/roxy/lib/view-helper.xqy index ce39fdbc..7e28a69c 100644 --- a/src/roxy/lib/view-helper.xqy +++ b/src/roxy/lib/view-helper.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/query-router.xqy b/src/roxy/query-router.xqy index b96e91b6..ccf038d4 100644 --- a/src/roxy/query-router.xqy +++ b/src/roxy/query-router.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/rewrite.xqy b/src/roxy/rewrite.xqy index dbbb5ccf..2d7125c4 100644 --- a/src/roxy/rewrite.xqy +++ b/src/roxy/rewrite.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/router.xqy b/src/roxy/router.xqy index 01065757..aa3fe255 100644 --- a/src/roxy/router.xqy +++ b/src/roxy/router.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/roxy/update-router.xqy b/src/roxy/update-router.xqy index d62c6326..8770507e 100644 --- a/src/roxy/update-router.xqy +++ b/src/roxy/update-router.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/css/tests.css b/src/test/css/tests.css index d80df061..2e87c62f 100644 --- a/src/test/css/tests.css +++ b/src/test/css/tests.css @@ -1,5 +1,5 @@ /** -* Copyright 2012 MarkLogic Corporation +* Copyright 2012-2015 MarkLogic Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/default.xqy b/src/test/default.xqy index 4e69f7eb..da304e6c 100644 --- a/src/test/default.xqy +++ b/src/test/default.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/js/tests.js b/src/test/js/tests.js index 5fac069c..77a71e5b 100644 --- a/src/test/js/tests.js +++ b/src/test/js/tests.js @@ -1,5 +1,5 @@ /** -* Copyright 2012 MarkLogic Corporation +* Copyright 2012-2015 MarkLogic Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/suites/Framework Tests/test-data/test-layout.html.xqy b/src/test/suites/Framework Tests/test-data/test-layout.html.xqy index 98a9109c..7fb1df5f 100644 --- a/src/test/suites/Framework Tests/test-data/test-layout.html.xqy +++ b/src/test/suites/Framework Tests/test-data/test-layout.html.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/suites/request-lib/test-data/test-request.xqy b/src/test/suites/request-lib/test-data/test-request.xqy index f05b2274..1510bbc5 100755 --- a/src/test/suites/request-lib/test-data/test-request.xqy +++ b/src/test/suites/request-lib/test-data/test-request.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test-config.xqy b/src/test/test-config.xqy index a523362d..eb609407 100644 --- a/src/test/test-config.xqy +++ b/src/test/test-config.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/test-helper.xqy b/src/test/test-helper.xqy index cd550e60..4d97a355 100644 --- a/src/test/test-helper.xqy +++ b/src/test/test-helper.xqy @@ -1,5 +1,5 @@ (: -Copyright 2012 MarkLogic Corporation +Copyright 2012-2015 MarkLogic Corporation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 0bd333e3c9bb4b6760de571f08bd9adb9f51506c Mon Sep 17 00:00:00 2001 From: Geert Josten Date: Thu, 30 Apr 2015 10:45:32 +0200 Subject: [PATCH 3/3] Added latest PRs to changelog (assuming they get accepted) --- CHANGELOG.mdown | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.mdown b/CHANGELOG.mdown index bbe5c73a..22889dce 100644 --- a/CHANGELOG.mdown +++ b/CHANGELOG.mdown @@ -5,15 +5,19 @@ This file describes changes made to Roxy per release ### New Features * [#410](https://github.com/marklogic/roxy/issues/410) Test .sjs modules using SJS unit testing -* [#404](https://github.com/marklogic/roxy/issues/404) Remove orphaned amps at wipe deployer enhancement -* [#397](https://github.com/marklogic/roxy/issues/397) Dynamically suppress error-format if ML8 deployer enhancement +* [#404](https://github.com/marklogic/roxy/issues/404) Remove orphaned amps at wipe +* [#397](https://github.com/marklogic/roxy/issues/397) Dynamically suppress error-format if ML8 +* [#395](https://github.com/marklogic/roxy/issues/395) Automatically adjust rewriter based on ml version * [#380](https://github.com/marklogic/roxy/issues/380) Ignore replica forests when bootstrapping to standalone * [#376](https://github.com/marklogic/roxy/issues/376) Suppressing prompts * [#375](https://github.com/marklogic/roxy/issues/375) Create ML8 Roxy release * [#374](https://github.com/marklogic/roxy/issues/374) RFE: show app_specific.rb methods in help output -* [#371](https://github.com/marklogic/roxy/issues/371) Deploy modules not honoring modules root deployer enhancement +* [#371](https://github.com/marklogic/roxy/issues/371) Deploy modules not honoring modules root +* [#366](https://github.com/marklogic/roxy/issues/366) Added bootstrap/wipe for internal replicas * [#365](https://github.com/marklogic/roxy/issues/365) Add howto command to show Roxy wiki pages +* [#364](https://github.com/marklogic/roxy/issues/364) Suppress triggers/schemas in ml-config if eq modules * [#362](https://github.com/marklogic/roxy/issues/362) Support a new type of application for those which are neither REST nor MVC +* [#359](https://github.com/marklogic/roxy/issues/359) Added separate mlcp user/pass properties * [#337](https://github.com/marklogic/roxy/pull/337) Adding roxy property to ignore certain files or folders * [#335](https://github.com/marklogic/roxy/issues/335) Raise exception to OS level for integratability * [#332](https://github.com/marklogic/roxy/issues/332) Make group support work for ML 5 @@ -28,11 +32,11 @@ This file describes changes made to Roxy per release ### Resolved Issues * [#428](https://github.com/marklogic/roxy/issues/428) JSON sending in the request body is not being converted into map:map in ML8 * [#412](https://github.com/marklogic/roxy/issues/412) Update copyright -* [#405](https://github.com/marklogic/roxy/issues/405) Make sure field-value-searches works at field level bug deployer +* [#405](https://github.com/marklogic/roxy/issues/405) Make sure field-value-searches works at field level * [#400](https://github.com/marklogic/roxy/issues/400) Win8.1 ML7 Roxy rest problem * [#399](https://github.com/marklogic/roxy/issues/399) ML8 with Roxy on Win8.1 -* [#398](https://github.com/marklogic/roxy/issues/398) Ignore empty settings in version-check bug -* [#391](https://github.com/marklogic/roxy/issues/391) Corb doesn't run against ML8 bug +* [#398](https://github.com/marklogic/roxy/issues/398) Ignore empty settings in version-check +* [#391](https://github.com/marklogic/roxy/issues/391) Corb doesn't run against ML8 * [#383](https://github.com/marklogic/roxy/issues/383) Reassigning replicas doesn't spread replicas * [#379](https://github.com/marklogic/roxy/issues/379) Replication forests not created once forests exists * [#378](https://github.com/marklogic/roxy/issues/378) Forest replication doesn't work unless forests-per-host @@ -40,10 +44,10 @@ This file describes changes made to Roxy per release * [#370](https://github.com/marklogic/roxy/issues/370) deploy modules throws 404 error after upgrade to ML8 * [#369](https://github.com/marklogic/roxy/issues/369) Set exit code when setup:do-setup fails * [#361](https://github.com/marklogic/roxy/issues/361) Is granular replica forest configuration possible? -* [#355](https://github.com/marklogic/roxy/issues/355) Sample ssl certificate fails bug -* [#353](https://github.com/marklogic/roxy/issues/353) Capture configs is unable to capture users and roles when specified by name capture deployer +* [#355](https://github.com/marklogic/roxy/issues/355) Sample ssl certificate fails +* [#353](https://github.com/marklogic/roxy/issues/353) Capture configs is unable to capture users and roles when specified by name * [#348](https://github.com/marklogic/roxy/issues/348) ml-config.sample.xml causes roxy to not bootstrap app servers in dev branch -* [#339](https://github.com/marklogic/roxy/issues/339) self-test is failing bug deployer +* [#339](https://github.com/marklogic/roxy/issues/339) self-test is failing * [#336](https://github.com/marklogic/roxy/issues/336) ML8 doesn't support REST property error-format * [#334](https://github.com/marklogic/roxy/issues/334) MLCP path with spaces fails * [#333](https://github.com/marklogic/roxy/issues/333) ml script breaks in gitbash (Windows)