-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- some change to core API, mispelled label, shared type utils, - ResponsiveInclude in admin core that includes special resource type from a cache it builds looping over breakpoints, - add special exclusion from jacoco coverage check as it seems we can get granite commons ui publicly available for mocking.
- Loading branch information
Showing
15 changed files
with
857 additions
and
284 deletions.
There are no files selected for viewing
6 changes: 6 additions & 0 deletions
6
...x/admin/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-dx-admin.config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
scripts=["create path (sling:Folder) /var/dx | ||
create service user dx-admin-write | ||
set ACL for dx-admin-write | ||
allow jcr:read on /,/apps,/conf | ||
allow jcr:read,rep:write,jcr:lockManagement,jcr:versionManagement on /var/dx | ||
end"] |
5 changes: 5 additions & 0 deletions
5
...r/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-admin-bundle.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" | ||
jcr:primaryType="sling:OsgiConfig" | ||
service.ranking="0" | ||
user.mapping="[com.adobe.dx.admin:adminService\=dx-admin-write]"/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
apps/admin/core/src/main/java/com/adobe/dx/admin/responsive/internal/IncludeHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
~ Copyright 2020 Adobe | ||
~ | ||
~ 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. | ||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ | ||
package com.adobe.dx.admin.responsive.internal; | ||
|
||
import com.adobe.granite.ui.components.htl.ComponentHelper; | ||
|
||
import java.io.IOException; | ||
|
||
import javax.script.Bindings; | ||
import javax.servlet.ServletException; | ||
|
||
import org.apache.commons.lang3.StringUtils; | ||
import org.apache.sling.api.SlingHttpServletRequest; | ||
import org.apache.sling.api.resource.Resource; | ||
import org.apache.sling.api.scripting.SlingBindings; | ||
|
||
public class IncludeHelper extends ComponentHelper { | ||
|
||
SlingHttpServletRequest request; | ||
Resource targetResource; | ||
|
||
IncludeHelper (SlingHttpServletRequest request, Resource targetResource) { | ||
this.request = request; | ||
this.targetResource = targetResource; | ||
init((Bindings)request.getAttribute(SlingBindings.class.getName())); | ||
} | ||
|
||
@Override | ||
protected void activate() { | ||
} | ||
|
||
String include() throws ServletException, IOException { | ||
return super.include(targetResource, targetResource.getResourceType(), StringUtils.EMPTY, getOptions()); | ||
} | ||
} |
Oops, something went wrong.