From 97788a2d8f742b3ccefe181364b51645feeb5bf5 Mon Sep 17 00:00:00 2001 From: gaborflorian <114913193+gaborflorian@users.noreply.github.com> Date: Fri, 24 Mar 2023 14:33:20 +0100 Subject: [PATCH] JNG-4625 Judo ng project replacment (#26) * Replace logback-test.xm warn to info, add CIFLOW.adoc the 4th step, dependabot name is consequence now * JNG-4625 license plugin fix * License profile exclude .json files, generate headers and license files * Fix tabs and line ends * Add the missing newlines in not binary files * Add new line to yml files * JNG-4625 Add the yml files the remove toolchains xml and setup maven toolchains xml steps * JNG-4625 Remove setup maven toolchains.xml action * JNG-4625 Remove id from setup-java action * JNG-4625 Remove license from css and htmls --- .github/CIFLOW.adoc | 2 +- .github/workflows/build-dependabot.yml | 6 +- .github/workflows/build.yml | 6 +- .github/workflows/bump-version.yml | 4 + .../workflows/create-release-on-master.yml | 4 + .../workflows/delete-old-draft-releases.yml | 2 +- .github/workflows/release.yml | 4 + LICENSE.txt | 201 ++++++++++++++++++ logback-test.xml | 2 +- pom.xml | 17 +- .../LICENSE.txt | 201 ++++++++++++++++++ .../northwind/conf/db-data-config.xml | 19 ++ .../configsets/northwind/conf/schema.xml | 20 ++ .../configsets/northwind/conf/solrconfig.xml | 20 ++ .../LICENSE.txt | 201 ++++++++++++++++++ .../exampleCollection/conf/params.json | 2 +- .../exampleCollection/conf/schema.xml | 20 ++ .../exampleCollection/conf/solrconfig.xml | 20 ++ solr-osgi-feature/LICENSE.txt | 201 ++++++++++++++++++ .../src/main/features/solr-osgi-feature.xml | 20 ++ solr-osgi-http/LICENSE.txt | 201 ++++++++++++++++++ .../solr/osgi/http/SolrContentServlet.java | 20 ++ .../solr/osgi/http/SolrHttpConfig.java | 20 ++ .../osgi/http/SolrHttpServiceManager.java | 20 ++ .../osgi/http/SolrOsgiDispatchFilter.java | 20 ++ .../solr/osgi/http/SolrOsgiHttpContext.java | 20 ++ .../main/resources/css/angular/analysis.css | 1 + .../src/main/resources/css/angular/chosen.css | 1 + .../src/main/resources/css/angular/cloud.css | 3 +- .../resources/css/angular/collections.css | 3 +- .../src/main/resources/css/angular/common.css | 1 + .../src/main/resources/css/angular/cores.css | 1 + .../main/resources/css/angular/dashboard.css | 1 + .../main/resources/css/angular/dataimport.css | 1 + .../main/resources/css/angular/documents.css | 1 + .../src/main/resources/css/angular/files.css | 1 + .../src/main/resources/css/angular/index.css | 1 + .../resources/css/angular/java-properties.css | 1 + .../main/resources/css/angular/logging.css | 1 + .../src/main/resources/css/angular/menu.css | 1 + .../main/resources/css/angular/plugins.css | 1 + .../src/main/resources/css/angular/query.css | 1 + .../resources/css/angular/replication.css | 1 + .../src/main/resources/css/angular/schema.css | 3 +- .../main/resources/css/angular/segments.css | 1 + .../src/main/resources/css/angular/stream.css | 1 + .../main/resources/css/angular/threads.css | 1 + .../src/main/resources/img/solr.svg | 20 ++ solr-osgi-http/src/main/resources/index.html | 20 ++ .../src/main/resources/js/angular/app.js | 19 ++ .../js/angular/controllers/analysis.js | 19 ++ .../resources/js/angular/controllers/cloud.js | 19 ++ .../controllers/collection-overview.js | 19 ++ .../js/angular/controllers/collections.js | 19 ++ .../js/angular/controllers/core-overview.js | 19 ++ .../resources/js/angular/controllers/cores.js | 19 ++ .../js/angular/controllers/dataimport.js | 19 ++ .../js/angular/controllers/documents.js | 19 ++ .../resources/js/angular/controllers/files.js | 19 ++ .../resources/js/angular/controllers/index.js | 19 ++ .../js/angular/controllers/java-properties.js | 19 ++ .../js/angular/controllers/logging.js | 20 ++ .../js/angular/controllers/plugins.js | 19 ++ .../resources/js/angular/controllers/query.js | 19 ++ .../js/angular/controllers/replication.js | 19 ++ .../js/angular/controllers/schema.js | 19 ++ .../js/angular/controllers/segments.js | 19 ++ .../js/angular/controllers/stream.js | 19 ++ .../js/angular/controllers/threads.js | 19 ++ .../src/main/resources/js/angular/services.js | 19 ++ .../src/main/resources/libs/angular-chosen.js | 19 ++ .../main/resources/libs/angular-cookies.js | 19 ++ .../src/main/resources/libs/angular-route.js | 19 ++ .../main/resources/libs/angular-sanitize.js | 19 ++ .../src/main/resources/libs/angular.js | 20 ++ .../src/main/resources/libs/chosen.jquery.js | 19 ++ solr-osgi-http/src/main/resources/libs/d3.js | 19 ++ .../src/main/resources/libs/highlight.js | 19 ++ .../main/resources/libs/jquery-2.1.3.min.js | 1 + .../src/main/resources/libs/jquery.jstree.js | 19 ++ .../src/main/resources/libs/ngtimeago.js | 19 ++ .../src/main/resources/partials/analysis.html | 19 ++ .../src/main/resources/partials/cloud.html | 19 ++ .../partials/collection_overview.html | 19 ++ .../main/resources/partials/collections.html | 19 ++ .../resources/partials/core_overview.html | 19 ++ .../src/main/resources/partials/cores.html | 19 ++ .../main/resources/partials/dataimport.html | 19 ++ .../main/resources/partials/documents.html | 19 ++ .../src/main/resources/partials/files.html | 21 +- .../src/main/resources/partials/index.html | 19 ++ .../resources/partials/java-properties.html | 19 ++ .../resources/partials/logging-levels.html | 19 ++ .../src/main/resources/partials/logging.html | 19 ++ .../src/main/resources/partials/plugins.html | 19 ++ .../src/main/resources/partials/query.html | 19 ++ .../main/resources/partials/replication.html | 19 ++ .../src/main/resources/partials/schema.html | 19 ++ .../src/main/resources/partials/segments.html | 21 +- .../src/main/resources/partials/stream.html | 19 ++ .../src/main/resources/partials/threads.html | 19 ++ solr-osgi-karaf/LICENSE.txt | 201 ++++++++++++++++++ solr-osgi-services/LICENSE.txt | 201 ++++++++++++++++++ .../solr/osgi/OsgiConfigSetService.java | 22 +- .../blackbelt/solr/osgi/OsgiSolrFactory.java | 20 ++ .../solr/osgi/SolrCoreContainerConfig.java | 20 ++ .../solr/osgi/SolrCoreContainerManager.java | 20 ++ .../blackbelt/solr/osgi/SolrXmlGenerator.java | 20 ++ .../solr/osgi/OsgiSolrFactoryTest.java | 22 +- .../src/test/resources/log4j2.xml | 22 +- 110 files changed, 2846 insertions(+), 18 deletions(-) create mode 100644 LICENSE.txt create mode 100644 solr-osgi-example-configsets-dataimportNorthwind/LICENSE.txt create mode 100644 solr-osgi-example-configsets-exampleCollection/LICENSE.txt create mode 100644 solr-osgi-feature/LICENSE.txt create mode 100644 solr-osgi-http/LICENSE.txt create mode 100644 solr-osgi-karaf/LICENSE.txt create mode 100644 solr-osgi-services/LICENSE.txt diff --git a/.github/CIFLOW.adoc b/.github/CIFLOW.adoc index 76813d8..e3abb42 100644 --- a/.github/CIFLOW.adoc +++ b/.github/CIFLOW.adoc @@ -80,7 +80,7 @@ Version numbers are increased using semantic versioning: * 2nd number in version of *develop* branch is increased when a release branch started * do not change version numbers on bugfix/ branches - that are applied on release branches during testing before releasing it (merging to master) * 3rd number in version of support/ branches is increased when started - it is used to support a previous release including new (minor) changes; support/ branches are merged back to release branch when update is released (without merging changes to master) -* 3rd number in version of hotfix/ branches is increased when started (that are applied on both release and master branches) +* 4th number in version of hotfix/ branches is increased when started (that are applied on both release and master branches) === Gihub action flows diff --git a/.github/workflows/build-dependabot.yml b/.github/workflows/build-dependabot.yml index 83f2ac6..2ed6498 100644 --- a/.github/workflows/build-dependabot.yml +++ b/.github/workflows/build-dependabot.yml @@ -1,4 +1,4 @@ -name: Build project +name: Build project for Dependabot on: pull_request_target: @@ -27,12 +27,16 @@ jobs: id: context uses: zero88/gh-project-context@v1.2 + - name: 🧹 Remove toolchains.xml + run: rm $HOME/.m2/toolchains.xml || true + - name: 🛠️ Set up JDK 17 uses: actions/setup-java@v3 with: java-version: '17' distribution: 'zulu' + - name: 🧹 Remove settings.xml run: rm $HOME/.m2/settings.xml || true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be97868..36462ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,12 +30,16 @@ jobs: id: context uses: zero88/gh-project-context@v1.2 - - name: 🛠 Set up JDK 17 + - name: 🧹 Remove toolchains.xml + run: rm $HOME/.m2/toolchains.xml || true + + - name: 🛠️ Set up JDK 17 uses: actions/setup-java@v3 with: java-version: '17' distribution: 'zulu' + - name: 🔢 Get the current PR number uses: jwalton/gh-find-current-pr@v1 id: current-pr diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index a852130..61115fc 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -33,12 +33,16 @@ jobs: id: context uses: zero88/gh-project-context@v1.2 + - name: 🧹 Remove toolchains.xml + run: rm $HOME/.m2/toolchains.xml || true + - name: 🛠️ Set up JDK 17 uses: actions/setup-java@v3 with: java-version: '17' distribution: 'zulu' + - name: 🧹 Remove settings.xml run: rm $HOME/.m2/settings.xml || true diff --git a/.github/workflows/create-release-on-master.yml b/.github/workflows/create-release-on-master.yml index dade632..f882e07 100644 --- a/.github/workflows/create-release-on-master.yml +++ b/.github/workflows/create-release-on-master.yml @@ -18,12 +18,16 @@ jobs: with: fetch-depth: 0 + - name: 🧹 Remove toolchains.xml + run: rm $HOME/.m2/toolchains.xml || true + - name: 🛠️ Set up JDK 17 uses: actions/setup-java@v3 with: java-version: '17' distribution: 'zulu' + - name: 🧹 Remove settings.xml run: rm $HOME/.m2/settings.xml || true diff --git a/.github/workflows/delete-old-draft-releases.yml b/.github/workflows/delete-old-draft-releases.yml index d58e954..7e43d20 100644 --- a/.github/workflows/delete-old-draft-releases.yml +++ b/.github/workflows/delete-old-draft-releases.yml @@ -13,4 +13,4 @@ jobs: with: threshold: 30 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09715ca..7bdebfe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,12 +33,16 @@ jobs: id: context uses: zero88/gh-project-context@v1.2 + - name: 🧹 Remove toolchains.xml + run: rm $HOME/.m2/toolchains.xml || true + - name: 🛠️ Set up JDK 17 uses: actions/setup-java@v3 with: java-version: '17' distribution: 'zulu' + - name: 🧹 Remove settings.xml run: rm $HOME/.m2/settings.xml || true diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/logback-test.xml b/logback-test.xml index eb4c317..6f4c805 100644 --- a/logback-test.xml +++ b/logback-test.xml @@ -15,4 +15,4 @@ true - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 0f0b20e..5f7c2f5 100644 --- a/pom.xml +++ b/pom.xml @@ -768,10 +768,19 @@ process-sources apache_v2 - - src/main/java - src/test - + + **/*.json + + + + + second + + update-project-license + + process-sources + + apache_v2 diff --git a/solr-osgi-example-configsets-dataimportNorthwind/LICENSE.txt b/solr-osgi-example-configsets-dataimportNorthwind/LICENSE.txt new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/solr-osgi-example-configsets-dataimportNorthwind/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/solr-osgi-example-configsets-dataimportNorthwind/src/main/resources/configsets/northwind/conf/db-data-config.xml b/solr-osgi-example-configsets-dataimportNorthwind/src/main/resources/configsets/northwind/conf/db-data-config.xml index d1b7e53..241989f 100644 --- a/solr-osgi-example-configsets-dataimportNorthwind/src/main/resources/configsets/northwind/conf/db-data-config.xml +++ b/solr-osgi-example-configsets-dataimportNorthwind/src/main/resources/configsets/northwind/conf/db-data-config.xml @@ -1,3 +1,22 @@ + + + diff --git a/solr-osgi-example-configsets-dataimportNorthwind/src/main/resources/configsets/northwind/conf/solrconfig.xml b/solr-osgi-example-configsets-dataimportNorthwind/src/main/resources/configsets/northwind/conf/solrconfig.xml index e81fc6a..6c394ee 100644 --- a/solr-osgi-example-configsets-dataimportNorthwind/src/main/resources/configsets/northwind/conf/solrconfig.xml +++ b/solr-osgi-example-configsets-dataimportNorthwind/src/main/resources/configsets/northwind/conf/solrconfig.xml @@ -1,4 +1,24 @@ + + 7.0.1 diff --git a/solr-osgi-example-configsets-exampleCollection/LICENSE.txt b/solr-osgi-example-configsets-exampleCollection/LICENSE.txt new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/solr-osgi-example-configsets-exampleCollection/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/solr-osgi-example-configsets-exampleCollection/src/main/resources/configsets/exampleCollection/conf/params.json b/solr-osgi-example-configsets-exampleCollection/src/main/resources/configsets/exampleCollection/conf/params.json index 06114ef..9c259db 100644 --- a/solr-osgi-example-configsets-exampleCollection/src/main/resources/configsets/exampleCollection/conf/params.json +++ b/solr-osgi-example-configsets-exampleCollection/src/main/resources/configsets/exampleCollection/conf/params.json @@ -17,4 +17,4 @@ "v.layout": "layout", "":{"v":0} } -}} \ No newline at end of file +}} diff --git a/solr-osgi-example-configsets-exampleCollection/src/main/resources/configsets/exampleCollection/conf/schema.xml b/solr-osgi-example-configsets-exampleCollection/src/main/resources/configsets/exampleCollection/conf/schema.xml index 9f133fc..543b925 100644 --- a/solr-osgi-example-configsets-exampleCollection/src/main/resources/configsets/exampleCollection/conf/schema.xml +++ b/solr-osgi-example-configsets-exampleCollection/src/main/resources/configsets/exampleCollection/conf/schema.xml @@ -1,4 +1,24 @@ + + + + diff --git a/solr-osgi-http/LICENSE.txt b/solr-osgi-http/LICENSE.txt new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/solr-osgi-http/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrContentServlet.java b/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrContentServlet.java index 53c5bda..566bb34 100644 --- a/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrContentServlet.java +++ b/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrContentServlet.java @@ -1,5 +1,25 @@ package hu.blackbelt.solr.osgi.http; +/*- + * #%L + * Solr OSGi HTTP + * %% + * Copyright (C) 2018 - 2023 BlackBelt Technology + * %% + * 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. + * #L% + */ + import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.CloseShieldOutputStream; diff --git a/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrHttpConfig.java b/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrHttpConfig.java index 80c8f7f..e7b8ca2 100644 --- a/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrHttpConfig.java +++ b/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrHttpConfig.java @@ -1,5 +1,25 @@ package hu.blackbelt.solr.osgi.http; +/*- + * #%L + * Solr OSGi HTTP + * %% + * Copyright (C) 2018 - 2023 BlackBelt Technology + * %% + * 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. + * #L% + */ + import org.osgi.service.metatype.annotations.AttributeDefinition; import org.osgi.service.metatype.annotations.ObjectClassDefinition; diff --git a/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrHttpServiceManager.java b/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrHttpServiceManager.java index 08e2a24..047e996 100644 --- a/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrHttpServiceManager.java +++ b/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrHttpServiceManager.java @@ -1,5 +1,25 @@ package hu.blackbelt.solr.osgi.http; +/*- + * #%L + * Solr OSGi HTTP + * %% + * Copyright (C) 2018 - 2023 BlackBelt Technology + * %% + * 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. + * #L% + */ + import lombok.extern.slf4j.Slf4j; import org.apache.solr.core.CoreContainer; import org.apache.solr.servlet.LoadAdminUiServlet; diff --git a/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrOsgiDispatchFilter.java b/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrOsgiDispatchFilter.java index 7e60319..1e32d84 100644 --- a/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrOsgiDispatchFilter.java +++ b/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrOsgiDispatchFilter.java @@ -1,5 +1,25 @@ package hu.blackbelt.solr.osgi.http; +/*- + * #%L + * Solr OSGi HTTP + * %% + * Copyright (C) 2018 - 2023 BlackBelt Technology + * %% + * 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. + * #L% + */ + import org.apache.solr.core.CoreContainer; import org.apache.solr.servlet.SolrDispatchFilter; diff --git a/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrOsgiHttpContext.java b/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrOsgiHttpContext.java index cfc6d7d..716644f 100644 --- a/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrOsgiHttpContext.java +++ b/solr-osgi-http/src/main/java/hu/blackbelt/solr/osgi/http/SolrOsgiHttpContext.java @@ -1,5 +1,25 @@ package hu.blackbelt.solr.osgi.http; +/*- + * #%L + * Solr OSGi HTTP + * %% + * Copyright (C) 2018 - 2023 BlackBelt Technology + * %% + * 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. + * #L% + */ + import lombok.extern.slf4j.Slf4j; import org.osgi.framework.BundleContext; diff --git a/solr-osgi-http/src/main/resources/css/angular/analysis.css b/solr-osgi-http/src/main/resources/css/angular/analysis.css index 800964e..dd410c3 100644 --- a/solr-osgi-http/src/main/resources/css/angular/analysis.css +++ b/solr-osgi-http/src/main/resources/css/angular/analysis.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/chosen.css b/solr-osgi-http/src/main/resources/css/angular/chosen.css index f7ae771..c2bbe46 100644 --- a/solr-osgi-http/src/main/resources/css/angular/chosen.css +++ b/solr-osgi-http/src/main/resources/css/angular/chosen.css @@ -1,3 +1,4 @@ + /* Chosen diff --git a/solr-osgi-http/src/main/resources/css/angular/cloud.css b/solr-osgi-http/src/main/resources/css/angular/cloud.css index 80e53e8..9fc4e88 100644 --- a/solr-osgi-http/src/main/resources/css/angular/cloud.css +++ b/solr-osgi-http/src/main/resources/css/angular/cloud.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more @@ -433,4 +434,4 @@ limitations under the License. #content #graph-content .link.shard-inactive { stroke: #e9e9e9; -} \ No newline at end of file +} diff --git a/solr-osgi-http/src/main/resources/css/angular/collections.css b/solr-osgi-http/src/main/resources/css/angular/collections.css index e4b61bc..bcd3589 100644 --- a/solr-osgi-http/src/main/resources/css/angular/collections.css +++ b/solr-osgi-http/src/main/resources/css/angular/collections.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more @@ -367,4 +368,4 @@ limitations under the License. #content #collections #shard-data { float: left; width: 65%; -} \ No newline at end of file +} diff --git a/solr-osgi-http/src/main/resources/css/angular/common.css b/solr-osgi-http/src/main/resources/css/angular/common.css index d960446..4204939 100644 --- a/solr-osgi-http/src/main/resources/css/angular/common.css +++ b/solr-osgi-http/src/main/resources/css/angular/common.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/cores.css b/solr-osgi-http/src/main/resources/css/angular/cores.css index 96e6f96..330716f 100644 --- a/solr-osgi-http/src/main/resources/css/angular/cores.css +++ b/solr-osgi-http/src/main/resources/css/angular/cores.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/dashboard.css b/solr-osgi-http/src/main/resources/css/angular/dashboard.css index 734d62a..73a3bb3 100644 --- a/solr-osgi-http/src/main/resources/css/angular/dashboard.css +++ b/solr-osgi-http/src/main/resources/css/angular/dashboard.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/dataimport.css b/solr-osgi-http/src/main/resources/css/angular/dataimport.css index 97fc5c7..b32459f 100644 --- a/solr-osgi-http/src/main/resources/css/angular/dataimport.css +++ b/solr-osgi-http/src/main/resources/css/angular/dataimport.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/documents.css b/solr-osgi-http/src/main/resources/css/angular/documents.css index 2f0ba12..d74bed1 100644 --- a/solr-osgi-http/src/main/resources/css/angular/documents.css +++ b/solr-osgi-http/src/main/resources/css/angular/documents.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/files.css b/solr-osgi-http/src/main/resources/css/angular/files.css index 46b3e8c..b129265 100644 --- a/solr-osgi-http/src/main/resources/css/angular/files.css +++ b/solr-osgi-http/src/main/resources/css/angular/files.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/index.css b/solr-osgi-http/src/main/resources/css/angular/index.css index e07b8d6..743a5df 100644 --- a/solr-osgi-http/src/main/resources/css/angular/index.css +++ b/solr-osgi-http/src/main/resources/css/angular/index.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/java-properties.css b/solr-osgi-http/src/main/resources/css/angular/java-properties.css index ab5b67b..b9d950a 100644 --- a/solr-osgi-http/src/main/resources/css/angular/java-properties.css +++ b/solr-osgi-http/src/main/resources/css/angular/java-properties.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/logging.css b/solr-osgi-http/src/main/resources/css/angular/logging.css index af7ec44..b3144e9 100644 --- a/solr-osgi-http/src/main/resources/css/angular/logging.css +++ b/solr-osgi-http/src/main/resources/css/angular/logging.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/menu.css b/solr-osgi-http/src/main/resources/css/angular/menu.css index 0e73a59..fc1fbe9 100644 --- a/solr-osgi-http/src/main/resources/css/angular/menu.css +++ b/solr-osgi-http/src/main/resources/css/angular/menu.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/plugins.css b/solr-osgi-http/src/main/resources/css/angular/plugins.css index 3b7830d..a81401f 100644 --- a/solr-osgi-http/src/main/resources/css/angular/plugins.css +++ b/solr-osgi-http/src/main/resources/css/angular/plugins.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/query.css b/solr-osgi-http/src/main/resources/css/angular/query.css index be264bf..711bc8b 100644 --- a/solr-osgi-http/src/main/resources/css/angular/query.css +++ b/solr-osgi-http/src/main/resources/css/angular/query.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/replication.css b/solr-osgi-http/src/main/resources/css/angular/replication.css index a8b1f88..1736bad 100644 --- a/solr-osgi-http/src/main/resources/css/angular/replication.css +++ b/solr-osgi-http/src/main/resources/css/angular/replication.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/schema.css b/solr-osgi-http/src/main/resources/css/angular/schema.css index 98a857f..146b1df 100644 --- a/solr-osgi-http/src/main/resources/css/angular/schema.css +++ b/solr-osgi-http/src/main/resources/css/angular/schema.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more @@ -724,4 +725,4 @@ limitations under the License. #content #schema dd.similarity.ng-binding:hover::after { opacity: 90; bottom: -20px; -} \ No newline at end of file +} diff --git a/solr-osgi-http/src/main/resources/css/angular/segments.css b/solr-osgi-http/src/main/resources/css/angular/segments.css index a18b53d..2d832c7 100644 --- a/solr-osgi-http/src/main/resources/css/angular/segments.css +++ b/solr-osgi-http/src/main/resources/css/angular/segments.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/stream.css b/solr-osgi-http/src/main/resources/css/angular/stream.css index 0ebb592..284c6e6 100644 --- a/solr-osgi-http/src/main/resources/css/angular/stream.css +++ b/solr-osgi-http/src/main/resources/css/angular/stream.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/css/angular/threads.css b/solr-osgi-http/src/main/resources/css/angular/threads.css index c998733..03ef773 100644 --- a/solr-osgi-http/src/main/resources/css/angular/threads.css +++ b/solr-osgi-http/src/main/resources/css/angular/threads.css @@ -1,3 +1,4 @@ + /* Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr-osgi-http/src/main/resources/img/solr.svg b/solr-osgi-http/src/main/resources/img/solr.svg index cb4ae64..3b1a8ae 100644 --- a/solr-osgi-http/src/main/resources/img/solr.svg +++ b/solr-osgi-http/src/main/resources/img/solr.svg @@ -1,4 +1,24 @@ + + diff --git a/solr-osgi-http/src/main/resources/index.html b/solr-osgi-http/src/main/resources/index.html index 35cd196..cdc46c8 100644 --- a/solr-osgi-http/src/main/resources/index.html +++ b/solr-osgi-http/src/main/resources/index.html @@ -1,4 +1,24 @@ + + + @@ -10,4 +30,4 @@ - \ No newline at end of file +