-
Notifications
You must be signed in to change notification settings - Fork 470
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Issue 31249 update license information (#31261)
This pull request includes significant changes to the licensing information across multiple files in the `dotCMS` project. The primary focus is updating the license from the dotCMS Enterprise License to the Business Source License (BUSL-1.1) and adding new fields to certain methods. ### Licensing Updates: * Updated license information to the Business Source License (BUSL-1.1) in `AuthPipeProxy.java`, `BaseAuthenticator.java`, `ClusterUtil.java`, `ClusterUtilProxy.java`, `DashboardProxy.java`, `ESSeachAPI.java`, and `FormAJAXProxy.java`. [[1]](diffhunk://#diff-2f6cfe103b6b2fa35f12b3a28172a88b451b9f60d5c311196c66a57689b0321dL2-L43) [[2]](diffhunk://#diff-be66c702d1d8c0ad5e461a18ef9e0c2fb479f551724c50953f26d9f743d1811bL2-L43) [[3]](diffhunk://#diff-8a419e7c266a4eee64439c7ec3a3b0f619f21d25b6e78dab57345b4cc2b775f7L2-L43) [[4]](diffhunk://#diff-bd2f5e059f2cb137861feb519479132c8cb73c23fe3939cff8416ad7f3963414L2-L43) [[5]](diffhunk://#diff-4dfac7dfb0f1354399e811f1983c60dbc6ee326c23db25ec5d21b04b0d15e8bdL2-L43) [[6]](diffhunk://#diff-b111968ca3e2f10b9e82f6f576dc616c40acdb60244e111b026aff65a53984e7L2-L43) [[7]](diffhunk://#diff-8aa9c67cd606b4191c12793e46cb5f1da151a9456cc13f402829d24033269113L2-L43) ### Method Enhancements: * Added the `key` field to the `getNodeInfo` method in `ClusterUtil.java` to include the server key in the node information. * Added the `key` field to the `createFailedJson` method in `ClusterUtil.java` to include the server key in the failed JSON response. ### File Removal: * Removed the `LICENSE` file from the `dotCMS/src/enterprise` directory as part of the license update.
- Loading branch information
Showing
1,002 changed files
with
7,278 additions
and
44,436 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
50 changes: 7 additions & 43 deletions
50
dotCMS/src/enterprise/java/com/dotcms/enterprise/AuthPipeProxy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 9 additions & 45 deletions
54
dotCMS/src/enterprise/java/com/dotcms/enterprise/BaseAuthenticator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 7 additions & 43 deletions
50
dotCMS/src/enterprise/java/com/dotcms/enterprise/ClusterUtilProxy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 33 additions & 69 deletions
102
dotCMS/src/enterprise/java/com/dotcms/enterprise/DashboardProxy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,35 @@ | ||
| /* | ||
| * Licensed to dotCMS LLC under the dotCMS Enterprise License (the | ||
| * “Enterprise License”) found below | ||
| * | ||
| * Copyright (c) 2023 dotCMS Inc. | ||
| * | ||
| * With regard to the dotCMS Software and this code: | ||
| * | ||
| * This software, source code and associated documentation files (the | ||
| * "Software") may only be modified and used if you (and any entity that | ||
| * you represent) have: | ||
| * | ||
| * 1. Agreed to and are in compliance with, the dotCMS Subscription Terms | ||
| * of Service, available at https://www.dotcms.com/terms (the “Enterprise | ||
| * Terms”) or have another agreement governing the licensing and use of the | ||
| * Software between you and dotCMS. 2. Each dotCMS instance that uses | ||
| * enterprise features enabled by the code in this directory is licensed | ||
| * under these agreements and has a separate and valid dotCMS Enterprise | ||
| * server key issued by dotCMS. | ||
| * | ||
| * Subject to these terms, you are free to modify this Software and publish | ||
| * patches to the Software if you agree that dotCMS and/or its licensors | ||
| * (as applicable) retain all right, title and interest in and to all such | ||
| * modifications and/or patches, and all such modifications and/or patches | ||
| * may only be used, copied, modified, displayed, distributed, or otherwise | ||
| * exploited with a valid dotCMS Enterprise license for the correct number | ||
| * of dotCMS instances. You agree that dotCMS and/or its licensors (as | ||
| * applicable) retain all right, title and interest in and to all such | ||
| * modifications. You are not granted any other rights beyond what is | ||
| * expressly stated herein. Subject to the foregoing, it is forbidden to | ||
| * copy, merge, publish, distribute, sublicense, and/or sell the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
| * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||
| * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY | ||
| * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, | ||
| * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | ||
| * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| * | ||
| * For all third party components incorporated into the dotCMS Software, | ||
| * those components are licensed under the original license provided by the | ||
| * owner of the applicable component. | ||
| /* | ||
| * | ||
| * Copyright (c) 2025 dotCMS LLC | ||
| * Use of this software is governed by the Business Source License included | ||
| * in the LICENSE file found at in the root directory of software. | ||
| * SPDX-License-Identifier: BUSL-1.1 | ||
| * | ||
| */ | ||
|
|
||
| package com.dotcms.enterprise; | ||
|
|
||
| import com.dotcms.enterprise.priv.DashboardDataGeneratorImpl; | ||
| import com.dotcms.enterprise.priv.DashboardFactoryImpl; | ||
| import com.dotcms.enterprise.priv.DashboardJobImpl; | ||
| import com.dotmarketing.portlets.dashboard.business.DashboardDataGenerator; | ||
| import com.dotmarketing.portlets.dashboard.business.DashboardFactory; | ||
|
|
||
| public class DashboardProxy extends ParentProxy{ | ||
|
|
||
| public static DashboardFactory getDashboardFactory(){ | ||
| return new DashboardFactoryImpl(); | ||
| } | ||
|
|
||
| public static DashboardJobImpl getDashboardJob(){ | ||
| return new DashboardJobImpl(); | ||
| } | ||
|
|
||
| public static DashboardDataGenerator getDashboardDataGenerator(int monthFrom, int yearFrom, int monthTo, int yearTo){ | ||
| return new DashboardDataGeneratorImpl(monthFrom, yearFrom, monthTo, yearTo); | ||
| } | ||
|
|
||
| public static Class getDashboardJobImplClass(){ | ||
| return DashboardJobImpl.class; | ||
| } | ||
| } | ||
| package com.dotcms.enterprise; | ||
|
|
||
| import com.dotcms.enterprise.priv.DashboardDataGeneratorImpl; | ||
| import com.dotcms.enterprise.priv.DashboardFactoryImpl; | ||
| import com.dotcms.enterprise.priv.DashboardJobImpl; | ||
| import com.dotmarketing.portlets.dashboard.business.DashboardDataGenerator; | ||
| import com.dotmarketing.portlets.dashboard.business.DashboardFactory; | ||
|
|
||
| public class DashboardProxy extends ParentProxy{ | ||
|
|
||
| public static DashboardFactory getDashboardFactory(){ | ||
| return new DashboardFactoryImpl(); | ||
| } | ||
|
|
||
| public static DashboardJobImpl getDashboardJob(){ | ||
| return new DashboardJobImpl(); | ||
| } | ||
|
|
||
| public static DashboardDataGenerator getDashboardDataGenerator(int monthFrom, int yearFrom, int monthTo, int yearTo){ | ||
| return new DashboardDataGeneratorImpl(monthFrom, yearFrom, monthTo, yearTo); | ||
| } | ||
|
|
||
| public static Class getDashboardJobImplClass(){ | ||
| return DashboardJobImpl.class; | ||
| } | ||
| } |
Oops, something went wrong.