You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2021/09/21 14:45:29 UTC
[sling-org-apache-sling-scripting-bundle-tracker-it] branch master
updated: SLING-10808 - Generate scripting capabilities from Jackrabbit
FileVault content packages
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git
The following commit(s) were added to refs/heads/master by this push:
new 2793bee SLING-10808 - Generate scripting capabilities from Jackrabbit FileVault content packages
2793bee is described below
commit 2793beec79522b55cd9ed67859612bed62ceceee
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Sep 21 16:44:50 2021 +0200
SLING-10808 - Generate scripting capabilities from Jackrabbit FileVault content packages
* added an example project + IT
---
.../pom.xml | 202 +++++++++++++++++++++
.../src/main/content/META-INF/LICENSE | 202 +++++++++++++++++++++
.../src/main/content/META-INF/NOTICE | 10 +
.../src/main/content/META-INF/vault/filter.xml | 26 +++
.../src/main/content/jcr_root/.content.xml | 6 +
.../src/main/content/jcr_root/apps/.content.xml | 4 +
.../main/content/jcr_root/apps/sling/.content.xml | 3 +
.../jcr_root/apps/sling/scripting/.content.xml | 3 +
.../apps/sling/scripting/example-cp/.content.xml | 3 +
.../sling/scripting/example-cp/hello/.content.xml | 5 +
.../sling/scripting/example-cp/hello/hello.html | 27 +++
.../src/main/content/jcr_root/content/.content.xml | 12 ++
.../jcr_root/content/bundled-scripts/.content.xml | 3 +
.../bundled-scripts/example-cp/.content.xml | 3 +
.../bundled-scripts/example-cp/hello/.content.xml | 4 +
it/pom.xml | 14 ++
.../bundle/tracker/it/ExampleBundleFromCPIT.java | 55 ++++++
it/src/test/provisioning/it-model.txt | 2 +
pom.xml | 1 +
19 files changed, 585 insertions(+)
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/pom.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/pom.xml
new file mode 100644
index 0000000..bdabaad
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/pom.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>41</version>
+ <relativePath/>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>org.apache.sling.scripting.content-package-with-bundle-attached</artifactId>
+ <version>0.1.1-SNAPSHOT</version>
+ <packaging>content-package</packaging>
+
+ <build>
+ <sourceDirectory>src/main/content/jcr_root</sourceDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/vault-work/META-INF</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/content/META-INF/</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>filevault-package-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>1.1.6</version>
+ <configuration>
+ <packageType>mixed</packageType>
+ <filterSource>src/main/content/META-INF/vault/filter.xml</filterSource>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.3.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>scriptingbundle-maven-plugin</artifactId>
+ <version>0.4.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <packagingTypes>content-package</packagingTypes>
+ <bnd><![CDATA[
+-snapshot: SNAPSHOT
+
+# reproducible builds (https://github.com/bndtools/bnd/issues/3521)
+-noextraheaders: true
+
+Bundle-Name: ${project.name} - precompiled scripts
+Bundle-SymbolicName: ${project.groupId}.${project.artifactId}.precompiled-scripts
+-plugin: org.apache.sling.scriptingbundle.plugin.bnd.BundledScriptsScannerPlugin;sourceDirectories="src/main/content/jcr_root"
+Require-Capability: osgi.extender;filter:="(&(osgi.extender=sling.scripting)(version>=1.0.0)(!(version>=2.0.0)))"
+ ]]></bnd>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>precompiled-scripts</classifier>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>htl-maven-plugin</artifactId>
+ <version>2.0.0-1.4.0</version>
+ <executions>
+ <execution>
+ <id>validate-htl-scripts</id>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <generateJavaClasses>true</generateJavaClasses>
+ <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/.content.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.16.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.models.api</artifactId>
+ <version>1.3.6</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.sightly.runtime</artifactId>
+ <version>1.2.2-1.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>1.3.10</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/META-INF/LICENSE b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/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/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/META-INF/NOTICE b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/META-INF/NOTICE
new file mode 100644
index 0000000..da57387
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/META-INF/NOTICE
@@ -0,0 +1,10 @@
+
+org.apache.sling.scripting.content-package-with-bundle-attached
+Copyright 2007-2020 The Apache Software Foundation
+
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/META-INF/vault/filter.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/META-INF/vault/filter.xml
new file mode 100644
index 0000000..530f9a2
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/META-INF/vault/filter.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<workspaceFilter version="1.0">
+ <!--
+ Do not pack the apps folder!
+ <filter root="/apps/sling/scripting/example-cp"/>
+ -->
+ <filter root="/content/bundled-scripts/example-cp"/>
+</workspaceFilter>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/.content.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/.content.xml
new file mode 100644
index 0000000..6d0670f
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+ jcr:mixinTypes="[rep:AccessControllable,rep:RepoAccessControllable]"
+ jcr:primaryType="rep:root"
+ sling:resourceType="sling:redirect"
+ sling:target="/starter.html"/>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/.content.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/.content.xml
new file mode 100644
index 0000000..1581aa3
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/.content.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+ jcr:mixinTypes="[rep:AccessControllable]"
+ jcr:primaryType="sling:Folder"/>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/.content.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/.content.xml
new file mode 100644
index 0000000..a0ac99e
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+ jcr:primaryType="sling:Folder"/>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/.content.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/.content.xml
new file mode 100644
index 0000000..a0ac99e
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+ jcr:primaryType="sling:Folder"/>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/example-cp/.content.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/example-cp/.content.xml
new file mode 100644
index 0000000..a0ac99e
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/example-cp/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+ jcr:primaryType="sling:Folder"/>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/example-cp/hello/.content.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/example-cp/hello/.content.xml
new file mode 100644
index 0000000..7eb5aca
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/example-cp/hello/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+ jcr:primaryType="sling:Folder"
+ sling:requiredResourceTypes="[sling/scripting/examplebundle/precompiled/ttest]"
+ sling:resourceSuperType="sling/scripting/examplebundle/hello"/>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/example-cp/hello/hello.html b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/example-cp/hello/hello.html
new file mode 100644
index 0000000..a04044b
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/apps/sling/scripting/example-cp/hello/hello.html
@@ -0,0 +1,27 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<h2 class="root" data-script="${javax_script_filename}">${resource.resourceType}</h2>
+<sly data-sly-include="h.html"/> <sly data-sly-include="w.html"/>
+<div data-sly-use.slingSettings="org.apache.sling.settings.SlingSettingsService"
+ data-sly-test.slingId="${slingSettings.slingId}"
+ id="sling-id">${slingId}</div>
+
+<h2>Delegation:</h2>
+<div class="wrapped" data-sly-resource="${@ resourceType='sling/scripting/examplebundle/precompiled/ttest'}">
+</div>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/.content.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/.content.xml
new file mode 100644
index 0000000..2b8d483
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/.content.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+ jcr:mixinTypes="[rep:AccessControllable]"
+ jcr:primaryType="sling:OrderedFolder"
+ sling:resourceType="sling:redirect"
+ sling:target="/starter.html">
+ <rep:policy/>
+ <slingshot/>
+ <bundled-scripts/>
+ <starter/>
+ <startup/>
+</jcr:root>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/bundled-scripts/.content.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/bundled-scripts/.content.xml
new file mode 100644
index 0000000..a0ac99e
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/bundled-scripts/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+ jcr:primaryType="sling:Folder"/>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/bundled-scripts/example-cp/.content.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/bundled-scripts/example-cp/.content.xml
new file mode 100644
index 0000000..a7e2336
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/bundled-scripts/example-cp/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0"
+ jcr:primaryType="sling:Folder"/>
diff --git a/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/bundled-scripts/example-cp/hello/.content.xml b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/bundled-scripts/example-cp/hello/.content.xml
new file mode 100644
index 0000000..ae54d89
--- /dev/null
+++ b/examples/org-apache-sling-scripting-content-package-with-bundle-attached/src/main/content/jcr_root/content/bundled-scripts/example-cp/hello/.content.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+ jcr:primaryType="nt:unstructured"
+ sling:resourceType="sling/scripting/example-cp/hello"/>
diff --git a/it/pom.xml b/it/pom.xml
index 4ed6da9..e342021 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -276,6 +276,20 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.content-package-with-bundle-attached</artifactId>
+ <version>0.1.1-SNAPSHOT</version>
+ <type>zip</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.scripting.content-package-with-bundle-attached</artifactId>
+ <classifier>precompiled-scripts</classifier>
+ <version>0.1.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleFromCPIT.java b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleFromCPIT.java
new file mode 100644
index 0000000..34d4bbb
--- /dev/null
+++ b/it/src/test/java/org/apache/sling/scripting/bundle/tracker/it/ExampleBundleFromCPIT.java
@@ -0,0 +1,55 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package org.apache.sling.scripting.bundle.tracker.it;
+
+import org.jsoup.nodes.Document;
+import org.jsoup.select.Elements;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class ExampleBundleFromCPIT extends AbstractEndpointTestBase {
+
+ private static final String ROOT = BASE + "/example-cp";
+
+ @Test
+ public void testHello() throws Exception {
+ final String expectedRT = "sling/scripting/example-cp/hello";
+ Document document = getDocument(ROOT + "/hello.html");
+ Elements heading = document.select("h2.root");
+ assertEquals(expectedRT, heading.html());
+ final String expectedScriptDriver = "/apps/sling/scripting/example-cp/hello/hello.html";
+ assertTrue(heading.hasAttr(DATA_SCRIPT) && expectedScriptDriver.equals(heading.attr(DATA_SCRIPT)));
+
+ Elements h = document.select("#h-examplebundle-hello");
+ assertEquals("Resource based servlet resolution failed.", 1, h.size());
+ assertEquals("Hello", h.html());
+ assertEquals(expectedRT, h.attr(DATA_RT_ATTRIBUTE));
+
+ Elements w = document.select("#w-examplebundle-hello");
+ assertEquals("Resource based servlet resolution failed.", 1, w.size());
+ assertEquals("World", w.html());
+ assertEquals(expectedRT, w.attr(DATA_RT_ATTRIBUTE));
+
+ Elements delegationDiv = document.select("div.examplebundle-precompiled-template");
+ assertEquals("Hello, John Doe!", delegationDiv.html());
+ }
+
+}
diff --git a/it/src/test/provisioning/it-model.txt b/it/src/test/provisioning/it-model.txt
index 0fffa0b..409b9ff 100644
--- a/it/src/test/provisioning/it-model.txt
+++ b/it/src/test/provisioning/it-model.txt
@@ -39,6 +39,8 @@
org.apache.sling/org.apache.sling.scripting.examplebundle.precompiled
org.apache.sling/org.apache.sling.scripting.examplebundle.precompiled.extend1
org.apache.sling/org.apache.sling.scripting.examplebundle.precompiled.jsp
+ org.apache.sling/org.apache.sling.scripting.content-package-with-bundle-attached/0.1.1-SNAPSHOT/zip
+ org.apache.sling/org.apache.sling.scripting.content-package-with-bundle-attached/0.1.1-SNAPSHOT/jar/precompiled-scripts
org.apache.sling/org.apache.sling.junit.core
[configurations]
diff --git a/pom.xml b/pom.xml
index 79a153e..07de5d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
<module>examples/org-apache-sling-scripting-examplebundle-precompiled</module>
<module>examples/org-apache-sling-scripting-examplebundle-precompiled-extend1</module>
<module>examples/org-apache-sling-scripting-examplebundle-precompiled-jsp</module>
+ <module>examples/org-apache-sling-scripting-content-package-with-bundle-attached</module>
<module>it</module>
</modules>