diff --git a/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..5ab20a92a4 --- /dev/null +++ b/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Vendor: %Bundle-Vendor +Bundle-Name: %Bundle-Name +Bundle-SymbolicName: io.cloudbeaver.product.ce;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Release-Date: 20200518 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Require-Bundle: io.cloudbeaver.server +Bundle-Localization: OSGI-INF/l10n/bundle +Automatic-Module-Name: io.cloudbeaver.product.ce diff --git a/server/bundles/io.cloudbeaver.product.ce/OSGI-INF/l10n/bundle.properties b/server/bundles/io.cloudbeaver.product.ce/OSGI-INF/l10n/bundle.properties new file mode 100644 index 0000000000..a285dd9270 --- /dev/null +++ b/server/bundles/io.cloudbeaver.product.ce/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,2 @@ +Bundle-Vendor = DBeaver Corp +Bundle-Name = Cloudbeaver CE bundle diff --git a/server/bundles/io.cloudbeaver.product.ce/build.properties b/server/bundles/io.cloudbeaver.product.ce/build.properties new file mode 100644 index 0000000000..3d281081e5 --- /dev/null +++ b/server/bundles/io.cloudbeaver.product.ce/build.properties @@ -0,0 +1,6 @@ +source.. = src/ +output.. = target/classes/ +bin.includes = .,\ + META-INF/,\ + OSGI-INF/,\ + plugin.xml diff --git a/server/bundles/io.cloudbeaver.product.ce/plugin.xml b/server/bundles/io.cloudbeaver.product.ce/plugin.xml new file mode 100644 index 0000000000..23073346a8 --- /dev/null +++ b/server/bundles/io.cloudbeaver.product.ce/plugin.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/bundles/io.cloudbeaver.product.ce/pom.xml b/server/bundles/io.cloudbeaver.product.ce/pom.xml new file mode 100644 index 0000000000..61d40947c1 --- /dev/null +++ b/server/bundles/io.cloudbeaver.product.ce/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + + io.cloudbeaver + bundles + 1.0.0-SNAPSHOT + ../ + + io.cloudbeaver.product.ce + 1.0.0-SNAPSHOT + eclipse-plugin + + diff --git a/server/bundles/io.cloudbeaver.product.ce/src/io/cloudbeaver/server/CBServerCE.java b/server/bundles/io.cloudbeaver.product.ce/src/io/cloudbeaver/server/CBServerCE.java new file mode 100644 index 0000000000..3d47fa3bd5 --- /dev/null +++ b/server/bundles/io.cloudbeaver.product.ce/src/io/cloudbeaver/server/CBServerCE.java @@ -0,0 +1,25 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2020 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.cloudbeaver.server; + +/** + * Auth provider + */ +public class CBServerCE { + + +} diff --git a/server/bundles/io.cloudbeaver.server/plugin.xml b/server/bundles/io.cloudbeaver.server/plugin.xml index f9651164c4..bd1a05c3f0 100644 --- a/server/bundles/io.cloudbeaver.server/plugin.xml +++ b/server/bundles/io.cloudbeaver.server/plugin.xml @@ -6,22 +6,6 @@ - - - - - - - - - - - - - - - - diff --git a/server/bundles/pom.xml b/server/bundles/pom.xml index 90fe380014..c90ce9c999 100644 --- a/server/bundles/pom.xml +++ b/server/bundles/pom.xml @@ -21,6 +21,8 @@ io.cloudbeaver.resources.drivers.base io.cloudbeaver.connect.provider.sample + + io.cloudbeaver.product.ce diff --git a/server/features/io.cloudbeaver.product.ce.feature/build.properties b/server/features/io.cloudbeaver.product.ce.feature/build.properties new file mode 100644 index 0000000000..a70024674b --- /dev/null +++ b/server/features/io.cloudbeaver.product.ce.feature/build.properties @@ -0,0 +1,3 @@ +bin.includes = feature.xml,\ + feature.properties +root = target/generated diff --git a/server/features/io.cloudbeaver.product.ce.feature/feature.properties b/server/features/io.cloudbeaver.product.ce.feature/feature.properties new file mode 100644 index 0000000000..9c85155d3c --- /dev/null +++ b/server/features/io.cloudbeaver.product.ce.feature/feature.properties @@ -0,0 +1,207 @@ +featureName=Cloudbeaver CE +providerName=DBeaver Corp +description=Cloudbeaver server feature +copyright=(c) DBeaver Corp, 2020 +licenseURL=../../docs/licenses/dbeaver_license.txt +license=\ + Apache License\n\ + Version 2.0, January 2004\n\ + http://www.apache.org/licenses/\n\ +\n\ + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\ +\n\ + 1. Definitions.\n\ +\n\ + "License" shall mean the terms and conditions for use, reproduction,\n\ + and distribution as defined by Sections 1 through 9 of this document.\n\ +\n\ + "Licensor" shall mean the copyright owner or entity authorized by\n\ + the copyright owner that is granting the License.\n\ +\n\ + "Legal Entity" shall mean the union of the acting entity and all\n\ + other entities that control, are controlled by, or are under common\n\ + control with that entity. For the purposes of this definition,\n\ + "control" means (i) the power, direct or indirect, to cause the\n\ + direction or management of such entity, whether by contract or\n\ + otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\ + outstanding shares, or (iii) beneficial ownership of such entity.\n\ +\n\ + "You" (or "Your") shall mean an individual or Legal Entity\n\ + exercising permissions granted by this License.\n\ +\n\ + "Source" form shall mean the preferred form for making modifications,\n\ + including but not limited to software source code, documentation\n\ + source, and configuration files.\n\ +\n\ + "Object" form shall mean any form resulting from mechanical\n\ + transformation or translation of a Source form, including but\n\ + not limited to compiled object code, generated documentation,\n\ + and conversions to other media types.\n\ +\n\ + "Work" shall mean the work of authorship, whether in Source or\n\ + Object form, made available under the License, as indicated by a\n\ + copyright notice that is included in or attached to the work\n\ + (an example is provided in the Appendix below).\n\ +\n\ + "Derivative Works" shall mean any work, whether in Source or Object\n\ + form, that is based on (or derived from) the Work and for which the\n\ + editorial revisions, annotations, elaborations, or other modifications\n\ + represent, as a whole, an original work of authorship. For the purposes\n\ + of this License, Derivative Works shall not include works that remain\n\ + separable from, or merely link (or bind by name) to the interfaces of,\n\ + the Work and Derivative Works thereof.\n\ +\n\ + "Contribution" shall mean any work of authorship, including\n\ + the original version of the Work and any modifications or additions\n\ + to that Work or Derivative Works thereof, that is intentionally\n\ + submitted to Licensor for inclusion in the Work by the copyright owner\n\ + or by an individual or Legal Entity authorized to submit on behalf of\n\ + the copyright owner. For the purposes of this definition, "submitted"\n\ + means any form of electronic, verbal, or written communication sent\n\ + to the Licensor or its representatives, including but not limited to\n\ + communication on electronic mailing lists, source code control systems,\n\ + and issue tracking systems that are managed by, or on behalf of, the\n\ + Licensor for the purpose of discussing and improving the Work, but\n\ + excluding communication that is conspicuously marked or otherwise\n\ + designated in writing by the copyright owner as "Not a Contribution."\n\ +\n\ + "Contributor" shall mean Licensor and any individual or Legal Entity\n\ + on behalf of whom a Contribution has been received by Licensor and\n\ + subsequently incorporated within the Work.\n\ +\n\ + 2. Grant of Copyright License. Subject to the terms and conditions of\n\ + this License, each Contributor hereby grants to You a perpetual,\n\ + worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\ + copyright license to reproduce, prepare Derivative Works of,\n\ + publicly display, publicly perform, sublicense, and distribute the\n\ + Work and such Derivative Works in Source or Object form.\n\ +\n\ + 3. Grant of Patent License. Subject to the terms and conditions of\n\ + this License, each Contributor hereby grants to You a perpetual,\n\ + worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\ + (except as stated in this section) patent license to make, have made,\n\ + use, offer to sell, sell, import, and otherwise transfer the Work,\n\ + where such license applies only to those patent claims licensable\n\ + by such Contributor that are necessarily infringed by their\n\ + Contribution(s) alone or by combination of their Contribution(s)\n\ + with the Work to which such Contribution(s) was submitted. If You\n\ + institute patent litigation against any entity (including a\n\ + cross-claim or counterclaim in a lawsuit) alleging that the Work\n\ + or a Contribution incorporated within the Work constitutes direct\n\ + or contributory patent infringement, then any patent licenses\n\ + granted to You under this License for that Work shall terminate\n\ + as of the date such litigation is filed.\n\ +\n\ + 4. Redistribution. You may reproduce and distribute copies of the\n\ + Work or Derivative Works thereof in any medium, with or without\n\ + modifications, and in Source or Object form, provided that You\n\ + meet the following conditions:\n\ +\n\ + (a) You must give any other recipients of the Work or\n\ + Derivative Works a copy of this License; and\n\ +\n\ + (b) You must cause any modified files to carry prominent notices\n\ + stating that You changed the files; and\n\ +\n\ + (c) You must retain, in the Source form of any Derivative Works\n\ + that You distribute, all copyright, patent, trademark, and\n\ + attribution notices from the Source form of the Work,\n\ + excluding those notices that do not pertain to any part of\n\ + the Derivative Works; and\n\ +\n\ + (d) If the Work includes a "NOTICE" text file as part of its\n\ + distribution, then any Derivative Works that You distribute must\n\ + include a readable copy of the attribution notices contained\n\ + within such NOTICE file, excluding those notices that do not\n\ + pertain to any part of the Derivative Works, in at least one\n\ + of the following places: within a NOTICE text file distributed\n\ + as part of the Derivative Works; within the Source form or\n\ + documentation, if provided along with the Derivative Works; or,\n\ + within a display generated by the Derivative Works, if and\n\ + wherever such third-party notices normally appear. The contents\n\ + of the NOTICE file are for informational purposes only and\n\ + do not modify the License. You may add Your own attribution\n\ + notices within Derivative Works that You distribute, alongside\n\ + or as an addendum to the NOTICE text from the Work, provided\n\ + that such additional attribution notices cannot be construed\n\ + as modifying the License.\n\ +\n\ + You may add Your own copyright statement to Your modifications and\n\ + may provide additional or different license terms and conditions\n\ + for use, reproduction, or distribution of Your modifications, or\n\ + for any such Derivative Works as a whole, provided Your use,\n\ + reproduction, and distribution of the Work otherwise complies with\n\ + the conditions stated in this License.\n\ +\n\ + 5. Submission of Contributions. Unless You explicitly state otherwise,\n\ + any Contribution intentionally submitted for inclusion in the Work\n\ + by You to the Licensor shall be under the terms and conditions of\n\ + this License, without any additional terms or conditions.\n\ + Notwithstanding the above, nothing herein shall supersede or modify\n\ + the terms of any separate license agreement you may have executed\n\ + with Licensor regarding such Contributions.\n\ +\n\ + 6. Trademarks. This License does not grant permission to use the trade\n\ + names, trademarks, service marks, or product names of the Licensor,\n\ + except as required for reasonable and customary use in describing the\n\ + origin of the Work and reproducing the content of the NOTICE file.\n\ +\n\ + 7. Disclaimer of Warranty. Unless required by applicable law or\n\ + agreed to in writing, Licensor provides the Work (and each\n\ + Contributor provides its Contributions) on an "AS IS" BASIS,\n\ + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\ + implied, including, without limitation, any warranties or conditions\n\ + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\ + PARTICULAR PURPOSE. You are solely responsible for determining the\n\ + appropriateness of using or redistributing the Work and assume any\n\ + risks associated with Your exercise of permissions under this License.\n\ +\n\ + 8. Limitation of Liability. In no event and under no legal theory,\n\ + whether in tort (including negligence), contract, or otherwise,\n\ + unless required by applicable law (such as deliberate and grossly\n\ + negligent acts) or agreed to in writing, shall any Contributor be\n\ + liable to You for damages, including any direct, indirect, special,\n\ + incidental, or consequential damages of any character arising as a\n\ + result of this License or out of the use or inability to use the\n\ + Work (including but not limited to damages for loss of goodwill,\n\ + work stoppage, computer failure or malfunction, or any and all\n\ + other commercial damages or losses), even if such Contributor\n\ + has been advised of the possibility of such damages.\n\ +\n\ + 9. Accepting Warranty or Additional Liability. While redistributing\n\ + the Work or Derivative Works thereof, You may choose to offer,\n\ + and charge a fee for, acceptance of support, warranty, indemnity,\n\ + or other liability obligations and/or rights consistent with this\n\ + License. However, in accepting such obligations, You may act only\n\ + on Your own behalf and on Your sole responsibility, not on behalf\n\ + of any other Contributor, and only if You agree to indemnify,\n\ + defend, and hold each Contributor harmless for any liability\n\ + incurred by, or claims asserted against, such Contributor by reason\n\ + of your accepting any such warranty or additional liability.\n\ +\n\ + END OF TERMS AND CONDITIONS\n\ +\n\ + APPENDIX: How to apply the Apache License to your work.\n\ +\n\ + To apply the Apache License to your work, attach the following\n\ + boilerplate notice, with the fields enclosed by brackets "[]"\n\ + replaced with your own identifying information. (Don't include\n\ + the brackets!) The text should be enclosed in the appropriate\n\ + comment syntax for the file format. We also recommend that a\n\ + file or class name and description of purpose be included on the\n\ + same "printed page" as the copyright notice for easier\n\ + identification within third-party archives.\n\ +\n\ + Copyright [yyyy] [name of copyright owner]\n\ +\n\ + Licensed under the Apache License, Version 2.0 (the "License");\n\ + you may not use this file except in compliance with the License.\n\ + You may obtain a copy of the License at\n\ +\n\ + http://www.apache.org/licenses/LICENSE-2.0\n\ +\n\ + Unless required by applicable law or agreed to in writing, software\n\ + distributed under the License is distributed on an "AS IS" BASIS,\n\ + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\ + See the License for the specific language governing permissions and\n\ + limitations under the License.\n\ diff --git a/server/features/io.cloudbeaver.product.ce.feature/feature.xml b/server/features/io.cloudbeaver.product.ce.feature/feature.xml new file mode 100644 index 0000000000..66fc09c9e9 --- /dev/null +++ b/server/features/io.cloudbeaver.product.ce.feature/feature.xml @@ -0,0 +1,27 @@ + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + diff --git a/server/features/io.cloudbeaver.product.ce.feature/pom.xml b/server/features/io.cloudbeaver.product.ce.feature/pom.xml new file mode 100644 index 0000000000..5ff95b3e72 --- /dev/null +++ b/server/features/io.cloudbeaver.product.ce.feature/pom.xml @@ -0,0 +1,50 @@ + + + 4.0.0 + + io.cloudbeaver + features + 1.0.0-SNAPSHOT + ../ + + io.cloudbeaver.product.ce.feature + 1.0.0-SNAPSHOT + eclipse-feature + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.6 + + + process-product-info + generate-resources + + ${project.build.directory}/generated + true + + + root + + .eclipseproduct + readme.txt + + true + + + + + copy-resources + + + + + + + + diff --git a/server/features/io.cloudbeaver.server.feature/root/.eclipseproduct b/server/features/io.cloudbeaver.product.ce.feature/root/.eclipseproduct similarity index 63% rename from server/features/io.cloudbeaver.server.feature/root/.eclipseproduct rename to server/features/io.cloudbeaver.product.ce.feature/root/.eclipseproduct index 38d4933b7c..fc396d8e59 100644 --- a/server/features/io.cloudbeaver.server.feature/root/.eclipseproduct +++ b/server/features/io.cloudbeaver.product.ce.feature/root/.eclipseproduct @@ -1,3 +1,3 @@ name=${dbeaver-product} -id=io.cloudbeaver.product +id=io.cloudbeaver.product.ce version=${dbeaver-version} diff --git a/server/features/io.cloudbeaver.server.feature/root/readme.txt b/server/features/io.cloudbeaver.product.ce.feature/root/readme.txt similarity index 100% rename from server/features/io.cloudbeaver.server.feature/root/readme.txt rename to server/features/io.cloudbeaver.product.ce.feature/root/readme.txt diff --git a/server/features/io.cloudbeaver.server.feature/build.properties b/server/features/io.cloudbeaver.server.feature/build.properties index a70024674b..b3a611b5c9 100644 --- a/server/features/io.cloudbeaver.server.feature/build.properties +++ b/server/features/io.cloudbeaver.server.feature/build.properties @@ -1,3 +1,2 @@ bin.includes = feature.xml,\ feature.properties -root = target/generated diff --git a/server/features/io.cloudbeaver.server.feature/feature.properties b/server/features/io.cloudbeaver.server.feature/feature.properties index 1d34a3f3f5..2d95638eb3 100644 --- a/server/features/io.cloudbeaver.server.feature/feature.properties +++ b/server/features/io.cloudbeaver.server.feature/feature.properties @@ -1,207 +1,4 @@ featureName=Cloudbeaver Server providerName=DBeaver Corp description=Cloudbeaver server feature -copyright=(c) DBeaver Corp, 2019 -licenseURL=../../docs/licenses/dbeaver_license.txt -license=\ - Apache License\n\ - Version 2.0, January 2004\n\ - http://www.apache.org/licenses/\n\ -\n\ - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\ -\n\ - 1. Definitions.\n\ -\n\ - "License" shall mean the terms and conditions for use, reproduction,\n\ - and distribution as defined by Sections 1 through 9 of this document.\n\ -\n\ - "Licensor" shall mean the copyright owner or entity authorized by\n\ - the copyright owner that is granting the License.\n\ -\n\ - "Legal Entity" shall mean the union of the acting entity and all\n\ - other entities that control, are controlled by, or are under common\n\ - control with that entity. For the purposes of this definition,\n\ - "control" means (i) the power, direct or indirect, to cause the\n\ - direction or management of such entity, whether by contract or\n\ - otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\ - outstanding shares, or (iii) beneficial ownership of such entity.\n\ -\n\ - "You" (or "Your") shall mean an individual or Legal Entity\n\ - exercising permissions granted by this License.\n\ -\n\ - "Source" form shall mean the preferred form for making modifications,\n\ - including but not limited to software source code, documentation\n\ - source, and configuration files.\n\ -\n\ - "Object" form shall mean any form resulting from mechanical\n\ - transformation or translation of a Source form, including but\n\ - not limited to compiled object code, generated documentation,\n\ - and conversions to other media types.\n\ -\n\ - "Work" shall mean the work of authorship, whether in Source or\n\ - Object form, made available under the License, as indicated by a\n\ - copyright notice that is included in or attached to the work\n\ - (an example is provided in the Appendix below).\n\ -\n\ - "Derivative Works" shall mean any work, whether in Source or Object\n\ - form, that is based on (or derived from) the Work and for which the\n\ - editorial revisions, annotations, elaborations, or other modifications\n\ - represent, as a whole, an original work of authorship. For the purposes\n\ - of this License, Derivative Works shall not include works that remain\n\ - separable from, or merely link (or bind by name) to the interfaces of,\n\ - the Work and Derivative Works thereof.\n\ -\n\ - "Contribution" shall mean any work of authorship, including\n\ - the original version of the Work and any modifications or additions\n\ - to that Work or Derivative Works thereof, that is intentionally\n\ - submitted to Licensor for inclusion in the Work by the copyright owner\n\ - or by an individual or Legal Entity authorized to submit on behalf of\n\ - the copyright owner. For the purposes of this definition, "submitted"\n\ - means any form of electronic, verbal, or written communication sent\n\ - to the Licensor or its representatives, including but not limited to\n\ - communication on electronic mailing lists, source code control systems,\n\ - and issue tracking systems that are managed by, or on behalf of, the\n\ - Licensor for the purpose of discussing and improving the Work, but\n\ - excluding communication that is conspicuously marked or otherwise\n\ - designated in writing by the copyright owner as "Not a Contribution."\n\ -\n\ - "Contributor" shall mean Licensor and any individual or Legal Entity\n\ - on behalf of whom a Contribution has been received by Licensor and\n\ - subsequently incorporated within the Work.\n\ -\n\ - 2. Grant of Copyright License. Subject to the terms and conditions of\n\ - this License, each Contributor hereby grants to You a perpetual,\n\ - worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\ - copyright license to reproduce, prepare Derivative Works of,\n\ - publicly display, publicly perform, sublicense, and distribute the\n\ - Work and such Derivative Works in Source or Object form.\n\ -\n\ - 3. Grant of Patent License. Subject to the terms and conditions of\n\ - this License, each Contributor hereby grants to You a perpetual,\n\ - worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\ - (except as stated in this section) patent license to make, have made,\n\ - use, offer to sell, sell, import, and otherwise transfer the Work,\n\ - where such license applies only to those patent claims licensable\n\ - by such Contributor that are necessarily infringed by their\n\ - Contribution(s) alone or by combination of their Contribution(s)\n\ - with the Work to which such Contribution(s) was submitted. If You\n\ - institute patent litigation against any entity (including a\n\ - cross-claim or counterclaim in a lawsuit) alleging that the Work\n\ - or a Contribution incorporated within the Work constitutes direct\n\ - or contributory patent infringement, then any patent licenses\n\ - granted to You under this License for that Work shall terminate\n\ - as of the date such litigation is filed.\n\ -\n\ - 4. Redistribution. You may reproduce and distribute copies of the\n\ - Work or Derivative Works thereof in any medium, with or without\n\ - modifications, and in Source or Object form, provided that You\n\ - meet the following conditions:\n\ -\n\ - (a) You must give any other recipients of the Work or\n\ - Derivative Works a copy of this License; and\n\ -\n\ - (b) You must cause any modified files to carry prominent notices\n\ - stating that You changed the files; and\n\ -\n\ - (c) You must retain, in the Source form of any Derivative Works\n\ - that You distribute, all copyright, patent, trademark, and\n\ - attribution notices from the Source form of the Work,\n\ - excluding those notices that do not pertain to any part of\n\ - the Derivative Works; and\n\ -\n\ - (d) If the Work includes a "NOTICE" text file as part of its\n\ - distribution, then any Derivative Works that You distribute must\n\ - include a readable copy of the attribution notices contained\n\ - within such NOTICE file, excluding those notices that do not\n\ - pertain to any part of the Derivative Works, in at least one\n\ - of the following places: within a NOTICE text file distributed\n\ - as part of the Derivative Works; within the Source form or\n\ - documentation, if provided along with the Derivative Works; or,\n\ - within a display generated by the Derivative Works, if and\n\ - wherever such third-party notices normally appear. The contents\n\ - of the NOTICE file are for informational purposes only and\n\ - do not modify the License. You may add Your own attribution\n\ - notices within Derivative Works that You distribute, alongside\n\ - or as an addendum to the NOTICE text from the Work, provided\n\ - that such additional attribution notices cannot be construed\n\ - as modifying the License.\n\ -\n\ - You may add Your own copyright statement to Your modifications and\n\ - may provide additional or different license terms and conditions\n\ - for use, reproduction, or distribution of Your modifications, or\n\ - for any such Derivative Works as a whole, provided Your use,\n\ - reproduction, and distribution of the Work otherwise complies with\n\ - the conditions stated in this License.\n\ -\n\ - 5. Submission of Contributions. Unless You explicitly state otherwise,\n\ - any Contribution intentionally submitted for inclusion in the Work\n\ - by You to the Licensor shall be under the terms and conditions of\n\ - this License, without any additional terms or conditions.\n\ - Notwithstanding the above, nothing herein shall supersede or modify\n\ - the terms of any separate license agreement you may have executed\n\ - with Licensor regarding such Contributions.\n\ -\n\ - 6. Trademarks. This License does not grant permission to use the trade\n\ - names, trademarks, service marks, or product names of the Licensor,\n\ - except as required for reasonable and customary use in describing the\n\ - origin of the Work and reproducing the content of the NOTICE file.\n\ -\n\ - 7. Disclaimer of Warranty. Unless required by applicable law or\n\ - agreed to in writing, Licensor provides the Work (and each\n\ - Contributor provides its Contributions) on an "AS IS" BASIS,\n\ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\ - implied, including, without limitation, any warranties or conditions\n\ - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\ - PARTICULAR PURPOSE. You are solely responsible for determining the\n\ - appropriateness of using or redistributing the Work and assume any\n\ - risks associated with Your exercise of permissions under this License.\n\ -\n\ - 8. Limitation of Liability. In no event and under no legal theory,\n\ - whether in tort (including negligence), contract, or otherwise,\n\ - unless required by applicable law (such as deliberate and grossly\n\ - negligent acts) or agreed to in writing, shall any Contributor be\n\ - liable to You for damages, including any direct, indirect, special,\n\ - incidental, or consequential damages of any character arising as a\n\ - result of this License or out of the use or inability to use the\n\ - Work (including but not limited to damages for loss of goodwill,\n\ - work stoppage, computer failure or malfunction, or any and all\n\ - other commercial damages or losses), even if such Contributor\n\ - has been advised of the possibility of such damages.\n\ -\n\ - 9. Accepting Warranty or Additional Liability. While redistributing\n\ - the Work or Derivative Works thereof, You may choose to offer,\n\ - and charge a fee for, acceptance of support, warranty, indemnity,\n\ - or other liability obligations and/or rights consistent with this\n\ - License. However, in accepting such obligations, You may act only\n\ - on Your own behalf and on Your sole responsibility, not on behalf\n\ - of any other Contributor, and only if You agree to indemnify,\n\ - defend, and hold each Contributor harmless for any liability\n\ - incurred by, or claims asserted against, such Contributor by reason\n\ - of your accepting any such warranty or additional liability.\n\ -\n\ - END OF TERMS AND CONDITIONS\n\ -\n\ - APPENDIX: How to apply the Apache License to your work.\n\ -\n\ - To apply the Apache License to your work, attach the following\n\ - boilerplate notice, with the fields enclosed by brackets "[]"\n\ - replaced with your own identifying information. (Don't include\n\ - the brackets!) The text should be enclosed in the appropriate\n\ - comment syntax for the file format. We also recommend that a\n\ - file or class name and description of purpose be included on the\n\ - same "printed page" as the copyright notice for easier\n\ - identification within third-party archives.\n\ -\n\ - Copyright [yyyy] [name of copyright owner]\n\ -\n\ - Licensed under the Apache License, Version 2.0 (the "License");\n\ - you may not use this file except in compliance with the License.\n\ - You may obtain a copy of the License at\n\ -\n\ - http://www.apache.org/licenses/LICENSE-2.0\n\ -\n\ - Unless required by applicable law or agreed to in writing, software\n\ - distributed under the License is distributed on an "AS IS" BASIS,\n\ - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\ - See the License for the specific language governing permissions and\n\ - limitations under the License.\n\ +copyright=(c) DBeaver Corp, 2020 diff --git a/server/features/io.cloudbeaver.server.feature/feature.xml b/server/features/io.cloudbeaver.server.feature/feature.xml index 5acaccc047..06f6558b10 100644 --- a/server/features/io.cloudbeaver.server.feature/feature.xml +++ b/server/features/io.cloudbeaver.server.feature/feature.xml @@ -14,10 +14,6 @@ %copyright - - %license - - diff --git a/server/features/io.cloudbeaver.server.feature/pom.xml b/server/features/io.cloudbeaver.server.feature/pom.xml index 61657ab6a6..f79abdd640 100644 --- a/server/features/io.cloudbeaver.server.feature/pom.xml +++ b/server/features/io.cloudbeaver.server.feature/pom.xml @@ -1,49 +1,15 @@ - - 4.0.0 - - io.cloudbeaver - features - 1.0.0-SNAPSHOT - ../ - - io.cloudbeaver.server.feature - 1.0.2-SNAPSHOT - eclipse-feature - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - - - process-product-info - generate-resources - - ${project.build.directory}/generated - true - - - root - - .eclipseproduct - readme.txt - - true - - - - - copy-resources - - - - - - - + 4.0.0 + + io.cloudbeaver + features + 1.0.0-SNAPSHOT + ../ + + io.cloudbeaver.server.feature + 1.0.2-SNAPSHOT + eclipse-feature diff --git a/server/features/pom.xml b/server/features/pom.xml index 113bc0ba58..2f8045d6ee 100644 --- a/server/features/pom.xml +++ b/server/features/pom.xml @@ -17,6 +17,8 @@ io.cloudbeaver.ce.drivers.feature io.cloudbeaver.sample.feature + + io.cloudbeaver.product.ce.feature diff --git a/server/product/web-server/CloudbeaverServer.product b/server/product/web-server/CloudbeaverServer.product index 5dd29428b7..498cbc6aab 100644 --- a/server/product/web-server/CloudbeaverServer.product +++ b/server/product/web-server/CloudbeaverServer.product @@ -1,8 +1,8 @@ - @@ -32,9 +32,7 @@ - - - +