diff --git a/all/pom.xml b/all/pom.xml index 34cc5532e1..a870841829 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -35,7 +35,7 @@ acs-aem-commons-all ACS AEM Commons Container Package (All) ACS AEM Commons container content package which delivers acs-aem-commons-ui.apps, - acs-aem-commons-ui.content, the OSGi bundle and configuration. + acs-aem-commons-ui.content, acs-aem-commons-ui.config and the OSGi bundle. content-package @@ -47,6 +47,7 @@ false container + **/META-INF/*,**/thumbnail.png @@ -86,6 +87,13 @@ true true + + ${project.groupId} + acs-aem-commons-ui.config + /apps/acs-commons/install + true + true + @@ -210,6 +218,13 @@ zip provided + + ${project.groupId} + acs-aem-commons-ui.config + ${project.version} + zip + provided + @@ -292,6 +307,13 @@ true true + + ${project.groupId} + acs-aem-commons-ui.config + /apps/acs-commons/install + true + true + diff --git a/all/src/main/content/META-INF/vault/filter.xml b/all/src/main/content/META-INF/vault/filter.xml index 405a502562..c0e2a328b5 100644 --- a/all/src/main/content/META-INF/vault/filter.xml +++ b/all/src/main/content/META-INF/vault/filter.xml @@ -18,8 +18,5 @@ --> - - - - + diff --git a/pom.xml b/pom.xml index f281353197..c9f464cc13 100644 --- a/pom.xml +++ b/pom.xml @@ -943,6 +943,7 @@ Bundle-DocURL: https://adobe-consulting-services.github.io/acs-aem-commons/ oakpal-checks ui.apps ui.content + ui.config all diff --git a/ui.config/.gitignore b/ui.config/.gitignore new file mode 100644 index 0000000000..5e152e67f1 --- /dev/null +++ b/ui.config/.gitignore @@ -0,0 +1 @@ +/nbactions-autoInstallPackage.xml diff --git a/ui.config/pom.xml b/ui.config/pom.xml new file mode 100644 index 0000000000..bb54d7518e --- /dev/null +++ b/ui.config/pom.xml @@ -0,0 +1,78 @@ + + + + + 4.0.0 + + + + + com.adobe.acs + acs-aem-commons + 6.7.0-SNAPSHOT + + + + + + + acs-aem-commons-ui.config + ACS AEM Commons UI.Config Package + ACS AEM Commons content package containing configs. + content-package + + + + + + org.apache.jackrabbit + filevault-package-maven-plugin + + container + + + + + + + + autoInstallUiConfigPackage + + + + com.day.jcr.vault + content-package-maven-plugin + + ${contentPackageFile} + + + + install-content-package + install + + install + + + + + + + + + diff --git a/ui.config/src/main/content/META-INF/vault/filter.xml b/ui.config/src/main/content/META-INF/vault/filter.xml new file mode 100644 index 0000000000..405a502562 --- /dev/null +++ b/ui.config/src/main/content/META-INF/vault/filter.xml @@ -0,0 +1,25 @@ + + + + + + + + + diff --git a/all/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.AcsCommonsConsoleAuthoringUIModeFilter.cfg.json b/ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.AcsCommonsConsoleAuthoringUIModeFilter.cfg.json similarity index 100% rename from all/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.AcsCommonsConsoleAuthoringUIModeFilter.cfg.json rename to ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.AcsCommonsConsoleAuthoringUIModeFilter.cfg.json diff --git a/all/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.AcsCommonsConsoleEditorFilter.cfg.json b/ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.AcsCommonsConsoleEditorFilter.cfg.json similarity index 100% rename from all/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.AcsCommonsConsoleEditorFilter.cfg.json rename to ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.AcsCommonsConsoleEditorFilter.cfg.json diff --git a/all/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml b/ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml similarity index 100% rename from all/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml rename to ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/com.adobe.acs.commons.wcm.impl.QrCodeServlet.xml diff --git a/all/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-author.config b/ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-author.config similarity index 100% rename from all/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-author.config rename to ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-author.config diff --git a/all/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons-author.config b/ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons-author.config similarity index 100% rename from all/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons-author.config rename to ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons-author.config diff --git a/all/src/main/content/jcr_root/apps/acs-commons/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-publish.config b/ui.config/src/main/content/jcr_root/apps/acs-commons/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-publish.config similarity index 100% rename from all/src/main/content/jcr_root/apps/acs-commons/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-publish.config rename to ui.config/src/main/content/jcr_root/apps/acs-commons/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-publish.config diff --git a/all/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.event.jobs.QueueConfiguration~package-garbage-collection.config b/ui.config/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.event.jobs.QueueConfiguration~package-garbage-collection.config similarity index 100% rename from all/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.event.jobs.QueueConfiguration~package-garbage-collection.config rename to ui.config/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.event.jobs.QueueConfiguration~package-garbage-collection.config diff --git a/all/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-all.config b/ui.config/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-all.config similarity index 100% rename from all/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-all.config rename to ui.config/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-all.config diff --git a/all/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons-all.config b/ui.config/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons-all.config similarity index 100% rename from all/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons-all.config rename to ui.config/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-acs-commons-all.config diff --git a/ui.config/src/main/resources/META-INF/COPYRIGHT b/ui.config/src/main/resources/META-INF/COPYRIGHT new file mode 100644 index 0000000000..817fe2246d --- /dev/null +++ b/ui.config/src/main/resources/META-INF/COPYRIGHT @@ -0,0 +1,15 @@ +Copyright 2013 Adobe + +Adobe holds the copyright for all the files found in this repository. + +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. \ No newline at end of file diff --git a/ui.config/src/main/resources/META-INF/LICENSE b/ui.config/src/main/resources/META-INF/LICENSE new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/ui.config/src/main/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/ui.config/src/main/resources/META-INF/NOTICE b/ui.config/src/main/resources/META-INF/NOTICE new file mode 100644 index 0000000000..63484f364c --- /dev/null +++ b/ui.config/src/main/resources/META-INF/NOTICE @@ -0,0 +1,17 @@ +Adobe, Adobe Bridge, the Adobe Bridge logo, Illustrator, the Illustrator logo, InDesign, the InDesign logo, Photoshop, +and the Photoshop logo are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States +and/or other countries. + +In accordance with Section 6 of the License (Apache License Version 2.0), you are not granted 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 ["History" component of "Advanced Assets Components" for Adobe Experience +Manager Assets, under ACS AEM Commons] and reproducing the content of the NOTICE file. + +You may use the Adobe trademarks referentially solely in your implementations of the Work installed in Adobe Experience +Manager. Except for such referential use, you may not use the Adobe trademarks without a separate written license +agreement from Adobe. + +You may not use, reproduce or distribute the Adobe application product logo trademarks for Adobe Bridge, Adobe +Illustrator, Adobe InDesign or Adobe Photoshop in any Derivative Works, but you may use referentially the Adobe word +trademarks—Adobe, Adobe Bridge, Adobe Illustrator, Adobe InDesign and Adobe Photoshop—in Derivative Works installed +in Adobe Experience Manager. diff --git a/ui.config/src/main/resources/thumbnail.png b/ui.config/src/main/resources/thumbnail.png new file mode 100644 index 0000000000..042ea2efea Binary files /dev/null and b/ui.config/src/main/resources/thumbnail.png differ