Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable Redirect Map Manager in AEM CS #3420

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)

## Unreleased ([details][unreleased changes details])

### Changed

- #3420 - Redirect Map Manager - enable Redirect Map Manager in AEM CS (would require a specific - not public yet - AEM CS release version, TBA)

## 6.6.4 - 2024-08-14

### Fixed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,13 @@

import javax.servlet.ServletException;

import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.sling.SlingServlet;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.adobe.acs.commons.util.RequireAem;

/**
* Servlet for adding a line into the redirect map text file
*/
Expand All @@ -43,10 +40,6 @@ public class AddEntryServlet extends SlingAllMethodsServlet {
private static final long serialVersionUID = -1704915461516132101L;
private static final Logger log = LoggerFactory.getLogger(AddEntryServlet.class);

// Disable this feature on AEM as a Cloud Service
@Reference(target="(distribution=classic)")
transient RequireAem requireAem;

@Override
protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response)
throws ServletException, IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,20 @@

import javax.servlet.ServletException;

import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.sling.SlingServlet;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.adobe.acs.commons.util.RequireAem;

/**
* Servlet rendering the redirect map to a JSON Array
*/
@SlingServlet(methods = { "GET" }, resourceTypes = { "acs-commons/components/utilities/redirectmappage" }, selectors = {
"redirectentries" }, extensions = { "json" }, metatype = false)
public class RedirectEntriesServlet extends SlingSafeMethodsServlet {

// Disable this feature on AEM as a Cloud Service
@Reference(target="(distribution=classic)")
transient RequireAem requireAem;

private static final long serialVersionUID = -2825679173210628699L;
private static final Logger log = LoggerFactory.getLogger(RedirectEntriesServlet.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

import javax.servlet.ServletException;

import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.sling.SlingServlet;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
Expand All @@ -31,7 +30,6 @@
import org.slf4j.LoggerFactory;

import com.adobe.acs.commons.redirectmaps.models.RedirectMapModel;
import com.adobe.acs.commons.util.RequireAem;
import com.google.common.net.MediaType;

/**
Expand All @@ -45,10 +43,6 @@ public class RedirectMapServlet extends SlingSafeMethodsServlet {
private static final Logger log = LoggerFactory.getLogger(RedirectMapServlet.class);
private static final long serialVersionUID = -3564475196678277711L;

// Disable this feature on AEM as a Cloud Service
@Reference(target="(distribution=classic)")
transient RequireAem requireAem;

@Override
protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response)
throws ServletException, IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,13 @@

import javax.servlet.ServletException;

import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.sling.SlingServlet;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.adobe.acs.commons.util.RequireAem;

/**
* Servlet for removing a line from the redirect map text file
*/
Expand All @@ -43,10 +40,6 @@ public class RemoveEntryServlet extends SlingAllMethodsServlet {
private static final long serialVersionUID = -5963945855717054678L;
private static final Logger log = LoggerFactory.getLogger(RemoveEntryServlet.class);

// Disable this feature on AEM as a Cloud Service
@Reference(target="(distribution=classic)")
transient RequireAem requireAem;

@Override
protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response)
throws ServletException, IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,13 @@

import javax.servlet.ServletException;

import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.sling.SlingServlet;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.adobe.acs.commons.util.RequireAem;

/**
* Servlet for updating a line in the redirect map text file
*/
Expand All @@ -43,10 +40,6 @@ public class UpdateEntryServlet extends SlingAllMethodsServlet {
private static final long serialVersionUID = -1704915461516132101L;
private static final Logger log = LoggerFactory.getLogger(UpdateEntryServlet.class);

// Disable this feature on AEM as a Cloud Service
@Reference(target="(distribution=classic)")
transient RequireAem requireAem;

@Override
protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response)
throws ServletException, IOException {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,7 @@
<%@ page session="false" contentType="text/html" pageEncoding="utf-8"
import="com.adobe.acs.commons.util.RequireAem" %>
<%@ page session="false" contentType="text/html" pageEncoding="utf-8" %>
<%@include file="/libs/foundation/global.jsp" %>
<%@taglib prefix="sling2" uri="http://sling.apache.org/taglibs/sling" %>
<cq:setContentBundle /><%

RequireAem requireAem = sling.getService(RequireAem.class);

if (RequireAem.Distribution.CLOUD_READY.equals(requireAem.getDistribution())) { %>
<link rel="stylesheet" href="https://unpkg.com/@adobe/spectrum-css@2.15.1/dist/standalone/spectrum-light.css"/>

<div class="spectrum-Toast spectrum-Toast--negative" style="display: block; margin: 0 auto; width: 100%;">
<div class="spectrum-Toast-body">
<div class="spectrum-Toast-content">
Redirect Maps are not compatible with your version of Adobe Experience Manager.
<br/>
Please checkout ACS AEM Commons' Redirect Manager instead.
</div>
</div>
</div>

<% return;
} %>
<cq:setContentBundle />



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,4 @@
href="/acs-commons.html/etc/acs-commons/redirect-maps"
id="acs-commons__redirect-maps"
target="_blank">
<granite:rendercondition
jcr:primaryType="nt:unstructured"
sling:resourceType="acs-commons/console/renderconditions/require-aem"
distribution="classic"/>
</jcr:root>
Loading