-
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #57 from aem-design/develop
Develop
- Loading branch information
Showing
28 changed files
with
1,136 additions
and
39 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
5 changes: 5 additions & 0 deletions
5
...n-aem-common/src/main/content/jcr_root/apps/aemdesign/components/replication/.content.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" | ||
| xmlns:rep="internal" | ||
| jcr:mixinTypes="[rep:AccessControllable]" | ||
| jcr:primaryType="sling:Folder"/> |
6 changes: 6 additions & 0 deletions
6
...ommon/src/main/content/jcr_root/apps/aemdesign/components/replication/akamai/.content.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,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" | ||
| cq:defaultView="html" | ||
| jcr:primaryType="cq:Component" | ||
| sling:resourceSuperType="cq/replication/components/agent" | ||
| componentGroup=".hidden"/> |
13 changes: 13 additions & 0 deletions
13
...src/main/content/jcr_root/apps/aemdesign/components/replication/akamai/_cq_editConfig.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,13 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" | ||
| cq:actions="[edit]" | ||
| cq:dialogMode="floating" | ||
| cq:disableTargeting="{Boolean}true" | ||
| cq:layout="editbar" | ||
| jcr:primaryType="cq:EditConfig"> | ||
| <cq:formParameters | ||
| jcr:primaryType="nt:unstructured"/> | ||
| <cq:listeners | ||
| jcr:primaryType="cq:EditListenersConfig" | ||
| afteredit="REFRESH_PAGE"/> | ||
| </jcr:root> |
163 changes: 163 additions & 0 deletions
163
...-common/src/main/content/jcr_root/apps/aemdesign/components/replication/akamai/akamai.jsp
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,163 @@ | ||
| <%@page session="false"%> | ||
| <%@page contentType="text/html" | ||
| pageEncoding="utf-8" | ||
| import="com.day.cq.replication.Agent, | ||
| com.day.cq.replication.AgentConfig, | ||
| com.day.cq.replication.AgentManager, | ||
| com.adobe.granite.ui.clientlibs.HtmlLibraryManager, | ||
| com.day.cq.i18n.I18n" %><% | ||
| %><%@include file="/libs/foundation/global.jsp"%><% | ||
| I18n i18n = new I18n(slingRequest); | ||
| String id = currentPage.getName(); | ||
| String title = properties.get("jcr:title", id); // user generated content, no i18n | ||
| AgentManager agentMgr = sling.getService(AgentManager.class); | ||
| Agent agent = agentMgr.getAgents().get(id); | ||
| AgentConfig cfg = agent == null ? null : agent.getConfiguration(); | ||
| if (cfg == null || !cfg.getConfigPath().equals(currentNode.getPath())) { | ||
| // agent not active | ||
| agent = null; | ||
| } | ||
| // get icons | ||
| String globalIcnCls = "cq-agent-header"; | ||
| String statusIcnCls = "cq-agent-status"; | ||
| if (agent == null) { | ||
| statusIcnCls += "-inactive"; | ||
| globalIcnCls += "-off"; | ||
| } else { | ||
| try { | ||
| agent.checkValid(); | ||
| //there seems to be a problem somewhere in the AgentImpl class wherein it returns an erroneous true value if the enabled flag is removed. | ||
| //the way the components are currently implemented, if you 'disable' the replication agent, it removes the 'enabled' property from the node. | ||
| Boolean isEnabledFlagMissing = (properties.get("enabled", "").equals("")); | ||
| if (agent.isEnabled() && !isEnabledFlagMissing) { | ||
| globalIcnCls += "-on"; | ||
| statusIcnCls += "-ok"; | ||
| } else { | ||
| globalIcnCls += "-off"; | ||
| statusIcnCls += "-disabled"; | ||
| } | ||
| } catch (IllegalArgumentException e) { | ||
| globalIcnCls += "-off"; | ||
| statusIcnCls += "-invalid"; | ||
| } | ||
| } | ||
| %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"> | ||
| <html> | ||
| <head> | ||
| <title><%= i18n.get("AEM Replication") %> | <%= xssAPI.encodeForHTML(title) %></title> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
| <% | ||
| HtmlLibraryManager htmlMgr = sling.getService(HtmlLibraryManager.class); | ||
| if (htmlMgr != null) { | ||
| htmlMgr.writeIncludes(slingRequest, out, "cq.wcm.edit", "cq.replication"); | ||
| } | ||
| %> | ||
| <script src="/libs/cq/ui/resources/cq-ui.js" type="text/javascript"></script> | ||
| </head> | ||
| <body> | ||
| <h2 class="<%= globalIcnCls %>"><%= xssAPI.encodeForHTML(title) %> (<%= xssAPI.encodeForHTML(id) %>)</h2> | ||
| <% | ||
| String description = properties.get("jcr:description", ""); // user generated content, no i18n | ||
| %><p><%= xssAPI.encodeForHTML(description) %></p><% | ||
| %><div id="agent-details" class="cq-replication-agent-details"><cq:include path="<%= xssAPI.encodeForHTML(resource.getPath()) + ".details.html" %>" resourceType="<%= xssAPI.encodeForHTML(resource.getResourceType()) %>"/></div> | ||
| <div> | ||
| <br> | ||
| <% | ||
| // draw the 'edit' bar explicitly. since we want to be able to edit the | ||
| // settings on publish too. we are too late here for setting the WCMMode. | ||
| /* | ||
| out.flush(); | ||
| if (editContext != null) { | ||
| editContext.getEditConfig().getToolbar().add(0, new Toolbar.Label("Settings")); | ||
| editContext.includeEpilog(slingRequest, slingResponse, WCMMode.EDIT); | ||
| } | ||
| */ | ||
| %> | ||
| <script type="text/javascript"> | ||
| CQ.WCM.edit({ | ||
| "path":"<%= xssAPI.encodeForJSString(resource.getPath()) %>", | ||
| "dialog":"/apps/aemdesign/components/replication/akamai/dialog", | ||
| "type":"aemdesign/components/replication/akamai", | ||
| "editConfig":{ | ||
| "xtype":"editbar", | ||
| "listeners":{ | ||
| "afteredit":"REFRESH_PAGE" | ||
| }, | ||
| "inlineEditing":CQ.wcm.EditBase.INLINE_MODE_NEVER, | ||
| "disableTargeting": true, | ||
| "actions":[ | ||
| { | ||
| "xtype":"tbtext", | ||
| "text":"Settings" | ||
| }, | ||
| CQ.wcm.EditBase.EDIT | ||
| ] | ||
| } | ||
| }); | ||
| </script> | ||
| </div> | ||
|
|
||
| <% | ||
| if (agent != null) { | ||
| %> | ||
| <div id="CQ"> | ||
| <div id="cq-queue"> | ||
| </div> | ||
| </div> | ||
|
|
||
| <script type="text/javascript"> | ||
| function reloadDetails() { | ||
| var url = CQ.HTTP.externalize("<%= xssAPI.encodeForJSString(currentPage.getPath()) %>.details.html"); | ||
| var response = CQ.HTTP.get(url); | ||
| if (CQ.HTTP.isOk(response)) { | ||
| document.getElementById("agent-details").innerHTML = response.responseText; | ||
| } | ||
| } | ||
| function clearInvalidEntries() { | ||
| // this is a hack; removes items that are not publishable from the queue that is displayed here | ||
| // TODO: remove this after replication code is translated away from wcm and we have better control over what is displayed here | ||
| setInterval(function(){ | ||
| $(".x-grid3-row tr:contains('/renditions')").remove(); | ||
| $(".x-grid3-row tr:not(:contains('/content'))").remove(); | ||
| }, 50); | ||
| } | ||
| CQ.Ext.onReady(function() { | ||
| var queue = new CQ.wcm.ReplicationQueue({ | ||
| url: "<%= xssAPI.encodeForJSString(currentPage.getPath()) %>/jcr:content.queue.json", | ||
| applyTo: "cq-queue", | ||
| height: 400 | ||
| }); | ||
| queue.on("afterrefresh", function (queue) { | ||
| reloadDetails(); | ||
| }); | ||
| queue.on("aftercleared", function (queue) { | ||
| reloadDetails(); | ||
| }); | ||
| queue.on("afterretry", function (queue) { | ||
| reloadDetails(); | ||
| }); | ||
| queue.loadAgent("<%= xssAPI.encodeForJSString(id) %>"); | ||
| clearInvalidEntries(); | ||
| }); | ||
| function test() { | ||
| CQ.shared.Util.open(CQ.HTTP.externalize('<%= xssAPI.encodeForJSString(currentPage.getPath()) %>.test.html')); | ||
| } | ||
| </script> | ||
| <% | ||
| } // if (agent != null) | ||
| %> | ||
| </body> | ||
| </html> |
Oops, something went wrong.