Skip to content

Commit

Permalink
Preparation for Enterprise Licence + Main licence as Apache-2.0 (#334)
Browse files Browse the repository at this point in the history
* Change MIT to Apache-2.0 for non Enterprise functionalities, to secure Ecotone trade mark
* Add contribution file
* Add information in composer.json about licensing
  • Loading branch information
dgafka authored Jul 14, 2024
1 parent 778cdce commit 937aa05
Show file tree
Hide file tree
Showing 1,953 changed files with 6,576 additions and 528 deletions.
18 changes: 18 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
## Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes #(issue)

## Type of change

Please delete options that are not relevant.

- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing functionality to not work as expected)
- This change requires a documentation update

<!--
Please note that by submitting this pull request, you agree to the contribution terms defined in [CONTRIBUTING.md](https://github.com/ecotoneframework/ecotone-dev/blob/main/CONTRIBUTING.md). This part of the template must not be removed.
-->
55 changes: 55 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Contributing to Ecotone Framework

Thank you for your interest in contributing to Ecotone Framework! We welcome contributions from the community to help improve and expand the framework.

## How to Contribute

1. **Fork the Repository**: Start by forking the repository on GitHub to your account.

2. **Clone the Repository**: Clone your forked repository to your local machine.

```bash
git clone [email protected]:ecotoneframework/ecotone-dev.git
```

3. **Create a Branch**: Create a new branch for your changes.

```bash
git checkout -b feature/your-feature-name
```

4. **Make Changes**: Make your changes in the codebase. Follow the coding guidelines and ensure your code is well-documented and tested.

5. **Commit Changes**: Commit your changes with a clear and descriptive commit message.

```bash
git commit -m "Add feature: Description of your feature"
```

6. **Push Changes**: Push your changes to your forked repository.

```bash
git push origin feature/your-feature-name
```

7. **Open a Pull Request**: Go to the original repository on GitHub and open a pull request from your forked repository. Provide a clear description of your changes and any additional context that might be useful.

## Contributor License Agreement

By contributing to the Ecotone Framework repository, you agree to the following terms:

1. **Assignment of Rights**: You agree that any contributions you make to this repository, in the form of code, documentation, or any other material, will be transferred in their entirety to Dariusz Gafka, the author of Ecotone Framework. This includes but is not limited to all rights, title, and interest in the contributions, including any and all intellectual property rights.

2. **Original Work**: You certify that you have the right to make the contribution and that it does not infringe on any third party's rights.
## Code of Conduct
We follow the Contributor Covenant Code of Conduct. By participating, you are expected to uphold this code. Please report unacceptable behavior to [[email protected]].
## Questions?
If you have any questions about contributing, please feel free to open an issue or contact us directly at [[email protected]].
Thank you for your contributions!
Dariusz Gafka
26 changes: 13 additions & 13 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
MIT License
Copyright (c) 2024 Dariusz Gafka <[email protected]>

Copyright (c) 2022 Dariusz Gafka <[email protected]>
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

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
http://www.apache.org/licenses/LICENSE-2.0

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.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

**Scope of the License**

Apache-2.0 Licence applies to non Enterprise Functionalities of the Ecotone Framework.
Functionalities of the Ecotone Framework referred to as Enterprise functionalities, are not covered under the Apache-2.0 license. These functionalities are provided under a separate Enterprise License.
For details on the Enterprise License, please write to [email protected].
16 changes: 12 additions & 4 deletions Monorepo/CrossModuleTests/Tests/ProxyCacheGenerationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ class ProxyCacheGenerationTest extends FullAppBenchmarkCase
* @runInSeparateProcess
* @preserveGlobalState disabled
*/
public function test_symfony_prod()
public function TODO_test_symfony_prod()
{
$this->markTestSkipped('grpc warning to be solved: https://github.com/google-ai-edge/mediapipe/issues/5371#issuecomment-2219871932');

self::clearSymfonyCache();
$this->bench_symfony_prod();
}
Expand All @@ -25,8 +27,10 @@ public function test_symfony_prod()
* @runInSeparateProcess
* @preserveGlobalState disabled
*/
public function test_laravel_prod(): void
public function TODO_test_laravel_prod(): void
{
$this->markTestSkipped('grpc warning to be solved: https://github.com/google-ai-edge/mediapipe/issues/5371#issuecomment-2219871932');

self::clearLaravelCache();
$this->bench_laravel_prod();
}
Expand All @@ -35,8 +39,10 @@ public function test_laravel_prod(): void
* @runInSeparateProcess
* @preserveGlobalState disabled
*/
public function test_lite_application_prod()
public function TODO_test_lite_application_prod()
{
$this->markTestSkipped('grpc warning to be solved: https://github.com/google-ai-edge/mediapipe/issues/5371#issuecomment-2219871932');

self::clearLiteApplicationCache();
$this->bench_lite_application_prod();
}
Expand All @@ -45,8 +51,10 @@ public function test_lite_application_prod()
* @runInSeparateProcess
* @preserveGlobalState disabled
*/
public function test_lite_prod()
public function TODO_test_lite_prod()
{
$this->markTestSkipped('grpc warning to be solved: https://github.com/google-ai-edge/mediapipe/issues/5371#issuecomment-2219871932');

self::clearLiteCache();
$this->bench_lite_prod();
}
Expand Down
2 changes: 1 addition & 1 deletion _PackageTemplate/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 Dariusz Gafka <dgafka.mail@gmail.com>
Copyright (c) 2022 Dariusz Gafka <support@simplycodedsoftware.com>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
18 changes: 16 additions & 2 deletions _PackageTemplate/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"name": "ecotone/_PackageTemplate",
"license": "MIT",
"license": [
"Apache-2.0",
"proprietary"
],
"homepage": "https://docs.ecotone.tech/",
"forum": "https://discord.gg/CctGMcrYnV",
"type": "library",
Expand All @@ -9,7 +12,7 @@
"authors": [
{
"name": "Dariusz Gafka",
"email": "dgafka.mail@gmail.com"
"email": "support@simplycodedsoftware.com"
}
],
"keywords": ["ecotone", "_PackageTemplate"],
Expand Down Expand Up @@ -54,6 +57,17 @@
"include": [
"local_packages.json"
]
},
"license-info": {
"Apache-2.0": {
"name": "Apache License 2.0",
"url": "https://github.com/ecotoneframework/ecotone-dev/blob/main/LICENSE",
"description": "Allows to use non Enterprise features of Ecotone. For more information please write to [email protected]"
},
"proprietary": {
"name": "Enterprise License",
"description": "Allows to use Enterprise features of Ecotone. For more information please write to [email protected]"
}
}
},
"config": {
Expand Down
18 changes: 16 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"name": "ecotone/ecotone",
"license": "MIT",
"license": [
"Apache-2.0",
"proprietary"
],
"homepage": "https://docs.ecotone.tech",
"type": "library",
"authors": [
{
"name": "Dariusz Gafka",
"email": "dgafka.mail@gmail.com"
"email": "support@simplycodedsoftware.com"
}
],
"keywords": [
Expand Down Expand Up @@ -168,6 +171,17 @@
"include": [
"local-packages.json"
]
},
"license-info": {
"Apache-2.0": {
"name": "Apache License 2.0",
"url": "https://github.com/ecotoneframework/ecotone-dev/blob/main/LICENSE",
"description": "Allows to use non Enterprise features of Ecotone. For more information please write to [email protected]"
},
"proprietary": {
"name": "Enterprise License",
"description": "Allows to use Enterprise features of Ecotone. For more information please write to [email protected]"
}
}
},
"replace": {
Expand Down
2 changes: 1 addition & 1 deletion packages/Amqp/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 Dariusz Gafka <dgafka.mail@gmail.com>
Copyright (c) 2022 Dariusz Gafka <support@simplycodedsoftware.com>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
18 changes: 16 additions & 2 deletions packages/Amqp/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"name": "ecotone/amqp",
"license": "MIT",
"license": [
"Apache-2.0",
"proprietary"
],
"homepage": "https://docs.ecotone.tech/",
"forum": "https://discord.gg/CctGMcrYnV",
"type": "library",
Expand All @@ -9,7 +12,7 @@
"authors": [
{
"name": "Dariusz Gafka",
"email": "dgafka.mail@gmail.com"
"email": "support@simplycodedsoftware.com"
}
],
"keywords": [
Expand Down Expand Up @@ -72,6 +75,17 @@
"include": [
"../local_packages.json"
]
},
"license-info": {
"Apache-2.0": {
"name": "Apache License 2.0",
"url": "https://github.com/ecotoneframework/ecotone-dev/blob/main/LICENSE",
"description": "Allows to use non Enterprise features of Ecotone. For more information please write to [email protected]"
},
"proprietary": {
"name": "Enterprise License",
"description": "Allows to use Enterprise features of Ecotone. For more information please write to [email protected]"
}
}
},
"config": {
Expand Down
5 changes: 4 additions & 1 deletion packages/Amqp/src/AmqpAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
/**
* Class AmqpAdmin
* @package Ecotone\Amqp
* @author Dariusz Gafka <[email protected]>
* @author Dariusz Gafka <[email protected]>
*/
/**
* licence Apache-2.0
*/
class AmqpAdmin
{
Expand Down
5 changes: 4 additions & 1 deletion packages/Amqp/src/AmqpBackedMessageChannelBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
/**
* Class AmqpBackedMessageChannelBuilder
* @package Ecotone\Amqp
* @author Dariusz Gafka <[email protected]>
* @author Dariusz Gafka <[email protected]>
*/
/**
* licence Apache-2.0
*/
class AmqpBackedMessageChannelBuilder extends EnqueueMessageChannelBuilder
{
Expand Down
5 changes: 4 additions & 1 deletion packages/Amqp/src/AmqpBinding.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
/**
* Class AmqpBinding
* @package Ecotone\Amqp
* @author Dariusz Gafka <[email protected]>
* @author Dariusz Gafka <[email protected]>
*/
/**
* licence Apache-2.0
*/
class AmqpBinding
{
Expand Down
5 changes: 4 additions & 1 deletion packages/Amqp/src/AmqpExchange.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
/**
* Class AmqpExchange
* @package Ecotone\Amqp
* @author Dariusz Gafka <[email protected]>
* @author Dariusz Gafka <[email protected]>
*/
/**
* licence Apache-2.0
*/
class AmqpExchange
{
Expand Down
5 changes: 4 additions & 1 deletion packages/Amqp/src/AmqpHeader.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
/**
* Interface AmqpHeader
* @package Ecotone\Amqp
* @author Dariusz Gafka <[email protected]>
* @author Dariusz Gafka <[email protected]>
*/
/**
* licence Apache-2.0
*/
interface AmqpHeader extends EnqueueHeader
{
Expand Down
5 changes: 4 additions & 1 deletion packages/Amqp/src/AmqpInboundChannelAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
/**
* Class InboundEnqueueGateway
* @package Ecotone\Amqp
* @author Dariusz Gafka <[email protected]>
* @author Dariusz Gafka <[email protected]>
*/
/**
* licence Apache-2.0
*/
class AmqpInboundChannelAdapter extends EnqueueInboundChannelAdapter
{
Expand Down
5 changes: 4 additions & 1 deletion packages/Amqp/src/AmqpInboundChannelAdapterBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
/**
* Class InboundEnqueueGatewayBuilder
* @package Ecotone\Amqp
* @author Dariusz Gafka <[email protected]>
* @author Dariusz Gafka <[email protected]>
*/
/**
* licence Apache-2.0
*/
class AmqpInboundChannelAdapterBuilder extends EnqueueInboundChannelAdapterBuilder
{
Expand Down
8 changes: 5 additions & 3 deletions packages/Amqp/src/AmqpOutboundChannelAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
use Interop\Amqp\Impl\AmqpTopic;

/**
* Class OutboundAmqpGateway
* @package Ecotone\Amqp
* @author Dariusz Gafka <[email protected]>
* @author Dariusz Gafka <[email protected]>
* @licence Apache-2.0
*/
/**
* licence Apache-2.0
*/
class AmqpOutboundChannelAdapter implements MessageHandler
{
Expand Down
3 changes: 3 additions & 0 deletions packages/Amqp/src/AmqpOutboundChannelAdapterBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
use Ecotone\Messaging\Config\Container\Reference;
use Ecotone\Messaging\Conversion\ConversionService;

/**
* licence Apache-2.0
*/
class AmqpOutboundChannelAdapterBuilder extends EnqueueOutboundChannelAdapterBuilder
{
private const DEFAULT_PERSISTENT_MODE = true;
Expand Down
Loading

0 comments on commit 937aa05

Please sign in to comment.