You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2022/03/28 12:22:36 UTC
[sling-org-apache-sling-app-cms] branch master updated (4630ef9 -> 37d262d)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
from 4630ef9 SLING-11102 - correcting invalid javabean method name
new 93f3f62 SLING-11069 - Further dependency updates
new fd7e0d4 SLING-11223 - Fixes and improvements to queries, property usage and indexes to support larger repositories
new fa942c4 SLING-11224 - Fixing content import configuration for root files
new 37d262d SLING-11228 - Adding login admin whitelist for cms.core bundle
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../DefaultScriptBindingsValueProvider.java | 7 +-
.../core/internal/models/ReferenceOperation.java | 4 +-
.../sling/cms/core/models/QueryDebugger.java | 2 +-
.../apache/sling/cms/core/models/StartContent.java | 53 +-
.../DefaultScriptBindingsValueProviderTest.java | 5 -
core/src/test/resources/conf.json | 2 +-
feature/pom.xml | 709 +++++++++++----------
feature/src/main/features/base.json | 16 +-
feature/src/main/features/cms/cms.json | 6 +
feature/src/main/features/cms/dependencies.json | 4 +-
feature/src/main/features/discovery.json | 6 +-
feature/src/main/features/distribution.json | 4 +-
feature/src/main/features/event.json | 2 +-
feature/src/main/features/healthcheck.json | 2 +-
feature/src/main/features/oak/oak_base.json | 8 +-
feature/src/main/features/scripting.json | 8 +-
feature/src/main/features/thumbnails.json | 5 +-
pom.xml | 30 +-
reference/bnd.bnd | 2 +-
.../apache/sling/cms/reference/models/Search.java | 4 +-
.../components/general/searchform/config.json | 55 +-
.../components/general/searchform/searchform.jsp | 3 +-
.../components/general/sitemap/sitemap.xml.jsp | 2 +-
.../reference/components/general/tags/tags.jsp | 2 +-
.../apps/reference/components/pages/base/body.jsp | 5 +-
rules.xml | 11 +
ui/bnd.bnd | 2 +-
.../resources/SLING-INF/nodetypes/nodetypes.cnd | 2 +-
ui/src/main/resources/jcr_root/conf/global.json | 2 +-
.../components/cms/contentgrid/contentgrid.jsp | 21 +-
.../components/cms/contenttable/contenttable.jsp | 21 +-
.../resources/jcr_root/oak%3Aindex/ntBase.json | 45 ++
.../jcr_root/oak%3Aindex/ntBaseLucene.json | 40 --
.../jcr_root/oak%3Aindex/ntHierarchyNode.json | 64 ++
.../resources/jcr_root/oak%3Aindex/published.json | 9 -
.../jcr_root/oak%3Aindex/slingComponent.json | 29 +
.../resources/jcr_root/oak%3Aindex/slingFile.json | 87 +++
.../jcr_root/oak%3Aindex/slingFileLucene.json | 76 ---
.../resources/jcr_root/oak%3Aindex/slingPage.json | 121 ++++
.../jcr_root/oak%3Aindex/slingPageLucene.json | 89 ---
.../oak%3Aindex/slingResourceSuperType.json | 12 +-
.../jcr_root/oak%3Aindex/slingTaxonomy.json | 63 +-
.../jcr_root/oak%3Aindex/slingTemplate.json | 9 -
43 files changed, 909 insertions(+), 740 deletions(-)
create mode 100644 ui/src/main/resources/jcr_root/oak%3Aindex/ntBase.json
delete mode 100644 ui/src/main/resources/jcr_root/oak%3Aindex/ntBaseLucene.json
create mode 100644 ui/src/main/resources/jcr_root/oak%3Aindex/ntHierarchyNode.json
delete mode 100644 ui/src/main/resources/jcr_root/oak%3Aindex/published.json
create mode 100644 ui/src/main/resources/jcr_root/oak%3Aindex/slingComponent.json
create mode 100644 ui/src/main/resources/jcr_root/oak%3Aindex/slingFile.json
delete mode 100644 ui/src/main/resources/jcr_root/oak%3Aindex/slingFileLucene.json
create mode 100644 ui/src/main/resources/jcr_root/oak%3Aindex/slingPage.json
delete mode 100644 ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json
delete mode 100644 ui/src/main/resources/jcr_root/oak%3Aindex/slingTemplate.json
[sling-org-apache-sling-app-cms] 01/04: SLING-11069 - Further dependency updates
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 93f3f6263c3a6d7707522386076b188a8c913094
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Tue Mar 22 20:38:01 2022 -0400
SLING-11069 - Further dependency updates
---
feature/pom.xml | 709 ++++++++++++------------
feature/src/main/features/base.json | 16 +-
feature/src/main/features/cms/dependencies.json | 4 +-
feature/src/main/features/discovery.json | 6 +-
feature/src/main/features/distribution.json | 4 +-
feature/src/main/features/event.json | 2 +-
feature/src/main/features/healthcheck.json | 2 +-
feature/src/main/features/oak/oak_base.json | 8 +-
feature/src/main/features/scripting.json | 8 +-
feature/src/main/features/thumbnails.json | 5 +-
pom.xml | 30 +-
rules.xml | 11 +
12 files changed, 407 insertions(+), 398 deletions(-)
diff --git a/feature/pom.xml b/feature/pom.xml
index f35b698..b3051e7 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -11,362 +11,363 @@
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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.apache.sling.cms</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.apache.sling.cms</artifactId>
+ <groupId>org.apache.sling</groupId>
+ <version>1.1.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.sling.cms.feature</artifactId>
+ <name>Apache Sling - CMS Feature Model</name>
+ <properties>
+ <IT.expected.bundles.count>240</IT.expected.bundles.count>
+ <bnd.baseline.skip>true</bnd.baseline.skip>
+ <run.sling.smoke.test>true</run.sling.smoke.test>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>sling/**</include>
+ <include>coverage.ec</include>
+ <include>launcher/**</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.sling</groupId>
- <version>1.1.1-SNAPSHOT</version>
- </parent>
- <artifactId>org.apache.sling.cms.feature</artifactId>
- <name>Apache Sling - CMS Feature Model</name>
- <properties>
- <IT.expected.bundles.count>240</IT.expected.bundles.count>
- <bnd.baseline.skip>true</bnd.baseline.skip>
- <run.sling.smoke.test>true</run.sling.smoke.test>
- </properties>
- <build>
+ <artifactId>slingfeature-maven-plugin</artifactId>
+ <version>1.4.24</version>
+ <extensions>true</extensions>
+ <configuration>
+ <framework>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>6.0.3</version>
+ </framework>
+ <aggregates>
+ <aggregate>
+ <classifier>slingcms-standalone</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>oak/node-store/composite-*.json</filesExclude>
+ <filesExclude>runmodes/author.json</filesExclude>
+ <filesExclude>runmodes/renderer.json</filesExclude>
+ <title>Sling CMS - Standalone</title>
+ </aggregate>
+ <aggregate>
+ <classifier>slingcms-author</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>oak/node-store/composite-*.json</filesExclude>
+ <filesExclude>runmodes/standalone.json</filesExclude>
+ <filesExclude>runmodes/renderer.json</filesExclude>
+ <title>Sling CMS - Author</title>
+ </aggregate>
+ <aggregate>
+ <classifier>slingcms-renderer</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>oak/node-store/composite-*.json</filesExclude>
+ <filesExclude>runmodes/standalone.json</filesExclude>
+ <filesExclude>runmodes/author.json</filesExclude>
+ <title>Sling CMS - Renderer</title>
+ </aggregate>
+ <aggregate>
+ <classifier>slingcms-composite-seed</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>oak/node-store/composite-runtime.json</filesExclude>
+ <filesExclude>oak/node-store/segment.json</filesExclude>
+ <filesExclude>runmodes/*.json</filesExclude>
+ <title>Sling CMS - Composite Node Store Seed</title>
+ </aggregate>
+ <aggregate>
+ <classifier>slingcms-composite-runtime</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>oak/node-store/composite-seed.json</filesExclude>
+ <filesExclude>oak/node-store/segment.json</filesExclude>
+ <filesExclude>runmodes/*.json</filesExclude>
+ <title>Sling CMS - Composite Node Store Runtime</title>
+ </aggregate>
+ <aggregate>
+ <classifier>slingcms-upgrade</classifier>
+ <filesInclude>**/*.json</filesInclude>
+ <filesExclude>framework-properties.json</filesExclude>
+ <filesExclude>oak/node-store/*.json</filesExclude>
+ <filesExclude>runmodes/*.json</filesExclude>
+ <title>Sling CMS - Upgrade</title>
+ </aggregate>
+ </aggregates>
+ <scans>
+ <scan>
+ <includeClassifier>slingcms-composite-runtime</includeClassifier>
+ </scan>
+ <scan>
+ <includeClassifier>slingcms-composite-seed</includeClassifier>
+ </scan>
+ <scan>
+ <includeClassifier>slingcms-standalone</includeClassifier>
+ </scan>
+ <scan>
+ <includeClassifier>slingcms-author</includeClassifier>
+ </scan>
+ <scan>
+ <includeClassifier>slingcms-renderer</includeClassifier>
+ </scan>
+ </scans>
+ <archives>
+ <archive>
+ <classifier>slingcms_standalone_far</classifier>
+ <includeClassifier>slingcms-standalone</includeClassifier>
+ </archive>
+ <archive>
+ <classifier>slingcms_upgrade_far</classifier>
+ <includeClassifier>slingcms-upgrade</includeClassifier>
+ </archive>
+ </archives>
+ </configuration>
+ <executions>
+ <execution>
+ <id>aggregate-features</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>aggregate-features</goal>
+ <goal>analyse-features</goal>
+ <goal>attach-features</goal>
+ <goal>attach-featurearchives</goal>
+ </goals>
+ <configuration>
+ <replacePropertyVariables>asm-version,org-apache-sling-api-version,org-apache-sling-scripting-jsp-taglib-version,cms-version,composum-nodes-version,groovy-version,guava-version,jackrabbit-version,jackson-version,oak-version,slf4j-version,cocoon-serializers-charsets-version,org.apache.felix.webconsole-version,commons-lang3-version,jstl-version,org-apache-sling-models-api-version,org.apache.sling.scripting.jsp.taglib,geronimo-atinject_1-0_spec-version,commons-io-version,tika- [...]
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>org.apache.sling.cms-${project.version}</finalName>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.sling.cms.feature.Main</mainClass>
+ <classpathPrefix>lib/</classpathPrefix>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ <descriptors>
+ <descriptor>src/main/assembly/standalone.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <arguments>-Drun.sling.smoke.test=false</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Extend RAT configuration from parent pom -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <!-- Exclude sling instance -->
+ <exclude>sling/**</exclude>
+ <exclude>launcher/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <profile>
+ <id>run-smoke-test</id>
+ <activation>
+ <property>
+ <name>run.sling.smoke.test</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <include>sling/**</include>
- <include>coverage.ec</include>
- <include>launcher/**</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>slingfeature-maven-plugin</artifactId>
- <version>1.4.24</version>
- <extensions>true</extensions>
- <configuration>
- <framework>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>6.0.3</version>
- </framework>
- <aggregates>
- <aggregate>
- <classifier>slingcms-standalone</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>oak/node-store/composite-*.json</filesExclude>
- <filesExclude>runmodes/author.json</filesExclude>
- <filesExclude>runmodes/renderer.json</filesExclude>
- <title>Sling CMS - Standalone</title>
- </aggregate>
- <aggregate>
- <classifier>slingcms-author</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>oak/node-store/composite-*.json</filesExclude>
- <filesExclude>runmodes/standalone.json</filesExclude>
- <filesExclude>runmodes/renderer.json</filesExclude>
- <title>Sling CMS - Author</title>
- </aggregate>
- <aggregate>
- <classifier>slingcms-renderer</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>oak/node-store/composite-*.json</filesExclude>
- <filesExclude>runmodes/standalone.json</filesExclude>
- <filesExclude>runmodes/author.json</filesExclude>
- <title>Sling CMS - Renderer</title>
- </aggregate>
- <aggregate>
- <classifier>slingcms-composite-seed</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>oak/node-store/composite-runtime.json</filesExclude>
- <filesExclude>oak/node-store/segment.json</filesExclude>
- <filesExclude>runmodes/*.json</filesExclude>
- <title>Sling CMS - Composite Node Store Seed</title>
- </aggregate>
- <aggregate>
- <classifier>slingcms-composite-runtime</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>oak/node-store/composite-seed.json</filesExclude>
- <filesExclude>oak/node-store/segment.json</filesExclude>
- <filesExclude>runmodes/*.json</filesExclude>
- <title>Sling CMS - Composite Node Store Runtime</title>
- </aggregate>
- <aggregate>
- <classifier>slingcms-upgrade</classifier>
- <filesInclude>**/*.json</filesInclude>
- <filesExclude>framework-properties.json</filesExclude>
- <filesExclude>oak/node-store/*.json</filesExclude>
- <filesExclude>runmodes/*.json</filesExclude>
- <title>Sling CMS - Upgrade</title>
- </aggregate>
- </aggregates>
- <scans>
- <scan>
- <includeClassifier>slingcms-composite-runtime</includeClassifier>
- </scan>
- <scan>
- <includeClassifier>slingcms-composite-seed</includeClassifier>
- </scan>
- <scan>
- <includeClassifier>slingcms-standalone</includeClassifier>
- </scan>
- <scan>
- <includeClassifier>slingcms-author</includeClassifier>
- </scan>
- <scan>
- <includeClassifier>slingcms-renderer</includeClassifier>
- </scan>
- </scans>
- <archives>
- <archive>
- <classifier>slingcms_standalone_far</classifier>
- <includeClassifier>slingcms-standalone</includeClassifier>
- </archive>
- <archive>
- <classifier>slingcms_upgrade_far</classifier>
- <includeClassifier>slingcms-upgrade</includeClassifier>
- </archive>
- </archives>
- </configuration>
- <executions>
- <execution>
- <id>aggregate-features</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>aggregate-features</goal>
- <goal>analyse-features</goal>
- <goal>attach-features</goal>
- <goal>attach-featurearchives</goal>
- </goals>
- <configuration>
- <replacePropertyVariables>asm-version,org-apache-sling-api-version,org-apache-sling-scripting-jsp-taglib-version,cms-version,composum-nodes-version,groovy-version,guava-version,jackrabbit-version,jackson-version,oak-version,slf4j-version,cocoon-serializers-charsets-version,org.apache.felix.webconsole-version,commons-lang3-version,jstl-version,org-apache-sling-models-api-version,org.apache.sling.scripting.jsp.taglib,geronimo-atinject_1-0_spec-version,commons-io [...]
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <finalName>org.apache.sling.cms-${project.version}</finalName>
- <archive>
- <manifest>
- <mainClass>org.apache.sling.cms.feature.Main</mainClass>
- <classpathPrefix>lib/</classpathPrefix>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- <descriptors>
- <descriptor>src/main/assembly/standalone.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
+ <!-- reserve a network port for the integration tests -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
<configuration>
- <arguments>-Drun.sling.smoke.test=false</arguments>
+ <portNames>
+ <portName>http.port</portName>
+ </portNames>
</configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- Extend RAT configuration from parent pom -->
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <!-- Exclude sling instance -->
- <exclude>sling/**</exclude>
- <exclude>launcher/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <profiles>
- <profile>
- <id>run-smoke-test</id>
- <activation>
- <property>
- <name>run.sling.smoke.test</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <!-- reserve a network port for the integration tests -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <portNames>
- <portName>http.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>feature-launcher-maven-plugin</artifactId>
- <version>0.1.0</version>
- <configuration>
- <launches>
- <launch>
- <id>sling-cms</id>
- <feature>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <classifier>slingcms-standalone</classifier>
- <type>slingosgifeature</type>
- </feature>
- <launcherArguments>
- <frameworkProperties>
- <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port>
- </frameworkProperties>
- </launcherArguments>
- </launch>
- </launches>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>start</goal>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <systemPropertyVariables>
- <sling.http.port>${http.port}</sling.http.port>
- <IT.expected.bundles.count>${IT.expected.bundles.count}</IT.expected.bundles.count>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
- <version>1.11.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.feature.launcher</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.feature.io</artifactId>
- <version>1.3.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.5.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.cm.json</artifactId>
- <version>1.0.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- <version>1.1.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- <version>1.1.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.converter</artifactId>
- <version>1.0.8</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>1.9</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+ <artifactId>feature-launcher-maven-plugin</artifactId>
+ <version>0.1.0</version>
+ <configuration>
+ <launches>
+ <launch>
+ <id>sling-cms</id>
+ <feature>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <classifier>slingcms-standalone</classifier>
+ <type>slingosgifeature</type>
+ </feature>
+ <launcherArguments>
+ <frameworkProperties>
+ <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port>
+ </frameworkProperties>
+ </launcherArguments>
+ </launch>
+ </launches>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <systemPropertyVariables>
+ <sling.http.port>${http.port}</sling.http.port>
+ <IT.expected.bundles.count>${IT.expected.bundles.count}</IT.expected.bundles.count>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
+ <version>1.11.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.feature.launcher</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.feature.io</artifactId>
+ <version>1.3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.5.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.cm.json</artifactId>
+ <version>1.0.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.json</groupId>
+ <artifactId>javax.json-api</artifactId>
+ <version>1.1.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.json</artifactId>
+ <version>1.1.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.converter</artifactId>
+ <version>1.0.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.function</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
+
diff --git a/feature/src/main/features/base.json b/feature/src/main/features/base.json
index 9d9e69e..452ba00 100644
--- a/feature/src/main/features/base.json
+++ b/feature/src/main/features/base.json
@@ -9,11 +9,11 @@
"start-order":"15"
},
{
- "id":"jakarta.activation:jakarta.activation-api:2.0.1",
+ "id":"jakarta.activation:jakarta.activation-api:2.1.0",
"start-order":"15"
},
{
- "id":"jakarta.mail:jakarta.mail-api:2.0.1",
+ "id":"jakarta.mail:jakarta.mail-api:2.1.0",
"start-order":"20"
},
{
@@ -101,7 +101,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.resourceresolver:1.8.0",
+ "id":"org.apache.sling:org.apache.sling.resourceresolver:1.8.4",
"start-order":"20"
},
{
@@ -153,11 +153,11 @@
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.http.jetty:4.1.14",
+ "id":"org.apache.felix:org.apache.felix.http.jetty:4.2.0",
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.http.servlet-api:1.1.4",
+ "id":"org.apache.felix:org.apache.felix.http.servlet-api:1.2.0",
"start-order":"5"
},
{
@@ -189,7 +189,7 @@
"start-order":"5"
},
{
- "id":"org.apache.sling:org.apache.sling.commons.metrics:1.2.8",
+ "id":"org.apache.sling:org.apache.sling.commons.metrics:1.2.10",
"start-order":"5"
},
{
@@ -221,11 +221,11 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.10",
+ "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.14",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.36",
+ "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.38",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/cms/dependencies.json b/feature/src/main/features/cms/dependencies.json
index 94b29eb..7339721 100644
--- a/feature/src/main/features/cms/dependencies.json
+++ b/feature/src/main/features/cms/dependencies.json
@@ -89,7 +89,7 @@
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.rewriter:1.3.0",
+ "id":"org.apache.sling:org.apache.sling.rewriter:1.3.2",
"start-order":"15"
},
{
@@ -101,7 +101,7 @@
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.security:1.1.22",
+ "id":"org.apache.sling:org.apache.sling.security:1.1.24",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/discovery.json b/feature/src/main/features/discovery.json
index 2a4a0b1..d68bd38 100644
--- a/feature/src/main/features/discovery.json
+++ b/feature/src/main/features/discovery.json
@@ -5,15 +5,15 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.discovery.base:2.0.10",
+ "id":"org.apache.sling:org.apache.sling.discovery.base:2.0.12",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.discovery.commons:1.0.24",
+ "id":"org.apache.sling:org.apache.sling.discovery.commons:1.0.26",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.discovery.oak:1.2.34",
+ "id":"org.apache.sling:org.apache.sling.discovery.oak:1.2.36",
"start-order":"20"
},
{
diff --git a/feature/src/main/features/distribution.json b/feature/src/main/features/distribution.json
index 966d50f..d909b19 100644
--- a/feature/src/main/features/distribution.json
+++ b/feature/src/main/features/distribution.json
@@ -1,11 +1,11 @@
{
"bundles":[
{
- "id":"org.apache.sling:org.apache.sling.distribution.api:0.5.0",
+ "id":"org.apache.sling:org.apache.sling.distribution.api:0.6.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.distribution.core:0.4.8",
+ "id":"org.apache.sling:org.apache.sling.distribution.core:0.5.0",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/event.json b/feature/src/main/features/event.json
index 216140f..d01fa1b 100644
--- a/feature/src/main/features/event.json
+++ b/feature/src/main/features/event.json
@@ -5,7 +5,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.event:4.2.24",
+ "id":"org.apache.sling:org.apache.sling.event:4.3.0",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/healthcheck.json b/feature/src/main/features/healthcheck.json
index 4e0b860..48a460b 100644
--- a/feature/src/main/features/healthcheck.json
+++ b/feature/src/main/features/healthcheck.json
@@ -5,7 +5,7 @@
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.healthcheck.core:2.0.12",
+ "id":"org.apache.felix:org.apache.felix.healthcheck.core:2.0.14",
"start-order":"5"
},
{
diff --git a/feature/src/main/features/oak/oak_base.json b/feature/src/main/features/oak/oak_base.json
index 3e9c340..9e98e25 100644
--- a/feature/src/main/features/oak/oak_base.json
+++ b/feature/src/main/features/oak/oak_base.json
@@ -125,7 +125,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.resource:3.1.0",
+ "id":"org.apache.sling:org.apache.sling.jcr.resource:3.2.0",
"start-order":"20"
},
{
@@ -133,11 +133,11 @@
"start-order":"20"
},
{
- "id":"org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.5.8",
+ "id":"org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.6.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.5.0",
+ "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.5.2",
"start-order":"20"
},
{
@@ -145,7 +145,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.16",
+ "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.18",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/scripting.json b/feature/src/main/features/scripting.json
index ac4a6fb..ff3d75d 100644
--- a/feature/src/main/features/scripting.json
+++ b/feature/src/main/features/scripting.json
@@ -5,7 +5,7 @@
"start-order":"20"
},
{
- "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino:1.7.13_1",
+ "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino:1.7.14_2",
"start-order":"20"
},
{
@@ -17,7 +17,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.core:2.4.2",
+ "id":"org.apache.sling:org.apache.sling.scripting.core:2.4.4",
"start-order":"20"
},
{
@@ -61,7 +61,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.14-1.4.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.16-1.4.0",
"start-order":"20"
},
{
@@ -89,7 +89,7 @@
"start-order":"20"
},
{
- "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl:3.3.0_1",
+ "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl:3.3.2_1",
"start-order":"20"
},
{
diff --git a/feature/src/main/features/thumbnails.json b/feature/src/main/features/thumbnails.json
index f346e4c..f41de8f 100644
--- a/feature/src/main/features/thumbnails.json
+++ b/feature/src/main/features/thumbnails.json
@@ -7,19 +7,16 @@
"id": "org.apache.servicemix.bundles:org.apache.servicemix.bundles.batik:1.14_1",
"start-order": "20"
},
-
{
"id": "org.apache.servicemix.bundles:org.apache.servicemix.bundles.bcel:5.2_4",
"start-order": "20"
},
-
{
"id": "org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan:2.7.2_3",
"start-order": "20"
},
-
{
- "id": "org.apache.servicemix.bundles:org.apache.servicemix.bundles.xerces:2.12.1_1",
+ "id": "org.apache.servicemix.bundles:org.apache.servicemix.bundles.xerces:2.12.2_1",
"start-order": "20"
},
{
diff --git a/pom.xml b/pom.xml
index df1cc49..557fd85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,15 +37,15 @@
<commons-text-version>1.9</commons-text-version>
<composum-nodes-version>2.7.1</composum-nodes-version>
<geronimo-atinject_1-0_spec-version>1.2</geronimo-atinject_1-0_spec-version>
- <groovy-version>3.0.9</groovy-version>
+ <groovy-version>3.0.10</groovy-version>
<httpclient-version>4.5.13</httpclient-version>
- <jackrabbit-version>2.21.9</jackrabbit-version>
- <jackson-version>2.13.1</jackson-version>
+ <jackrabbit-version>2.21.10</jackrabbit-version>
+ <jackson-version>2.13.2</jackson-version>
<javax-annotation-api-version>1.3.2</javax-annotation-api-version>
<jsoup-version>1.14.3</jsoup-version>
<jsp-api-version>2.0</jsp-api-version>
<jstl-version>1.2_1</jstl-version>
- <mockito-core-version>4.2.0</mockito-core-version>
+ <mockito-core-version>4.4.0</mockito-core-version>
<oak-version>1.42.0</oak-version>
<org-apache-sling-api-version>2.24.0</org-apache-sling-api-version>
<org-apache-sling-caconfig-api-version>1.3.0</org-apache-sling-caconfig-api-version>
@@ -57,12 +57,12 @@
<org-apache-sling-scripting-jsp-taglib-version>2.4.0</org-apache-sling-scripting-jsp-taglib-version>
<org-apache-sling-testing-sling-mock-junit4-version>3.2.2</org-apache-sling-testing-sling-mock-junit4-version>
<org.apache.felix.webconsole-version>4.7.2</org.apache.felix.webconsole-version>
- <osgi-annotation-version>8.0.1</osgi-annotation-version>
+ <osgi-annotation-version>8.1.0</osgi-annotation-version>
<guava-version>15.0</guava-version>
<pdfbox-version>2.0.25</pdfbox-version>
<servlet-api-version>2.5</servlet-api-version>
- <slf4j-version>1.7.33</slf4j-version>
- <tika-version>1.28</tika-version>
+ <slf4j-version>1.7.36</slf4j-version>
+ <tika-version>1.28.1</tika-version>
</properties>
<modules>
<module>api</module>
@@ -183,7 +183,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.distribution.api</artifactId>
- <version>0.5.0</version>
+ <version>0.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -213,7 +213,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -225,7 +225,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.rewriter</artifactId>
- <version>1.3.0</version>
+ <version>1.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -262,13 +262,13 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>2.0.1</version>
+ <version>2.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
+ <version>2.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -347,7 +347,7 @@
<dependency>
<groupId>net.coobird</groupId>
<artifactId>thumbnailator</artifactId>
- <version>0.4.16</version>
+ <version>0.4.17</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -359,13 +359,13 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
- <version>5.2.0</version>
+ <version>5.2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
- <version>5.2.0</version>
+ <version>5.2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/rules.xml b/rules.xml
index e7c887c..a20b35f 100644
--- a/rules.xml
+++ b/rules.xml
@@ -10,6 +10,7 @@
<ignoreVersion type="regex">.*-beta.*</ignoreVersion>
<ignoreVersion type="regex">.*-RC.*</ignoreVersion>
<ignoreVersion type="regex">.*b.*</ignoreVersion>
+ <ignoreVersion type="regex">.*test.*</ignoreVersion>
</ignoreVersions>
<rules>
<rule groupId="com.google.guava" artifactId="guava" comparisonMethod="maven">
@@ -45,5 +46,15 @@
<ignoreVersion type="regex">2.*</ignoreVersion>
</ignoreVersions>
</rule>
+ <rule groupId="commons-codec" artifactId="commons-codec" comparisonMethod="maven">
+ <ignoreVersions>
+ <ignoreVersion type="regex">2004.*</ignoreVersion>
+ </ignoreVersions>
+ </rule>
+ <rule groupId="commons-io" artifactId="commons-io" comparisonMethod="maven">
+ <ignoreVersions>
+ <ignoreVersion type="regex">2003.*</ignoreVersion>
+ </ignoreVersions>
+ </rule>
</rules>
</ruleset>
\ No newline at end of file
[sling-org-apache-sling-app-cms] 03/04: SLING-11224 - Fixing content import configuration for root files
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit fa942c40d927163d20601d0545538043609736ae
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Mon Mar 28 08:18:33 2022 -0400
SLING-11224 - Fixing content import configuration for root files
---
reference/bnd.bnd | 2 +-
ui/bnd.bnd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/reference/bnd.bnd b/reference/bnd.bnd
index fb80601..f0ad403 100644
--- a/reference/bnd.bnd
+++ b/reference/bnd.bnd
@@ -1,2 +1,2 @@
-Sling-Initial-Content: jcr_root;ignoreImportProviders:=xml,jcr_root/content/apache;overwrite:=false;uninstall:=false;path:=/content/apache,jcr_root/etc/taxonomy/reference;overwrite:=false;uninstall:=false;path:=/etc/taxonomy/reference,jcr_root;ignoreImportProviders:=xml,jcr_root/apps/reference;overwrite:=true;uninstall:=true;path:=/apps/reference,jcr_root/static/clientlibs/reference;overwrite=true;ignoreImportProviders:=xml;path:=/static/clientlibs/reference,jcr_root/conf/asf;overwrite=t [...]
+Sling-Initial-Content: jcr_root;ignoreImportProviders:=xml,jcr_root/content/apache.json;overwrite:=false;uninstall:=false;path:=/content/apache,jcr_root/etc/taxonomy/reference.json;overwrite:=false;uninstall:=false;path:=/etc/taxonomy/reference,jcr_root;ignoreImportProviders:=xml,jcr_root/apps/reference;overwrite:=true;uninstall:=true;path:=/apps/reference,jcr_root/static/clientlibs/reference;overwrite:=true;ignoreImportProviders:=xml;path:=/static/clientlibs/reference,jcr_root/conf/asf. [...]
Sling-Model-Packages: org.apache.sling.cms.reference.models,org.apache.sling.cms.reference.forms.impl
\ No newline at end of file
diff --git a/ui/bnd.bnd b/ui/bnd.bnd
index ceeb2c7..afd3c18 100644
--- a/ui/bnd.bnd
+++ b/ui/bnd.bnd
@@ -1,3 +1,3 @@
Sling-Nodetypes: SLING-INF/nodetypes/nodetypes.cnd
-Sling-Initial-Content: jcr_root;overwriteProperties:=true;overwrite:=false;ignoreImportProviders:=xml,jcr_root/conf/global;overwrite:=true;ignoreImportProviders:=xml;path:=/conf/global,jcr_root/etc/taxonomy;overwrite:=false;uninstall:=true;path:=/etc/taxonomy,jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index,jcr_root/libs/sling-cms;overwrite:=true;uninstall:=true;path:=/libs/sling-cms,jcr_root/libs/sling/thumbnails;overwrite:=true;uninstall:=true;path:=/libs/sling/th [...]
+Sling-Initial-Content: jcr_root;overwriteProperties:=true;overwrite:=false;ignoreImportProviders:=xml,jcr_root/conf/global.json;overwrite:=true;ignoreImportProviders:=xml;path:=/conf/global,jcr_root/etc/taxonomy;overwrite:=false;uninstall:=true;path:=/etc/taxonomy,jcr_root/oak%3Aindex;overwrite:=false;uninstall:=true;path:=/oak:index,jcr_root/libs/sling-cms;overwrite:=true;uninstall:=true;path:=/libs/sling-cms,jcr_root/libs/sling/thumbnails;overwrite:=true;uninstall:=true;path:=/libs/sli [...]
-includeresource: target/frontend/dist
\ No newline at end of file
[sling-org-apache-sling-app-cms] 02/04: SLING-11223 - Fixes and improvements to queries, property usage and indexes to support larger repositories
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit fd7e0d4cc717703339c31525080c190206a31608
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Mon Mar 28 08:17:47 2022 -0400
SLING-11223 - Fixes and improvements to queries, property usage and indexes to support larger repositories
---
.../DefaultScriptBindingsValueProvider.java | 7 +-
.../core/internal/models/ReferenceOperation.java | 4 +-
.../sling/cms/core/models/QueryDebugger.java | 2 +-
.../apache/sling/cms/core/models/StartContent.java | 53 +++++----
.../DefaultScriptBindingsValueProviderTest.java | 5 -
core/src/test/resources/conf.json | 2 +-
.../apache/sling/cms/reference/models/Search.java | 4 +-
.../components/general/searchform/config.json | 55 ++++++----
.../components/general/searchform/searchform.jsp | 3 +-
.../components/general/sitemap/sitemap.xml.jsp | 2 +-
.../reference/components/general/tags/tags.jsp | 2 +-
.../apps/reference/components/pages/base/body.jsp | 5 +-
.../resources/SLING-INF/nodetypes/nodetypes.cnd | 2 +-
ui/src/main/resources/jcr_root/conf/global.json | 2 +-
.../components/cms/contentgrid/contentgrid.jsp | 21 +++-
.../components/cms/contenttable/contenttable.jsp | 21 +++-
.../resources/jcr_root/oak%3Aindex/ntBase.json | 45 ++++++++
.../jcr_root/oak%3Aindex/ntBaseLucene.json | 40 -------
.../jcr_root/oak%3Aindex/ntHierarchyNode.json | 64 +++++++++++
.../resources/jcr_root/oak%3Aindex/published.json | 9 --
.../jcr_root/oak%3Aindex/slingComponent.json | 29 +++++
.../resources/jcr_root/oak%3Aindex/slingFile.json | 87 +++++++++++++++
.../jcr_root/oak%3Aindex/slingFileLucene.json | 76 -------------
.../resources/jcr_root/oak%3Aindex/slingPage.json | 121 +++++++++++++++++++++
.../jcr_root/oak%3Aindex/slingPageLucene.json | 89 ---------------
.../oak%3Aindex/slingResourceSuperType.json | 12 +-
.../jcr_root/oak%3Aindex/slingTaxonomy.json | 63 +++++------
.../jcr_root/oak%3Aindex/slingTemplate.json | 9 --
28 files changed, 494 insertions(+), 340 deletions(-)
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProvider.java b/core/src/main/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProvider.java
index 69e9a8b..3c0473b 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProvider.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProvider.java
@@ -38,20 +38,17 @@ public class DefaultScriptBindingsValueProvider implements BindingsValuesProvide
@Override
public void addBindings(Bindings bindings) {
Resource resource = (Resource) bindings.get("resource");
- ServletRequest request = (ServletRequest) bindings.get("request");
+
bindings.put("properties", resource.getValueMap());
Optional.ofNullable(resource.adaptTo(ComponentConfiguration.class)).map(ComponentConfiguration::getProperties)
.ifPresent(p -> bindings.put("componentConfiguration", p));
- Optional.ofNullable(resource.getResourceResolver().resolve(resource.getPath()))
- .map(rt -> rt.adaptTo(org.apache.sling.cms.Component.class))
- .ifPresent(c -> bindings.put("component", c));
-
Resource publishableParent = CMSUtils.findPublishableParent(resource);
if (publishableParent != null && CMSConstants.NT_PAGE.equals(publishableParent.getResourceType())) {
Optional.of(publishableParent.adaptTo(Page.class)).ifPresent(p -> {
bindings.put("page", p);
+ ServletRequest request = (ServletRequest) bindings.get("request");
if (request.getAttribute(PN_CURRENT_PAGE) == null) {
request.setAttribute(PN_CURRENT_PAGE, p);
bindings.put(PN_CURRENT_PAGE, p);
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/ReferenceOperation.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/ReferenceOperation.java
index eb8218c..85db8ff 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/ReferenceOperation.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/ReferenceOperation.java
@@ -82,8 +82,8 @@ public abstract class ReferenceOperation {
public void init() {
log.debug("Finding references to {}", resource.getPath());
- String query = "SELECT * FROM [nt:base] AS s WHERE NOT ISDESCENDANTNODE([/jcr:system/jcr:versionStorage]) AND CONTAINS(s.*, '"
- + Text.escapeIllegalXpathSearchChars(resource.getPath()) + "')";
+ String query = "SELECT * FROM [nt:base] AS s WHERE NOT ISDESCENDANTNODE([/jcr:system]) AND CONTAINS(s.*, '\""
+ + Text.escapeIllegalXpathSearchChars(resource.getPath()) + "\"')";
Set<String> paths = new HashSet<>();
Iterator<Resource> resources = resource.getResourceResolver().findResources(query, Query.JCR_SQL2);
diff --git a/core/src/main/java/org/apache/sling/cms/core/models/QueryDebugger.java b/core/src/main/java/org/apache/sling/cms/core/models/QueryDebugger.java
index 0a690a2..6565d51 100644
--- a/core/src/main/java/org/apache/sling/cms/core/models/QueryDebugger.java
+++ b/core/src/main/java/org/apache/sling/cms/core/models/QueryDebugger.java
@@ -87,7 +87,7 @@ public class QueryDebugger {
QueryManager queryManager = request.getResourceResolver().adaptTo(Session.class).getWorkspace()
.getQueryManager();
- Query explainQuery = queryManager.createQuery("explain " + statementParam.get(), language);
+ Query explainQuery = queryManager.createQuery("explain measure " + statementParam.get(), language);
Row row = explainQuery.execute().getRows().nextRow();
lplan = row.getValue("plan").getString();
lstatement = statementParam.get();
diff --git a/core/src/main/java/org/apache/sling/cms/core/models/StartContent.java b/core/src/main/java/org/apache/sling/cms/core/models/StartContent.java
index 073e826..ea5a1b8 100644
--- a/core/src/main/java/org/apache/sling/cms/core/models/StartContent.java
+++ b/core/src/main/java/org/apache/sling/cms/core/models/StartContent.java
@@ -66,49 +66,48 @@ public class StartContent {
}
public List<Resource> getRelatedContent() {
- return Stream.concat(get10Related(resolver, CMSConstants.NT_PAGE, term),
- get10Related(resolver, CMSConstants.NT_FILE, term)).sorted((o1, o2) -> {
- try {
- return (int) ((o1.getScore() - o2.getScore()) * 100);
- } catch (RepositoryException e) {
- log.warn("Exception getting score", e);
- return 0;
- }
- }).limit(9).map(row -> {
- try {
- return resolver.getResource(row.getPath());
- } catch (RepositoryException e) {
- log.warn("Failed to get resource", e);
- return null;
- }
- }).filter(Objects::nonNull).collect(Collectors.toList());
+ return get10Related(resolver, term).sorted((o1, o2) -> {
+ try {
+ return (int) ((o1.getScore() - o2.getScore()) * 100);
+ } catch (RepositoryException e) {
+ log.warn("Exception getting score", e);
+ return 0;
+ }
+ }).limit(9).map(row -> {
+ try {
+ return resolver.getResource(row.getPath());
+ } catch (RepositoryException e) {
+ log.warn("Failed to get resource", e);
+ return null;
+ }
+ }).filter(Objects::nonNull).collect(Collectors.toList());
}
public List<Resource> getRecentContent() {
- return Stream.concat(get10Recent(resolver, CMSConstants.NT_PAGE), get10Recent(resolver, CMSConstants.NT_FILE))
- .sorted((o1,
- o2) -> o1.getValueMap().get("jcr:content/jcr:lastModified", new Date())
- .compareTo(o2.getValueMap().get("jcr:content/jcr:lastModified", new Date())) * -1)
+ return get10Recent(resolver).sorted((o1, o2) -> o1.getValueMap().get("jcr:content/jcr:lastModified", new Date())
+ .compareTo(o2.getValueMap().get("jcr:content/jcr:lastModified", new Date())) * -1)
.limit(10).collect(Collectors.toList());
}
- private Stream<Resource> get10Recent(ResourceResolver resolver, String type) {
+ private Stream<Resource> get10Recent(ResourceResolver resolver) {
Iterator<Resource> it = resolver.findResources(
- "SELECT * FROM [" + type + "] WHERE [jcr:content/jcr:lastModifiedBy] = '" + resolver.getUserID()
- + "' AND ISDESCENDANTNODE([/content]) ORDER BY [jcr:content/jcr:lastModified] DESC",
+ "SELECT * FROM [nt:hierarchyNode] WHERE [jcr:content/jcr:lastModifiedBy] = '" + resolver.getUserID()
+ + "' AND ISDESCENDANTNODE([/content]) ORDER BY [jcr:content/jcr:lastModified] DESC /* slingQueryLimit=10 */",
Query.JCR_SQL2);
return StreamSupport.stream(Spliterators.spliteratorUnknownSize(it, Spliterator.NONNULL), false).limit(10);
}
- private Stream<Row> get10Related(ResourceResolver resolver, String type, String term) {
+ private Stream<Row> get10Related(ResourceResolver resolver, String term) {
Session session = resolver.adaptTo(Session.class);
if (session != null) {
try {
Query query = session.getWorkspace().getQueryManager()
- .createQuery("SELECT * FROM [" + type
- + "] AS s WHERE ISDESCENDANTNODE([/content]) AND CONTAINS(s.*,'"
- + term.replace("'", "''") + "')", Query.JCR_SQL2);
+ .createQuery(
+ "SELECT * FROM [nt:hierarchyNode] AS s WHERE ISDESCENDANTNODE([/content]) AND CONTAINS(s.*,'"
+ + term.replace("'", "''") + "')",
+ Query.JCR_SQL2);
+ query.setLimit(10);
QueryResult result = query.execute();
@SuppressWarnings("unchecked")
Iterable<Row> iterable = () -> {
diff --git a/core/src/test/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProviderTest.java b/core/src/test/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProviderTest.java
index cb32100..f17c3f1 100644
--- a/core/src/test/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProviderTest.java
+++ b/core/src/test/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProviderTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
import javax.script.Bindings;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.cms.Component;
import org.apache.sling.cms.Page;
import org.apache.sling.cms.core.helpers.SlingCMSTestHelper;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
@@ -59,8 +58,6 @@ public class DefaultScriptBindingsValueProviderTest {
assertEquals(bindings.get("currentPage"), bindings.get("page"));
assertNotNull(bindings.get("properties"));
assertTrue(bindings.get("properties") instanceof ValueMap);
- assertNotNull(bindings.get("component"));
- assertTrue(bindings.get("component") instanceof Component);
assertNotNull(bindings.get("componentConfiguration"));
assertTrue(bindings.get("componentConfiguration") instanceof ValueMap);
@@ -82,8 +79,6 @@ public class DefaultScriptBindingsValueProviderTest {
assertNull(bindings.get("currentPage"));
assertNotNull(bindings.get("properties"));
assertTrue(bindings.get("properties") instanceof ValueMap);
- assertNotNull(bindings.get("component"));
- assertTrue(bindings.get("component") instanceof Component);
assertNotNull(bindings.get("componentConfiguration"));
assertTrue(bindings.get("componentConfiguration") instanceof ValueMap);
diff --git a/core/src/test/resources/conf.json b/core/src/test/resources/conf.json
index 3283cb6..f545ba2 100644
--- a/core/src/test/resources/conf.json
+++ b/core/src/test/resources/conf.json
@@ -83,7 +83,7 @@
},
"published": {
"jcr:primaryType": "nt:unstructured",
- "name": "jcr:content/published",
+ "name": "jcr:content/sling:published",
"label": "Published",
"sling:resourceType": "sling-cms/components/editor/fields/publication"
},
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/models/Search.java b/reference/src/main/java/org/apache/sling/cms/reference/models/Search.java
index b43e0e5..6fd1bdf 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/models/Search.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/models/Search.java
@@ -77,8 +77,8 @@ public class Search {
resolver = searchService.getResourceResolver(request);
- String query = "SELECT * FROM [sling:Page] AS p WHERE ([jcr:content/published]=true OR [jcr:content/sling:published]=true) AND (p.[jcr:content/hideInSitemap] IS NULL OR p.[jcr:content/hideInSitemap] <> true) AND ISDESCENDANTNODE(p, '"
- + basePath + "') AND CONTAINS(p.*, '" + term + "') ORDER BY [jcr:score]";
+ String query = "SELECT * FROM [sling:Page] AS p WHERE [jcr:content/sling:published]=true AND p.[jcr:content/hideInSitemap] <> true AND ISDESCENDANTNODE(p, '"
+ + basePath + "') AND CONTAINS(p.*, '" + term + "')";
log.debug("Searching for pages with {} under {} with query: {}", term, basePath, query);
Iterator<Resource> res = resolver.findResources(query, Query.JCR_SQL2);
while (res.hasNext()) {
diff --git a/reference/src/main/resources/jcr_root/apps/reference/components/general/searchform/config.json b/reference/src/main/resources/jcr_root/apps/reference/components/general/searchform/config.json
index f223e16..34f145f 100644
--- a/reference/src/main/resources/jcr_root/apps/reference/components/general/searchform/config.json
+++ b/reference/src/main/resources/jcr_root/apps/reference/components/general/searchform/config.json
@@ -1,25 +1,32 @@
- {
+{
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/general/container",
+ "formClass": {
"jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/general/container",
- "formClass": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/editor/fields/text",
- "label": "Form Class",
- "name": "formClass",
- "type": "text"
- },
- "buttonClass": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/editor/fields/text",
- "label": "Button Class",
- "name": "buttonClass",
- "type": "text"
- },
- "inputClass": {
- "jcr:primaryType": "nt:unstructured",
- "sling:resourceType": "sling-cms/components/editor/fields/text",
- "label": "Input Class",
- "name": "inputClass",
- "type": "text"
- }
-}
\ No newline at end of file
+ "sling:resourceType": "sling-cms/components/editor/fields/text",
+ "label": "Form Class",
+ "name": "formClass",
+ "type": "text"
+ },
+ "buttonClass": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/editor/fields/text",
+ "label": "Button Class",
+ "name": "buttonClass",
+ "type": "text"
+ },
+ "inputClass": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/editor/fields/text",
+ "label": "Input Class",
+ "name": "inputClass",
+ "type": "text"
+ },
+ "searchPage": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "sling-cms/components/editor/fields/path",
+ "label": "Search Page",
+ "name": "searchPage",
+ "type": "page"
+ }
+}
diff --git a/reference/src/main/resources/jcr_root/apps/reference/components/general/searchform/searchform.jsp b/reference/src/main/resources/jcr_root/apps/reference/components/general/searchform/searchform.jsp
index 0838457..2722d6b 100644
--- a/reference/src/main/resources/jcr_root/apps/reference/components/general/searchform/searchform.jsp
+++ b/reference/src/main/resources/jcr_root/apps/reference/components/general/searchform/searchform.jsp
@@ -17,9 +17,8 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<sling:adaptTo var="pageMgr" adaptable="${resource}" adaptTo="org.apache.sling.cms.PageManager" />
<c:set var="searchConfig" value="${sling:adaptTo(resource,'org.apache.sling.cms.ComponentConfiguration').properties}" scope="request" />
-<form action="${pageMgr.page.path}.html" method="GET" class="${sling:encode(searchConfig.formClass,'HTML_ATTR')}">
+<form action="${searchConfig.searchPage}.html" method="GET" class="${sling:encode(searchConfig.formClass,'HTML_ATTR')}">
<fmt:message key="Search" var="searchMessage" />
<input type="text" name="q" class="${sling:encode(searchConfig.inputClass,'HTML_ATTR')}" placeholder="${sling:encode(searchMessage,'HTML_ATTR')}" />
<input type="submit" class="${searchConfig.buttonClass}" value="${sling:encode(searchMessage,'HTML_ATTR')}" />
diff --git a/reference/src/main/resources/jcr_root/apps/reference/components/general/sitemap/sitemap.xml.jsp b/reference/src/main/resources/jcr_root/apps/reference/components/general/sitemap/sitemap.xml.jsp
index 0f41687..060059c 100644
--- a/reference/src/main/resources/jcr_root/apps/reference/components/general/sitemap/sitemap.xml.jsp
+++ b/reference/src/main/resources/jcr_root/apps/reference/components/general/sitemap/sitemap.xml.jsp
@@ -20,7 +20,7 @@
<%@include file="/libs/sling-cms/global.jsp"%>
<c:set var="site" value="${sling:adaptTo(resource,'org.apache.sling.cms.SiteManager').site}" />
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
- <c:set var="query" value="SELECT * FROM [sling:Page] WHERE ISDESCENDANTNODE([${site.path}]) AND ([jcr:content/published]=true OR [jcr:content/sling:published]=true) AND ([jcr:content/hideInSitemap] IS NULL OR [jcr:content/hideInSitemap] <> true)" />
+ <c:set var="query" value="SELECT * FROM [sling:Page] WHERE ISDESCENDANTNODE([${site.path}]) AND [jcr:content/sling:published]=true AND [jcr:content/hideInSitemap] <> true" />
<c:forEach var="pageRsrc" items="${sling:findResources(resourceResolver,query,'JCR-SQL2')}">
<c:set var="page" value="${sling:adaptTo(pageRsrc,'org.apache.sling.cms.PageManager').page}" />
<url>
diff --git a/reference/src/main/resources/jcr_root/apps/reference/components/general/tags/tags.jsp b/reference/src/main/resources/jcr_root/apps/reference/components/general/tags/tags.jsp
index f667e48..f5081d9 100644
--- a/reference/src/main/resources/jcr_root/apps/reference/components/general/tags/tags.jsp
+++ b/reference/src/main/resources/jcr_root/apps/reference/components/general/tags/tags.jsp
@@ -27,7 +27,7 @@
<c:forEach var="tagPath" items="${contentResource.valueMap['sling:taxonomy']}">
<c:set var="tag" value="${sling:getResource(resourceResolver,tagPath)}" />
<${itemTag} class="${config.itemClass}">
- <a href="${config.tagPage}.html${tag.path}.html">
+ <a href="${config.tagPage}.html${tag.path}">
<sling:encode value="${tag.valueMap['jcr:title']}" default="${tag.name}" mode="HTML" />
</a>
</${itemTag}>
diff --git a/reference/src/main/resources/jcr_root/apps/reference/components/pages/base/body.jsp b/reference/src/main/resources/jcr_root/apps/reference/components/pages/base/body.jsp
index 640cf7c..2999798 100644
--- a/reference/src/main/resources/jcr_root/apps/reference/components/pages/base/body.jsp
+++ b/reference/src/main/resources/jcr_root/apps/reference/components/pages/base/body.jsp
@@ -17,6 +17,9 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
+
+ <h1>site=${sling:adaptTo(resource,'org.apache.sling.cms.SiteManager').site}</h1>
+ <c:set var="site" value="${sling:adaptTo(resource,'org.apache.sling.cms.SiteManager').site}" />
<body>
<sling:call script="/libs/sling-cms/components/editor/scripts/init.jsp" />
<div class="title">
@@ -32,7 +35,7 @@
</div>
</div>
<div class="menu">
- <sling:include path="/content/apache/sling-apache-org/index/jcr:content/menu" resourceType="sling-cms/components/general/container" />
+ <sling:include path="${site.path}/index/jcr:content/menu" resourceType="sling-cms/components/general/container" />
<a href="http://apache.org/foundation/contributing.html">
<img border="0" alt="Support the Apache Software Foundation!" src="/static/clientlibs/reference/img/SupportApache-small.png" width="115px">
</a>
diff --git a/ui/src/main/resources/SLING-INF/nodetypes/nodetypes.cnd b/ui/src/main/resources/SLING-INF/nodetypes/nodetypes.cnd
index 43edb8f..bb73ec7 100644
--- a/ui/src/main/resources/SLING-INF/nodetypes/nodetypes.cnd
+++ b/ui/src/main/resources/SLING-INF/nodetypes/nodetypes.cnd
@@ -44,7 +44,7 @@
- * (UNDEFINED) multiple
- * (UNDEFINED)
-[sling:File] > nt:file, mix:publishable
+[sling:File] > nt:file
- * (undefined) copy
+ jcr:content (sling:FileContent) = sling:FileContent copy primary autocreated
diff --git a/ui/src/main/resources/jcr_root/conf/global.json b/ui/src/main/resources/jcr_root/conf/global.json
index a7aef8c..e05bf9c 100644
--- a/ui/src/main/resources/jcr_root/conf/global.json
+++ b/ui/src/main/resources/jcr_root/conf/global.json
@@ -58,7 +58,7 @@
},
"published": {
"jcr:primaryType": "nt:unstructured",
- "name": "jcr:content/published",
+ "name": "jcr:content/sling:published",
"label": "Published",
"sling:resourceType": "sling-cms/components/editor/fields/publication"
},
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
index e5cdcb4..ef94870 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentgrid/contentgrid.jsp
@@ -16,10 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/ --%>
- <%@include file="/libs/sling-cms/global.jsp"%>
+<%@include file="/libs/sling-cms/global.jsp"%>
+<c:choose>
+ <c:when test="${not empty param.page}">
+ <c:set var="paginationPage" value="${param.page}" />
+ </c:when>
+ <c:otherwise>
+ <c:set var="paginationPage" value="0" />
+ </c:otherwise>
+</c:choose>
+<c:set var="PAGE_SIZE" value="${60}" />
<div class="reload-container scroll-container contentnav" data-path="${resource.path}.grid.html${sling:encode(slingRequest.requestPathInfo.suffix,'HTML_ATTR')}">
<div class="columns is-multiline">
- <c:forEach var="child" items="${sling:listChildren(slingRequest.requestPathInfo.suffixResource)}" varStatus="status">
+ <c:forEach var="child" items="${sling:listChildren(slingRequest.requestPathInfo.suffixResource)}" varStatus="status" begin="${paginationPage * PAGE_SIZE}" end="${(paginationPage * PAGE_SIZE + PAGE_SIZE) - 1}">
<c:set var="showCard" value="${false}" />
<c:forEach var="type" items="${sling:listChildren(sling:getRelativeResource(resource,'types'))}">
<c:if test="${child.valueMap['jcr:primaryType'] == type.name}">
@@ -124,4 +133,12 @@
</c:if>
</c:forEach>
</div>
+ <nav class="pagination" role="navigation" aria-label="pagination">
+ <c:if test="${paginationPage != 0}">
+ <a class="pagination-previous" href="?page=${paginationPage - 1}"><fmt:message key="Previous" /></a>
+ </c:if>
+ <c:if test="${paginationPage * PAGE_SIZE + PAGE_SIZE < fn:length(sling:listChildren(slingRequest.requestPathInfo.suffixResource))}">
+ <a class="pagination-next" href="?page=${paginationPage + 1}"><fmt:message key="Next" /></a>
+ </c:if>
+ </nav>
</div>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
index 19b4b8e..02b1147 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
@@ -17,6 +17,15 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
+<c:choose>
+ <c:when test="${not empty param.page}">
+ <c:set var="paginationPage" value="${param.page}" />
+ </c:when>
+ <c:otherwise>
+ <c:set var="paginationPage" value="0" />
+ </c:otherwise>
+</c:choose>
+<c:set var="PAGE_SIZE" value="${60}" />
<div class="reload-container table__wrapper scroll-container contentnav" data-path="${resource.path}.table.html${sling:encode(slingRequest.requestPathInfo.suffix,'HTML_ATTR')}">
<table class="table is-fullwidth is-striped sortable">
<thead>
@@ -34,8 +43,8 @@
</thead>
<tbody>
<c:set var="parentPath" value="${slingRequest.requestPathInfo.suffix}${not empty properties.appendSuffix ? properties.appendSuffix : ''}" />
- <c:set var="count" value="1" />
- <c:forEach var="child" items="${sling:listChildren(sling:getResource(resourceResolver, parentPath))}" varStatus="status">
+ <c:set var="count" value="${paginationPage * PAGE_SIZE + 1}" />
+ <c:forEach var="child" items="${sling:listChildren(sling:getResource(resourceResolver, parentPath))}" varStatus="status" begin="${paginationPage * PAGE_SIZE}" end="${(paginationPage * PAGE_SIZE + PAGE_SIZE) - 1}">
<c:set var="type" value="${not empty child.valueMap['jcr:primaryType'] ? child.valueMap['jcr:primaryType'] : fn:replace(child.resourceType,'/','-')}" />
<sling:getResource var="typeConfig" base="${resource}" path="types/${type}" />
<c:if test="${typeConfig != null && !fn:contains(child.name,':')}">
@@ -56,4 +65,12 @@
</c:forEach>
</tbody>
</table>
+ <nav class="pagination" role="navigation" aria-label="pagination">
+ <c:if test="${paginationPage != 0}">
+ <a class="pagination-previous" href="?page=${paginationPage - 1}"><fmt:message key="Previous" /></a>
+ </c:if>
+ <c:if test="${paginationPage * PAGE_SIZE + PAGE_SIZE < fn:length(sling:listChildren(slingRequest.requestPathInfo.suffixResource))}">
+ <a class="pagination-next" href="?page=${paginationPage + 1}"><fmt:message key="Next" /></a>
+ </c:if>
+ </nav>
</div>
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/ntBase.json b/ui/src/main/resources/jcr_root/oak%3Aindex/ntBase.json
new file mode 100644
index 0000000..3a50e6a
--- /dev/null
+++ b/ui/src/main/resources/jcr_root/oak%3Aindex/ntBase.json
@@ -0,0 +1,45 @@
+{
+ "jcr:primaryType": "oak:QueryIndexDefinition",
+ "compatVersion": 2,
+ "type": "lucene",
+ "async": ["async", "nrt"],
+ "evaluatePathRestrictions": false,
+ "excludedPaths": ["/jcr:system"],
+ "indexRules": {
+ "jcr:primaryType": "nt:unstructured",
+ "nt:base": {
+ "jcr:primaryType": "nt:unstructured",
+ "properties": {
+ "jcr:primaryType": "nt:unstructured",
+ "slingTaxonomy": {
+ "jcr:primaryType": "nt:unstructured",
+ "ordered": false,
+ "propertyIndex": true,
+ "name": "sling:taxonomy",
+ "type": "String"
+ },
+ "slingResourceType": {
+ "jcr:primaryType": "nt:unstructured",
+ "ordered": false,
+ "propertyIndex": true,
+ "name": "sling:resourceType",
+ "type": "String"
+ },
+ "slingPublished": {
+ "jcr:primaryType": "nt:unstructured",
+ "ordered": false,
+ "propertyIndex": true,
+ "name": "sling:published",
+ "type": "Boolean"
+ },
+ "slingVanityPath": {
+ "jcr:primaryType": "nt:unstructured",
+ "notNullCheckEnabled": true,
+ "propertyIndex": true,
+ "name": "sling:vanityPath",
+ "type": "String"
+ }
+ }
+ }
+ }
+}
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/ntBaseLucene.json b/ui/src/main/resources/jcr_root/oak%3Aindex/ntBaseLucene.json
deleted file mode 100644
index 2a8ba54..0000000
--- a/ui/src/main/resources/jcr_root/oak%3Aindex/ntBaseLucene.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "jcr:primaryType": "oak:QueryIndexDefinition",
- "compatVersion": 2,
- "indexPath": "/oak:index/ntBaseLucene",
- "name": "ntBaseLucene",
- "type": "lucene",
- "async": [
- "async",
- "nrt"
- ],
- "evaluatePathRestrictions": false,
- "excludedPaths": [
- "/jcr:system"
- ],
- "reindex": false,
- "reindexCount": 1,
- "indexRules": {
- "jcr:primaryType": "nt:unstructured",
- "nt:base": {
- "jcr:primaryType": "nt:unstructured",
- "properties": {
- "jcr:primaryType": "nt:unstructured",
- "slingTaxonomy": {
- "jcr:primaryType": "nt:unstructured",
- "ordered": false,
- "propertyIndex": true,
- "name": "sling:taxonomy",
- "type": "String"
- },
- "slingResource": {
- "jcr:primaryType": "nt:unstructured",
- "ordered": false,
- "propertyIndex": true,
- "name": "sling:resource",
- "type": "String"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/ntHierarchyNode.json b/ui/src/main/resources/jcr_root/oak%3Aindex/ntHierarchyNode.json
new file mode 100644
index 0000000..7f85e66
--- /dev/null
+++ b/ui/src/main/resources/jcr_root/oak%3Aindex/ntHierarchyNode.json
@@ -0,0 +1,64 @@
+{
+ "jcr:primaryType": "oak:QueryIndexDefinition",
+ "compatVersion": 2,
+ "type": "lucene",
+ "async": ["async", "nrt"],
+ "evaluatePathRestrictions": true,
+ "includedPaths": ["/content", "/static"],
+ "queryPaths": ["/content", "/static"],
+ "indexRules": {
+ "jcr:primaryType": "nt:unstructured",
+ "nt:hierarchyNode": {
+ "jcr:primaryType": "nt:unstructured",
+ "properties": {
+ "jcr:primaryType": "nt:unstructured",
+ "jcrLastModified": {
+ "jcr:primaryType": "nt:unstructured",
+ "ordered": true,
+ "propertyIndex": true,
+ "name": "jcr:content/jcr:lastModified",
+ "type": "Date"
+ },
+ "jcrLastModifiedBy": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "name": "jcr:content/jcr:lastModifiedBy",
+ "type": "String"
+ },
+ "jcrTitle": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "propertyIndex": true,
+ "analyzed": true,
+ "name": "jcr:content/jcr:title",
+ "boost": 2
+ },
+ "nodeName": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "propertyIndex": true,
+ "name": ":nodeName",
+ "type": "String"
+ },
+ "slingTaxonomy": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "name": "jcr:content/sling:taxonomy",
+ "type": "String"
+ },
+ "slingResourceType": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "name": "jcr:content/sling:resourceType",
+ "type": "String"
+ },
+ "slingPublished": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "name": "sling:published",
+ "type": "Boolean"
+ }
+ }
+ }
+ }
+}
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/published.json b/ui/src/main/resources/jcr_root/oak%3Aindex/published.json
deleted file mode 100644
index 1c6ef51..0000000
--- a/ui/src/main/resources/jcr_root/oak%3Aindex/published.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "jcr:primaryType": "oak:QueryIndexDefinition",
- "jcr:name:propertyNames": [
- "published"
- ],
- "type": "property",
- "reindex": false,
- "reindexCount": 1
-}
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/slingComponent.json b/ui/src/main/resources/jcr_root/oak%3Aindex/slingComponent.json
new file mode 100644
index 0000000..cdc9612
--- /dev/null
+++ b/ui/src/main/resources/jcr_root/oak%3Aindex/slingComponent.json
@@ -0,0 +1,29 @@
+{
+ "jcr:primaryType": "oak:QueryIndexDefinition",
+ "compatVersion": 2,
+ "type": "lucene",
+ "async": ["async", "nrt"],
+ "includedPaths": ["/apps", "/libs"],
+ "evaluatePathRestrictions": true,
+ "indexRules": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:Component": {
+ "jcr:primaryType": "nt:unstructured",
+ "properties": {
+ "jcr:primaryType": "nt:unstructured",
+ "componentType": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "notNullCheckEnabled": true,
+ "name": "componentType"
+ },
+ "jcrTitle": {
+ "jcr:primaryType": "nt:unstructured",
+ "ordered": true,
+ "propertyIndex": true,
+ "name": "jcr:title"
+ }
+ }
+ }
+ }
+}
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/slingFile.json b/ui/src/main/resources/jcr_root/oak%3Aindex/slingFile.json
new file mode 100644
index 0000000..cc22106
--- /dev/null
+++ b/ui/src/main/resources/jcr_root/oak%3Aindex/slingFile.json
@@ -0,0 +1,87 @@
+{
+ "jcr:primaryType": "oak:QueryIndexDefinition",
+ "compatVersion": 2,
+ "type": "lucene",
+ "async": ["async", "nrt"],
+ "includedPaths": ["/content", "/static"],
+ "evaluatePathRestrictions": true,
+ "aggregates": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:File": {
+ "jcr:primaryType": "nt:unstructured",
+ "include0": {
+ "jcr:primaryType": "nt:unstructured",
+ "path": "jcr:content"
+ },
+ "include1": {
+ "jcr:primaryType": "nt:unstructured",
+ "path": "jcr:content/metadata"
+ }
+ }
+ },
+ "indexRules": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:File": {
+ "jcr:primaryType": "nt:unstructured",
+ "properties": {
+ "jcr:primaryType": "nt:unstructured",
+ "jcrDescription": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "useInSuggest": true,
+ "propertyIndex": true,
+ "useInSpellcheck": true,
+ "analyzed": true,
+ "name": "jcr:content/jcr:description"
+ },
+ "jcrLastModified": {
+ "jcr:primaryType": "nt:unstructured",
+ "ordered": true,
+ "propertyIndex": true,
+ "name": "jcr:content/jcr:lastModified",
+ "type": "Date"
+ },
+ "jcrLastModifiedBy": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "name": "jcr:content/jcr:lastModifiedBy",
+ "type": "String"
+ },
+ "jcrTitle": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "useInSuggest": true,
+ "propertyIndex": true,
+ "useInSpellcheck": true,
+ "analyzed": true,
+ "name": "jcr:content/jcr:title",
+ "boost": 2
+ },
+ "nodeName": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "useInSuggest": true,
+ "propertyIndex": true,
+ "useInSpellcheck": true,
+ "name": ":nodeName",
+ "type": "String"
+ },
+ "slingPublished": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "name": "jcr:content/sling:published",
+ "type": "Boolean"
+ },
+ "slingTaxonomy": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "useInSuggest": true,
+ "propertyIndex": true,
+ "useInSpellcheck": true,
+ "analyzed": true,
+ "name": "jcr:content/sling:taxonomy"
+ }
+ }
+ }
+ }
+}
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/slingFileLucene.json b/ui/src/main/resources/jcr_root/oak%3Aindex/slingFileLucene.json
deleted file mode 100644
index 92861df..0000000
--- a/ui/src/main/resources/jcr_root/oak%3Aindex/slingFileLucene.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "jcr:primaryType": "oak:QueryIndexDefinition",
- "compatVersion": 2,
- "indexPath": "/oak:index/slingFileLucene",
- "name": "slingFileLucene",
- "type": "lucene",
- "async": [
- "async",
- "nrt"
- ],
- "evaluatePathRestrictions": true,
- "excludedPaths": [
- "/var",
- "/jcr:system"
- ],
- "aggregates": {
- "jcr:primaryType": "nt:unstructured",
- "sling:File": {
- "jcr:primaryType": "nt:unstructured",
- "include0": {
- "jcr:primaryType": "nt:unstructured",
- "path": "jcr:content"
- },
- "include1": {
- "jcr:primaryType": "nt:unstructured",
- "path": "jcr:content/metadata"
- }
- }
- },
- "indexRules": {
- "jcr:primaryType": "nt:unstructured",
- "sling:File": {
- "jcr:primaryType": "nt:unstructured",
- "properties": {
- "jcr:primaryType": "nt:unstructured",
- "slingTaxonomy": {
- "jcr:primaryType": "nt:unstructured",
- "nodeScopeIndex": true,
- "useInSuggest": true,
- "propertyIndex": true,
- "useInSpellcheck": true,
- "analyzed": true,
- "name": "jcr:content/sling:taxonomy"
- },
- "jcrTitle": {
- "jcr:primaryType": "nt:unstructured",
- "nodeScopeIndex": true,
- "useInSuggest": true,
- "propertyIndex": true,
- "useInSpellcheck": true,
- "analyzed": true,
- "name": "jcr:content/jcr:title",
- "boost": 2
- },
- "jcrDescription": {
- "jcr:primaryType": "nt:unstructured",
- "nodeScopeIndex": true,
- "useInSuggest": true,
- "propertyIndex": true,
- "useInSpellcheck": true,
- "analyzed": true,
- "name": "jcr:content/jcr:description"
- },
- "nodeName": {
- "jcr:primaryType": "nt:unstructured",
- "nodeScopeIndex": true,
- "useInSuggest": true,
- "propertyIndex": true,
- "useInSpellcheck": true,
- "name": ":nodeName",
- "type": "String"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/slingPage.json b/ui/src/main/resources/jcr_root/oak%3Aindex/slingPage.json
new file mode 100644
index 0000000..0db9497
--- /dev/null
+++ b/ui/src/main/resources/jcr_root/oak%3Aindex/slingPage.json
@@ -0,0 +1,121 @@
+{
+ "jcr:primaryType": "oak:QueryIndexDefinition",
+ "compatVersion": 2,
+ "type": "lucene",
+ "async": ["async", "nrt"],
+ "evaluatePathRestrictions": true,
+ "includedPaths": ["/content", "/static"],
+ "aggregates": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:Page": {
+ "jcr:primaryType": "nt:unstructured",
+ "include0": {
+ "jcr:primaryType": "nt:unstructured",
+ "relativeNode": true,
+ "path": "jcr:content"
+ }
+ },
+ "nt:file": {
+ "jcr:primaryType": "nt:unstructured",
+ "include0": {
+ "jcr:primaryType": "nt:unstructured",
+ "path": "jcr:content"
+ }
+ },
+ "nt:unstructured": {
+ "jcr:primaryType": "nt:unstructured",
+ "include0": {
+ "jcr:primaryType": "nt:unstructured",
+ "path": "*"
+ },
+ "include1": {
+ "jcr:primaryType": "nt:unstructured",
+ "path": "*/*"
+ },
+ "include2": {
+ "jcr:primaryType": "nt:unstructured",
+ "path": "*/*/*"
+ },
+ "include3": {
+ "jcr:primaryType": "nt:unstructured",
+ "path": "*/*/*/*"
+ },
+ "include4": {
+ "jcr:primaryType": "nt:unstructured",
+ "path": "*/*/*/*/*"
+ }
+ }
+ },
+ "indexRules": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:Page": {
+ "jcr:primaryType": "nt:unstructured",
+ "properties": {
+ "jcr:primaryType": "nt:unstructured",
+ "jcrDescription": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "useInSuggest": true,
+ "propertyIndex": true,
+ "useInSpellcheck": true,
+ "analyzed": true,
+ "name": "jcr:content/jcr:description"
+ },
+ "jcrTitle": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "useInSuggest": true,
+ "propertyIndex": true,
+ "useInSpellcheck": true,
+ "analyzed": true,
+ "name": "jcr:content/jcr:title",
+ "type": "String",
+ "boost": 2
+ },
+ "nodeName": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "useInSuggest": true,
+ "propertyIndex": true,
+ "useInSpellcheck": true,
+ "name": ":nodeName",
+ "type": "String"
+ },
+ "jcrLastModified": {
+ "jcr:primaryType": "nt:unstructured",
+ "ordered": true,
+ "propertyIndex": true,
+ "name": "jcr:content/jcr:lastModified",
+ "type": "Date"
+ },
+ "jcrLastModifiedBy": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "name": "jcr:content/jcr:lastModifiedBy",
+ "type": "String"
+ },
+ "slingPublished": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "name": "jcr:content/sling:published",
+ "type": "Boolean"
+ },
+ "slingTaxonomy": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "useInSuggest": true,
+ "propertyIndex": true,
+ "useInSpellcheck": true,
+ "analyzed": true,
+ "name": "jcr:content/sling:taxonomy"
+ },
+ "slingTemplate": {
+ "jcr:primaryType": "nt:unstructured",
+ "propertyIndex": true,
+ "name": "jcr:content/sling:template",
+ "type": "String"
+ }
+ }
+ }
+ }
+}
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json b/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json
deleted file mode 100644
index 3f5f4d2..0000000
--- a/ui/src/main/resources/jcr_root/oak%3Aindex/slingPageLucene.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
- "jcr:primaryType": "oak:QueryIndexDefinition",
- "compatVersion": 2,
- "indexPath": "/oak:index/slingPageLucene",
- "name": "slingPageLucene",
- "type": "lucene",
- "async": [
- "async",
- "nrt"
- ],
- "evaluatePathRestrictions": true,
- "excludedPaths": [
- "/var",
- "/jcr:system"
- ],
- "aggregates": {
- "jcr:primaryType": "nt:unstructured",
- "sling:Page": {
- "jcr:primaryType": "nt:unstructured",
- "include0": {
- "jcr:primaryType": "nt:unstructured",
- "relativeNode": true,
- "path": "jcr:content"
- }
- },
- "nt:file": {
- "jcr:primaryType": "nt:unstructured",
- "include0": {
- "jcr:primaryType": "nt:unstructured",
- "path": "jcr:content"
- }
- },
- "nt:unstructured": {
- "jcr:primaryType": "nt:unstructured",
- "include0": {
- "jcr:primaryType": "nt:unstructured",
- "path": "*"
- },
- "include1": {
- "jcr:primaryType": "nt:unstructured",
- "path": "*/*"
- },
- "include2": {
- "jcr:primaryType": "nt:unstructured",
- "path": "*/*/*"
- },
- "include3": {
- "jcr:primaryType": "nt:unstructured",
- "path": "*/*/*/*"
- },
- "include4": {
- "jcr:primaryType": "nt:unstructured",
- "path": "*/*/*/*/*"
- }
- }
- },
- "indexRules": {
- "jcr:primaryType": "nt:unstructured",
- "sling:Page": {
- "jcr:primaryType": "nt:unstructured",
- "properties": {
- "jcr:primaryType": "nt:unstructured",
- "slingLastModified": {
- "jcr:primaryType": "nt:unstructured",
- "ordered": true,
- "propertyIndex": true,
- "name": "jcr:content/sling:lastModified",
- "type": "Date"
- },
- "slingLastModifiedBy": {
- "jcr:primaryType": "nt:unstructured",
- "propertyIndex": true,
- "name": "jcr:content/sling:lastModifiedBy",
- "type": "String"
- },
- "jcrTitle": {
- "jcr:primaryType": "nt:unstructured",
- "nodeScopeIndex": true,
- "useInSuggest": true,
- "propertyIndex": true,
- "useInSpellcheck": true,
- "analyzed": true,
- "name": "jcr:content/jcr:title",
- "type": "String"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/slingResourceSuperType.json b/ui/src/main/resources/jcr_root/oak%3Aindex/slingResourceSuperType.json
index 7e6ae94..8eb9b0f 100644
--- a/ui/src/main/resources/jcr_root/oak%3Aindex/slingResourceSuperType.json
+++ b/ui/src/main/resources/jcr_root/oak%3Aindex/slingResourceSuperType.json
@@ -1,9 +1,5 @@
{
- "jcr:primaryType": "oak:QueryIndexDefinition",
- "jcr:name:propertyNames": [
- "sling:resourceSuperType"
- ],
- "type": "property",
- "reindex": false,
- "reindexCount": 1
-}
\ No newline at end of file
+ "jcr:primaryType": "oak:QueryIndexDefinition",
+ "jcr:name:propertyNames": ["sling:resourceSuperType"],
+ "type": "property"
+}
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/slingTaxonomy.json b/ui/src/main/resources/jcr_root/oak%3Aindex/slingTaxonomy.json
index fbae8a3..7147f6b 100644
--- a/ui/src/main/resources/jcr_root/oak%3Aindex/slingTaxonomy.json
+++ b/ui/src/main/resources/jcr_root/oak%3Aindex/slingTaxonomy.json
@@ -1,35 +1,36 @@
{
- "jcr:primaryType": "oak:QueryIndexDefinition",
- "compatVersion": 2,
- "indexPath": "/oak:index/slingTaxonomy",
- "name": "slingTaxonomy",
- "type": "lucene",
- "async": [
- "async",
- "nrt"
- ],
- "evaluatePathRestrictions": true,
- "excludedPaths": [
- "/var",
- "/jcr:system"
- ],
- "indexRules": {
+ "jcr:primaryType": "oak:QueryIndexDefinition",
+ "compatVersion": 2,
+ "type": "lucene",
+ "includedPaths": ["/etc/taxonomy"],
+ "async": ["async", "nrt"],
+ "evaluatePathRestrictions": true,
+ "indexRules": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:Taxonomy": {
+ "jcr:primaryType": "nt:unstructured",
+ "properties": {
"jcr:primaryType": "nt:unstructured",
- "sling:Taxonomy": {
- "jcr:primaryType": "nt:unstructured",
- "properties": {
- "jcr:primaryType": "nt:unstructured",
- "jcrTitle": {
- "jcr:primaryType": "nt:unstructured",
- "nodeScopeIndex": true,
- "useInSuggest": true,
- "propertyIndex": true,
- "useInSpellcheck": true,
- "analyzed": true,
- "name": "jcr:title",
- "type": "String"
- }
- }
+ "jcrTitle": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "useInSuggest": true,
+ "propertyIndex": true,
+ "useInSpellcheck": true,
+ "analyzed": true,
+ "name": "jcr:title",
+ "type": "String"
+ },
+ "nodeName": {
+ "jcr:primaryType": "nt:unstructured",
+ "nodeScopeIndex": true,
+ "useInSuggest": true,
+ "propertyIndex": true,
+ "useInSpellcheck": true,
+ "name": ":nodeName",
+ "type": "String"
}
+ }
}
-}
\ No newline at end of file
+ }
+}
diff --git a/ui/src/main/resources/jcr_root/oak%3Aindex/slingTemplate.json b/ui/src/main/resources/jcr_root/oak%3Aindex/slingTemplate.json
deleted file mode 100644
index f19b671..0000000
--- a/ui/src/main/resources/jcr_root/oak%3Aindex/slingTemplate.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "jcr:primaryType": "oak:QueryIndexDefinition",
- "jcr:name:propertyNames": [
- "sling:template"
- ],
- "type": "property",
- "reindex": false,
- "reindexCount": 1
-}
\ No newline at end of file
[sling-org-apache-sling-app-cms] 04/04: SLING-11228 - Adding login admin whitelist for cms.core bundle
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 37d262d9db44d467dc72e46b19170c076c6b8fe8
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Mon Mar 28 08:22:29 2022 -0400
SLING-11228 - Adding login admin whitelist for cms.core bundle
---
feature/src/main/features/cms/cms.json | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/feature/src/main/features/cms/cms.json b/feature/src/main/features/cms/cms.json
index ed81e1b..f6fd8b1 100644
--- a/feature/src/main/features/cms/cms.json
+++ b/feature/src/main/features/cms/cms.json
@@ -183,6 +183,12 @@
"user.mapping": [
"org.apache.sling.cms.core:sling-cms-versionmgr=sling-cms-versionmgr"
]
+ },
+ "org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling-cms":{
+ "whitelist.bundles":[
+ "org.apache.sling.cms.core"
+ ],
+ "whitelist.name":"sling-cms"
}
},
"repoinit:TEXT|true": "@file"