diff --git a/distribution/emm-community/pom.xml b/distribution/emm-community/pom.xml
new file mode 100644
index 0000000..9e63888
--- /dev/null
+++ b/distribution/emm-community/pom.xml
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+ io.entgra.community
+ distribution
+ 5.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ 4.0.0
+ entgra-emm
+ pom
+ Entgra EMM - Community Distribution
+ Entgra EMM Community Distribution
+
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+
+ 2-dist
+ package
+
+ single
+
+
+ false
+ UTF-8
+
+ ${basedir}/src/assembly/filter.properties
+
+ \
+
+ ${basedir}/src/assembly/bin.xml
+
+
+ 0775
+ 0775
+ 0644
+ 0644
+
+
+
+
+
+
+
+
+
diff --git a/distribution/emm-community/src/assembly/bin.xml b/distribution/emm-community/src/assembly/bin.xml
new file mode 100644
index 0000000..204d8b7
--- /dev/null
+++ b/distribution/emm-community/src/assembly/bin.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]>
+
+ bin
+
+ zip
+
+ false
+
+
+
+ ../../p2-profile/emm/target/${entgra-iot-core}
+ ${entgra-emm-community}
+
+ **/repository/conf/deployment.toml
+
+
+
+
+
+
+
+ ${entgra-emm-community}/repository/conf/
+
+
+
+
diff --git a/modules/distribution/iot-community/src/assembly/filter.properties b/distribution/emm-community/src/assembly/filter.properties
similarity index 100%
rename from modules/distribution/iot-community/src/assembly/filter.properties
rename to distribution/emm-community/src/assembly/filter.properties
diff --git a/modules/distribution/iot-core/src/core/conf/deployment.toml b/distribution/emm-community/src/conf/deployment.toml
similarity index 85%
rename from modules/distribution/iot-core/src/core/conf/deployment.toml
rename to distribution/emm-community/src/conf/deployment.toml
index 49e0ba4..fac3b8a 100644
--- a/modules/distribution/iot-core/src/core/conf/deployment.toml
+++ b/distribution/emm-community/src/conf/deployment.toml
@@ -129,7 +129,7 @@ auth_token = ""
#claims_extractor_impl = "org.wso2.carbon.apimgt.impl.token.ExtendedDefaultClaimsRetriever"
[apim.oauth_config]
-# ------------------Enabled for IOT ---------------------------
+# ------------------Enabled for IOT/EMM ---------------------------
enable_outbound_auth_header = true
#auth_header = "Authorization"
#revoke_endpoint = "https://localhost:${https.nio.port}/revoke"
@@ -254,38 +254,7 @@ username = "${admin.username}"
password = "${admin.password}"
'header.X-WSO2-KEY-MANAGER' = "default"
-# ----------------Additionally added IOT-----------------------
-[[resource.access_control]]
-context="(.*)/api/device-mgt/v1.0/(.*)"
-secure="true"
-http_method="all"
-
-[[resource.access_control]]
-context="(.*)/api-application-registration/(.*)"
-secure="true"
-http_method="all"
-
-[[resource.access_control]]
-context="(.*)/api/device-mgt/android/v1.0/(.*)"
-secure="true"
-http_method="all"
-
-[[resource.access_control]]
-context="(.*)/api/device-mgt/windows/v1.0/(.*)"
-secure="true"
-http_method="all"
-
-[[resource.access_control]]
-context="(.*)/api/device-mgt/ios/v1.0/(.*)"
-secure="true"
-http_method="all"
-
-[[resource.access_control]]
-context="(.*)//api/application-mgt-publisher/v1.0/(.*)"
-secure="true"
-http_method="all"
-
-#---- below configurations coming from APIM----
+#------------- Adding below configurations which are coming from APIM, to avoid replacing by IOT/EMM configurations ----
[[resource.access_control]]
context="(.*)/keymanager-operations/user-info/claims(.*)"
secure="true"
@@ -307,8 +276,24 @@ http_method="POST"
permissions="/permission/admin/manage/identity/applicationmgt/create"
scopes="internal_application_mgt_create"
+# ----------------Required for IOT/EMM-----------------------
+[[resource.access_control]]
+context="(.*)/api/device-mgt/v1.0/(.*)"
+secure="true"
+http_method="all"
+
+[[resource.access_control]]
+context="(.*)/api-application-registration/(.*)"
+secure="true"
+http_method="all"
+
+[[resource.access_control]]
+context="(.*)/api/application-mgt-publisher/v1.0/(.*)"
+secure="true"
+http_method="all"
+
[apim.sync_runtime_artifacts.gateway.skip_list]
-apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml", "health-check.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml", "admin--IOS-Enrollment.xml", "admin--IOS-Enrollment-Authenticate-Agent.xml", "admin--IOS-Enrollment-Profile.xml", "admin--IOS-Enrollment-Profile-DEP.xml", "admin--IOS-Enrollment-Scep.xml", "admin--Windows_8.1_Device_Management_Service.xml", "admin--Windows_8.1_Device_Management_Service_v1.0.0.xml", "admin--Windows_8.1_Enrollment_Service.xml", "admin--Windows_8.1_Enrollment_Service_v1.0.0.xml", "admin--Windows_10_Device_management.xml", "admin--Windows_10_Device_management_v1.0.0.xml", "admin--Windows_10_Enrollment_Service.xml", "admin--Windows_10_Enrollment_Service_v1.0.0.xml", "admin--Windows_Discovery_Service.xml", "admin--Windows_Discovery_Service_v1.0.0.xml", "admin--Windows_Enrollment_policy_Service.xml", "admin--Windows_Enrollment_policy_Service_v1.0.0.xml"]
+apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml"]
sequences = ["_api_registration_fault_.xml"]
[transport.https.properties]
diff --git a/modules/distribution/iot-core/pom.xml b/distribution/iot-community/pom.xml
similarity index 96%
rename from modules/distribution/iot-core/pom.xml
rename to distribution/iot-community/pom.xml
index c40c7e4..2048390 100644
--- a/modules/distribution/iot-core/pom.xml
+++ b/distribution/iot-community/pom.xml
@@ -29,12 +29,11 @@
4.0.0entgra-iotpom
- Entgra IoT Core Distribution
- Entgra IoT Core Distribution
+ Entgra IoT - Community Distribution
+ Entgra IoT Community Distribution
-
org.apache.maven.pluginsmaven-assembly-plugin
diff --git a/modules/distribution/iot-community/src/assembly/bin.xml b/distribution/iot-community/src/assembly/bin.xml
similarity index 96%
rename from modules/distribution/iot-community/src/assembly/bin.xml
rename to distribution/iot-community/src/assembly/bin.xml
index 73cf925..aaef702 100644
--- a/modules/distribution/iot-community/src/assembly/bin.xml
+++ b/distribution/iot-community/src/assembly/bin.xml
@@ -48,7 +48,7 @@
- ${basedir}/target/${entgra-iot}
+ ../../p2-profile/iot/target/${entgra-iot-core}${entgra-iot-community}
diff --git a/modules/distribution/iot-community/src/temp.txt b/distribution/iot-community/src/assembly/filter.properties
similarity index 100%
rename from modules/distribution/iot-community/src/temp.txt
rename to distribution/iot-community/src/assembly/filter.properties
diff --git a/modules/distribution/iot-core/src/assembly/filter.propeties b/distribution/iot-community/src/temp.txt
similarity index 100%
rename from modules/distribution/iot-core/src/assembly/filter.propeties
rename to distribution/iot-community/src/temp.txt
diff --git a/distribution/iot-community/target/.plxarc b/distribution/iot-community/target/.plxarc
new file mode 100644
index 0000000..67ea6ee
--- /dev/null
+++ b/distribution/iot-community/target/.plxarc
@@ -0,0 +1 @@
+maven-shared-archive-resources
\ No newline at end of file
diff --git a/distribution/iot-community/target/maven-shared-archive-resources/META-INF/DEPENDENCIES b/distribution/iot-community/target/maven-shared-archive-resources/META-INF/DEPENDENCIES
new file mode 100644
index 0000000..d2ec0aa
--- /dev/null
+++ b/distribution/iot-community/target/maven-shared-archive-resources/META-INF/DEPENDENCIES
@@ -0,0 +1,11 @@
+// ------------------------------------------------------------------
+// Transitive dependencies of this project determined from the
+// maven pom organized by organization.
+// ------------------------------------------------------------------
+
+Entgra IoT - Community Distribution
+
+
+
+
+
diff --git a/distribution/iot-community/target/maven-shared-archive-resources/META-INF/LICENSE b/distribution/iot-community/target/maven-shared-archive-resources/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/distribution/iot-community/target/maven-shared-archive-resources/META-INF/LICENSE
@@ -0,0 +1,202 @@
+
+ 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/distribution/iot-community/target/maven-shared-archive-resources/META-INF/NOTICE b/distribution/iot-community/target/maven-shared-archive-resources/META-INF/NOTICE
new file mode 100644
index 0000000..1074455
--- /dev/null
+++ b/distribution/iot-community/target/maven-shared-archive-resources/META-INF/NOTICE
@@ -0,0 +1,8 @@
+
+Entgra IoT - Community Distribution
+Copyright 2021 WSO2
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/distribution/iot-community/target/timestamp b/distribution/iot-community/target/timestamp
new file mode 100644
index 0000000..6c6cd42
Binary files /dev/null and b/distribution/iot-community/target/timestamp differ
diff --git a/modules/distribution/pom.xml b/distribution/pom.xml
similarity index 94%
rename from modules/distribution/pom.xml
rename to distribution/pom.xml
index 2335528..41e00d0 100644
--- a/modules/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -23,7 +23,7 @@
io.entgra.communitycommunity-parent5.0.0-SNAPSHOT
- ../../pom.xml
+ ../pom.xml4.0.0
@@ -33,7 +33,7 @@
Entgra IoT Distribution Module
- iot-coreiot-community
+ emm-community
diff --git a/distribution/target/.plxarc b/distribution/target/.plxarc
new file mode 100644
index 0000000..67ea6ee
--- /dev/null
+++ b/distribution/target/.plxarc
@@ -0,0 +1 @@
+maven-shared-archive-resources
\ No newline at end of file
diff --git a/distribution/target/maven-shared-archive-resources/META-INF/DEPENDENCIES b/distribution/target/maven-shared-archive-resources/META-INF/DEPENDENCIES
new file mode 100644
index 0000000..cedd1cd
--- /dev/null
+++ b/distribution/target/maven-shared-archive-resources/META-INF/DEPENDENCIES
@@ -0,0 +1,11 @@
+// ------------------------------------------------------------------
+// Transitive dependencies of this project determined from the
+// maven pom organized by organization.
+// ------------------------------------------------------------------
+
+Entgra IoT - Distribution Module
+
+
+
+
+
diff --git a/distribution/target/maven-shared-archive-resources/META-INF/LICENSE b/distribution/target/maven-shared-archive-resources/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/distribution/target/maven-shared-archive-resources/META-INF/LICENSE
@@ -0,0 +1,202 @@
+
+ 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/distribution/target/maven-shared-archive-resources/META-INF/NOTICE b/distribution/target/maven-shared-archive-resources/META-INF/NOTICE
new file mode 100644
index 0000000..89b84fa
--- /dev/null
+++ b/distribution/target/maven-shared-archive-resources/META-INF/NOTICE
@@ -0,0 +1,8 @@
+
+Entgra IoT - Distribution Module
+Copyright 2021 WSO2
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/distribution/target/timestamp b/distribution/target/timestamp
new file mode 100644
index 0000000..5ff0782
Binary files /dev/null and b/distribution/target/timestamp differ
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/iot-core/pom.xml
similarity index 92%
rename from modules/p2-profile/iot-core-profile/pom.xml
rename to iot-core/pom.xml
index ec89b2d..7786484 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/iot-core/pom.xml
@@ -21,14 +21,14 @@
io.entgra.community
- p2-profile
+ community-parent5.0.0-SNAPSHOT../pom.xml4.0.0
- iot-core-p2-profile
- Entgra IoT - Core P2 Profile Gen
+ entgra-iot-core
+ Entgra IoT Core distributionpom
@@ -57,7 +57,7 @@
-
+
create-device-mgt-schemainstall
@@ -83,7 +83,7 @@
-
+
create-certificate-mgt-schemainstall
@@ -363,15 +363,36 @@
-
org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
+ maven-assembly-plugin
+
+
+ 2-dist
+ install
+
+ single
+
+
+ false
+ UTF-8
+
+ ${basedir}/src/assembly/filter.properties
+
+ \
+
+ ${basedir}/src/assembly/bin.xml
+
+
+ 0775
+ 0775
+ 0644
+ 0644
+
+
+
+
-
diff --git a/modules/distribution/iot-core/src/assembly/bin.xml b/iot-core/src/assembly/bin.xml
similarity index 78%
rename from modules/distribution/iot-core/src/assembly/bin.xml
rename to iot-core/src/assembly/bin.xml
index bdc3dd5..d8c350c 100644
--- a/modules/distribution/iot-core/src/assembly/bin.xml
+++ b/iot-core/src/assembly/bin.xml
@@ -48,8 +48,8 @@
- ../../p2-profile/iot-core-profile/target/${wso2am}
- ${entgra-iot}
+ ${basedir}/target/${wso2am}
+ ${entgra-iot-core}**/repository/conf/tomcat/context.xml**/repository/conf/deployment.toml
@@ -57,31 +57,31 @@
src/core/synapse-configs/default/api
- ${entgra-iot}/repository/deployment/server/synapse-configs/default/api
+ ${entgra-iot-core}/repository/deployment/server/synapse-configs/default/apisrc/core/conf/tomcat
- ${entgra-iot}/repository/conf/tomcat
+ ${entgra-iot-core}/repository/conf/tomcatsrc/core/bin
- ${entgra-iot}/bin
+ ${entgra-iot-core}/bin755src/core/resources
- ${entgra-iot}/repository/deployment/server/webapps/authenticationendpoint
+ ${entgra-iot-core}/repository/deployment/server/webapps/authenticationendpointsrc/core/resources
- ${entgra-iot}/repository/deployment/server/webapps/accountrecoveryendpoint
+ ${entgra-iot-core}/repository/deployment/server/webapps/accountrecoveryendpoint
- ${entgra-iot}/repository/conf/
+ ${entgra-iot-core}/repository/conf/
diff --git a/iot-core/src/assembly/filter.propeties b/iot-core/src/assembly/filter.propeties
new file mode 100644
index 0000000..e69de29
diff --git a/modules/distribution/iot-core/src/core/bin/iot-server.bat b/iot-core/src/core/bin/iot-server.bat
similarity index 100%
rename from modules/distribution/iot-core/src/core/bin/iot-server.bat
rename to iot-core/src/core/bin/iot-server.bat
diff --git a/modules/distribution/iot-core/src/core/bin/iot-server.sh b/iot-core/src/core/bin/iot-server.sh
similarity index 100%
rename from modules/distribution/iot-core/src/core/bin/iot-server.sh
rename to iot-core/src/core/bin/iot-server.sh
diff --git a/iot-core/src/core/conf/deployment.toml b/iot-core/src/core/conf/deployment.toml
new file mode 100644
index 0000000..a4c16d7
--- /dev/null
+++ b/iot-core/src/core/conf/deployment.toml
@@ -0,0 +1,304 @@
+[server]
+hostname = "localhost"
+#offset=0
+base_path = "${carbon.protocol}://${carbon.host}:${carbon.management.port}"
+#discard_empty_caches = false
+server_role = "default"
+
+[database_configuration]
+enable_h2_console = "true"
+
+[super_admin]
+username = "admin"
+password = "admin"
+create_admin_account = true
+
+[user_store]
+type = "database_unique_id"
+
+[database.apim_db]
+type = "h2"
+url = "jdbc:h2:./repository/database/WSO2AM_DB;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE"
+username = "wso2carbon"
+password = "wso2carbon"
+
+[database.shared_db]
+type = "h2"
+url = "jdbc:h2:./repository/database/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE"
+username = "wso2carbon"
+password = "wso2carbon"
+
+[keystore.tls]
+file_name = "wso2carbon.jks"
+type = "JKS"
+password = "wso2carbon"
+alias = "wso2carbon"
+key_password = "wso2carbon"
+
+#[keystore.primary]
+#file_name = "wso2carbon.jks"
+#type = "JKS"
+#password = "wso2carbon"
+#alias = "wso2carbon"
+#key_password = "wso2carbon"
+
+#[keystore.internal]
+#file_name = "wso2carbon.jks"
+#type = "JKS"
+#password = "wso2carbon"
+#alias = "wso2carbon"
+#key_password = "wso2carbon"
+
+[[apim.gateway.environment]]
+name = "Default"
+type = "hybrid"
+display_in_api_console = true
+description = "This is a hybrid gateway that handles both production and sandbox token traffic."
+show_as_token_endpoint_url = true
+service_url = "https://localhost:${mgt.transport.https.port}/services/"
+username= "${admin.username}"
+password= "${admin.password}"
+ws_endpoint = "ws://localhost:9099"
+wss_endpoint = "wss://localhost:8099"
+http_endpoint = "http://localhost:${http.nio.port}"
+https_endpoint = "https://localhost:${https.nio.port}"
+websub_event_receiver_http_endpoint = "http://localhost:9021"
+websub_event_receiver_https_endpoint = "https://localhost:8021"
+
+[apim.sync_runtime_artifacts.gateway]
+gateway_labels =["Default"]
+
+#[apim.cache.gateway_token]
+#enable = true
+#expiry_time = "900s"
+
+#[apim.cache.resource]
+#enable = true
+#expiry_time = "900s"
+
+#[apim.cache.km_token]
+#enable = false
+#expiry_time = "15m"
+
+#[apim.cache.recent_apis]
+#enable = false
+
+#[apim.cache.scopes]
+#enable = true
+
+#[apim.cache.publisher_roles]
+#enable = true
+
+#[apim.cache.jwt_claim]
+#enable = true
+#expiry_time = "15m"
+
+#[apim.cache.tags]
+#expiry_time = "2m"
+
+[apim.analytics]
+enable = false
+config_endpoint = "https://localhost:8080/auth/v1"
+auth_token = ""
+
+#[apim.key_manager]
+#service_url = "https://localhost:${mgt.transport.https.port}/services/"
+#username = "$ref{super_admin.username}"
+#password = "$ref{super_admin.password}"
+#pool.init_idle_capacity = 50
+#pool.max_idle = 100
+#key_validation_handler_type = "default"
+#key_validation_handler_type = "custom"
+#key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler"
+
+#[apim.idp]
+#server_url = "https://localhost:${mgt.transport.https.port}"
+#authorize_endpoint = "https://localhost:${mgt.transport.https.port}/oauth2/authorize"
+#oidc_logout_endpoint = "https://localhost:${mgt.transport.https.port}/oidc/logout"
+#oidc_check_session_endpoint = "https://localhost:${mgt.transport.https.port}/oidc/checksession"
+
+#[apim.jwt]
+#enable = true
+#encoding = "base64" # base64,base64url
+#generator_impl = "org.wso2.carbon.apimgt.keymgt.token.JWTGenerator"
+#claim_dialect = "http://wso2.org/claims"
+#convert_dialect = false
+#header = "X-JWT-Assertion"
+#signing_algorithm = "SHA256withRSA"
+#enable_user_claims = true
+#claims_extractor_impl = "org.wso2.carbon.apimgt.impl.token.ExtendedDefaultClaimsRetriever"
+
+[apim.oauth_config]
+# ------------------Enabled for IOT/EMM ---------------------------
+enable_outbound_auth_header = true
+#auth_header = "Authorization"
+#revoke_endpoint = "https://localhost:${https.nio.port}/revoke"
+#enable_token_encryption = false
+#enable_token_hashing = false
+
+#[apim.devportal]
+#url = "https://localhost:${mgt.transport.https.port}/devportal"
+#enable_application_sharing = false
+#if application_sharing_type, application_sharing_impl both defined priority goes to application_sharing_impl
+#application_sharing_type = "default" #changed type, saml, default #todo: check the new config for rest api
+#application_sharing_impl = "org.wso2.carbon.apimgt.impl.SAMLGroupIDExtractorImpl"
+#display_multiple_versions = false
+#display_deprecated_apis = false
+#enable_comments = true
+#enable_ratings = true
+#enable_forum = true
+#enable_anonymous_mode=true
+#enable_cross_tenant_subscriptions = true
+#default_reserved_username = "apim_reserved_user"
+
+[apim.cors]
+allow_origins = "*"
+allow_methods = ["GET","PUT","POST","DELETE","PATCH","OPTIONS"]
+allow_headers = ["authorization","Access-Control-Allow-Origin","Content-Type","SOAPAction","apikey","Internal-Key"]
+allow_credentials = false
+
+#[apim.throttling]
+#enable_data_publishing = true
+#enable_policy_deploy = true
+#enable_blacklist_condition = true
+#enable_persistence = true
+#throttle_decision_endpoints = ["tcp://localhost:5672","tcp://localhost:5672"]
+
+#[apim.throttling.blacklist_condition]
+#start_delay = "5m"
+#period = "1h"
+
+#[apim.throttling.jms]
+#start_delay = "5m"
+
+#[apim.throttling.event_sync]
+#hostName = "0.0.0.0"
+#port = 11224
+
+#[apim.throttling.event_management]
+#hostName = "0.0.0.0"
+#port = 10005
+
+#[[apim.throttling.url_group]]
+#traffic_manager_urls = ["tcp://localhost:9611","tcp://localhost:9611"]
+#traffic_manager_auth_urls = ["ssl://localhost:9711","ssl://localhost:9711"]
+#type = "loadbalance"
+
+#[[apim.throttling.url_group]]
+#traffic_manager_urls = ["tcp://localhost:9611","tcp://localhost:9611"]
+#traffic_manager_auth_urls = ["ssl://localhost:9711","ssl://localhost:9711"]
+#type = "failover"
+
+#[apim.workflow]
+#enable = false
+#service_url = "https://localhost:9445/bpmn"
+#username = "$ref{super_admin.username}"
+#password = "$ref{super_admin.password}"
+#callback_endpoint = "https://localhost:${mgt.transport.https.port}/api/am/admin/v0.17/workflows/update-workflow-status"
+#token_endpoint = "https://localhost:${https.nio.port}/token"
+#client_registration_endpoint = "https://localhost:${mgt.transport.https.port}/client-registration/v0.17/register"
+#client_registration_username = "$ref{super_admin.username}"
+#client_registration_password = "$ref{super_admin.password}"
+
+#data bridge config
+#[transport.receiver]
+#type = "binary"
+#worker_threads = 10
+#session_timeout = "30m"
+#keystore.file_name = "$ref{keystore.tls.file_name}"
+#keystore.password = "$ref{keystore.tls.password}"
+#tcp_port = 9611
+#ssl_port = 9711
+#ssl_receiver_thread_pool_size = 100
+#tcp_receiver_thread_pool_size = 100
+#ssl_enabled_protocols = ["TLSv1","TLSv1.1","TLSv1.2"]
+#ciphers = ["SSL_RSA_WITH_RC4_128_MD5","SSL_RSA_WITH_RC4_128_SHA"]
+
+#[apim.notification]
+#from_address = "APIM.com"
+#username = "APIM"
+#password = "APIM+123"
+#hostname = "localhost"
+#port = 3025
+#enable_start_tls = false
+#enable_authentication = true
+
+#[apim.token.revocation]
+#notifier_impl = "org.wso2.carbon.apimgt.keymgt.events.TokenRevocationNotifierImpl"
+#enable_realtime_notifier = true
+#realtime_notifier.ttl = 5000
+#enable_persistent_notifier = true
+#persistent_notifier.hostname = "https://localhost:2379/v2/keys/jti/"
+#persistent_notifier.ttl = 5000
+#persistent_notifier.username = "root"
+#persistent_notifier.password = "root"
+
+[[event_handler]]
+name="userPostSelfRegistration"
+subscriptions=["POST_ADD_USER"]
+
+[service_provider]
+sp_name_regex = "^[\\sa-zA-Z0-9._-]*$"
+
+[database.local]
+url = "jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE"
+
+[[event_listener]]
+id = "token_revocation"
+type = "org.wso2.carbon.identity.core.handler.AbstractIdentityHandler"
+name = "org.wso2.is.notification.ApimOauthEventInterceptor"
+order = 1
+[event_listener.properties]
+notification_endpoint = "https://localhost:${mgt.transport.https.port}/internal/data/v1/notify"
+username = "${admin.username}"
+password = "${admin.password}"
+'header.X-WSO2-KEY-MANAGER' = "default"
+
+#---- Adding below configurations which are coming from APIM, to avoid replacing by IOT/EMM configurations ----
+[[resource.access_control]]
+context="(.*)/keymanager-operations/user-info/claims(.*)"
+secure="true"
+http_method="GET"
+permissions="/permission/admin/manage/identity/usermgt/list"
+scopes="internal_user_mgt_list"
+
+[[resource.access_control]]
+context="(.*)/keymanager-operations/user-info/claims/generate"
+secure="true"
+http_method="POST"
+permissions="/permission/admin/manage/identity/usermgt/list"
+scopes="internal_user_mgt_list"
+
+[[resource.access_control]]
+context="(.*)/keymanager-operations/dcr/register"
+secure="true"
+http_method="POST"
+permissions="/permission/admin/manage/identity/applicationmgt/create"
+scopes="internal_application_mgt_create"
+
+# ----------------Required for IOT/EMM-----------------------
+[[resource.access_control]]
+context="(.*)/api/device-mgt/v1.0/(.*)"
+secure="true"
+http_method="all"
+
+[[resource.access_control]]
+context="(.*)/api-application-registration/(.*)"
+secure="true"
+http_method="all"
+
+[[resource.access_control]]
+context="(.*)/api/application-mgt-publisher/v1.0/(.*)"
+secure="true"
+http_method="all"
+
+[apim.sync_runtime_artifacts.gateway.skip_list]
+apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml"]
+sequences = ["_api_registration_fault_.xml"]
+
+[transport.https.properties]
+maxHttpHeaderSize="16384"
+
+[transport.http.properties]
+maxHttpHeaderSize="16384"
+
diff --git a/modules/distribution/iot-core/src/core/conf/tomcat/context.xml b/iot-core/src/core/conf/tomcat/context.xml
similarity index 100%
rename from modules/distribution/iot-core/src/core/conf/tomcat/context.xml
rename to iot-core/src/core/conf/tomcat/context.xml
diff --git a/modules/distribution/iot-core/src/core/resources/extensions/cookie-policy-content.jsp b/iot-core/src/core/resources/extensions/cookie-policy-content.jsp
similarity index 100%
rename from modules/distribution/iot-core/src/core/resources/extensions/cookie-policy-content.jsp
rename to iot-core/src/core/resources/extensions/cookie-policy-content.jsp
diff --git a/modules/distribution/iot-core/src/core/resources/extensions/customAssets/logo.svg b/iot-core/src/core/resources/extensions/customAssets/logo.svg
similarity index 100%
rename from modules/distribution/iot-core/src/core/resources/extensions/customAssets/logo.svg
rename to iot-core/src/core/resources/extensions/customAssets/logo.svg
diff --git a/modules/distribution/iot-core/src/core/resources/extensions/header.jsp b/iot-core/src/core/resources/extensions/header.jsp
similarity index 100%
rename from modules/distribution/iot-core/src/core/resources/extensions/header.jsp
rename to iot-core/src/core/resources/extensions/header.jsp
diff --git a/modules/distribution/iot-core/src/core/resources/extensions/privacy-policy-content.jsp b/iot-core/src/core/resources/extensions/privacy-policy-content.jsp
similarity index 100%
rename from modules/distribution/iot-core/src/core/resources/extensions/privacy-policy-content.jsp
rename to iot-core/src/core/resources/extensions/privacy-policy-content.jsp
diff --git a/modules/distribution/iot-core/src/core/resources/extensions/product-title.jsp b/iot-core/src/core/resources/extensions/product-title.jsp
similarity index 100%
rename from modules/distribution/iot-core/src/core/resources/extensions/product-title.jsp
rename to iot-core/src/core/resources/extensions/product-title.jsp
diff --git a/modules/distribution/iot-core/src/core/resources/extensions/title.jsp b/iot-core/src/core/resources/extensions/title.jsp
similarity index 100%
rename from modules/distribution/iot-core/src/core/resources/extensions/title.jsp
rename to iot-core/src/core/resources/extensions/title.jsp
diff --git a/modules/distribution/iot-core/src/core/synapse-configs/default/api/_TokenAPI_.xml b/iot-core/src/core/synapse-configs/default/api/_TokenAPI_.xml
similarity index 100%
rename from modules/distribution/iot-core/src/core/synapse-configs/default/api/_TokenAPI_.xml
rename to iot-core/src/core/synapse-configs/default/api/_TokenAPI_.xml
diff --git a/p2-profile/emm/pom.xml b/p2-profile/emm/pom.xml
new file mode 100644
index 0000000..71e6dc2
--- /dev/null
+++ b/p2-profile/emm/pom.xml
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+ io.entgra.community
+ p2-profile
+ 5.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ 4.0.0
+ entgra-emm-p2-profile
+ pom
+ Entgra EMM - p2 profile
+ Entgra EMM p2 profile
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ false
+
+
+ 1-unpack-entgra-iots
+ test
+
+ unpack
+
+
+
+
+ io.entgra.community
+ entgra-iot-core
+ zip
+ true
+ target
+
+
+
+
+
+
+
+ org.wso2.maven
+ carbon-p2-plugin
+
+
+ 2-p2-repo-generation
+ package
+
+ p2-repo-gen
+
+
+ file:${basedir}/target/p2-repo
+ file:${basedir}/target/p2-repo
+ true
+ true
+
+
+ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
+
+
+
+
+
+
+
+
+ feature-install
+ package
+
+ p2-profile-gen
+
+
+ default
+ file:${basedir}/target/p2-repo
+ file:${basedir}/target/p2-repo
+ ${basedir}/target/${entgra-iot-core}/repository/components
+ true
+
+
+ org.wso2.carbon.device.mgt.mobile.android.feature.group
+ ${carbon.device.mgt.plugin.version}
+
+
+
+
+
+
+
+
+
+
+
+ com.google.code.maven-replacer-plugin
+ replacer
+ 1.5.3
+
+
+ package
+
+ replace
+
+
+
+
+
+ ${basedir}/target/${entgra-iot-core}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+
+
+
+ false
+ true
+
+
+
+
+
+
+
+
+
diff --git a/modules/distribution/iot-community/pom.xml b/p2-profile/iot/pom.xml
similarity index 76%
rename from modules/distribution/iot-community/pom.xml
rename to p2-profile/iot/pom.xml
index 9c3abd8..b5869b3 100644
--- a/modules/distribution/iot-community/pom.xml
+++ b/p2-profile/iot/pom.xml
@@ -21,16 +21,16 @@
io.entgra.community
- distribution
+ p2-profile5.0.0-SNAPSHOT../pom.xml4.0.0
- entgra-iot-community
+ entgra-iot-p2-profilepom
- Entgra IoT - Community Distribution
- Entgra IoT Community Distribution
+ Entgra IoT - p2 profile
+ Entgra IoT p2 profile
@@ -49,7 +49,7 @@
io.entgra.community
- entgra-iot
+ entgra-iot-coreziptruetarget
@@ -95,7 +95,7 @@
defaultfile:${basedir}/target/p2-repofile:${basedir}/target/p2-repo
- ${basedir}/target/${entgra-iot}/repository/components
+ ${basedir}/target/${entgra-iot-core}/repository/componentstrue
@@ -125,7 +125,7 @@
- ${basedir}/target/${entgra-iot}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+ ${basedir}/target/${entgra-iot-core}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
@@ -135,36 +135,7 @@
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- 2-dist
- package
-
- single
-
-
- false
- UTF-8
-
- ${basedir}/src/assembly/filter.properties
-
- \
-
- ${basedir}/src/assembly/bin.xml
-
-
- 0775
- 0775
- 0644
- 0644
-
-
-
-
-
+
diff --git a/modules/p2-profile/pom.xml b/p2-profile/pom.xml
similarity index 92%
rename from modules/p2-profile/pom.xml
rename to p2-profile/pom.xml
index 8376f59..9f1f210 100644
--- a/modules/p2-profile/pom.xml
+++ b/p2-profile/pom.xml
@@ -23,7 +23,7 @@
io.entgra.communitycommunity-parent5.0.0-SNAPSHOT
- ../../pom.xml
+ ../pom.xml4.0.0
@@ -33,7 +33,8 @@
http://entgra.io
- iot-core-profile
+ iot
+ emm
diff --git a/p2-profile/target/.plxarc b/p2-profile/target/.plxarc
new file mode 100644
index 0000000..67ea6ee
--- /dev/null
+++ b/p2-profile/target/.plxarc
@@ -0,0 +1 @@
+maven-shared-archive-resources
\ No newline at end of file
diff --git a/p2-profile/target/maven-shared-archive-resources/META-INF/DEPENDENCIES b/p2-profile/target/maven-shared-archive-resources/META-INF/DEPENDENCIES
new file mode 100644
index 0000000..fb35ea7
--- /dev/null
+++ b/p2-profile/target/maven-shared-archive-resources/META-INF/DEPENDENCIES
@@ -0,0 +1,11 @@
+// ------------------------------------------------------------------
+// Transitive dependencies of this project determined from the
+// maven pom organized by organization.
+// ------------------------------------------------------------------
+
+Entgra IoT - P2 Profile Module
+
+
+
+
+
diff --git a/p2-profile/target/maven-shared-archive-resources/META-INF/LICENSE b/p2-profile/target/maven-shared-archive-resources/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/p2-profile/target/maven-shared-archive-resources/META-INF/LICENSE
@@ -0,0 +1,202 @@
+
+ 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/p2-profile/target/maven-shared-archive-resources/META-INF/NOTICE b/p2-profile/target/maven-shared-archive-resources/META-INF/NOTICE
new file mode 100644
index 0000000..b2cab3c
--- /dev/null
+++ b/p2-profile/target/maven-shared-archive-resources/META-INF/NOTICE
@@ -0,0 +1,8 @@
+
+Entgra IoT - P2 Profile Module
+Copyright 2021 WSO2
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/p2-profile/target/timestamp b/p2-profile/target/timestamp
new file mode 100644
index 0000000..1e10b78
Binary files /dev/null and b/p2-profile/target/timestamp differ
diff --git a/pom.xml b/pom.xml
index df83ed4..640d6ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,9 @@
- modules/p2-profile
- modules/distribution
+ iot-core
+ p2-profile
+ distribution
@@ -92,7 +93,7 @@
io.entgra.community
- entgra-iot
+ entgra-iot-core${project.version}
@@ -101,8 +102,9 @@
wso2am-4.0.0
- entgra-iot-${project.version}
- entgra-iot-community-${project.version}
+ entgra-iot-core-${project.version}
+ entgra-iot-${project.version}
+ entgra-emm-${project.version}5.0.0-SNAPSHOT