Skip to content
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: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ To add own code binding or hook into execution process, you can create your own
#### Example extension script

```groovy
import com.vml.es.aem.acm.core.code.ExecutionContext
import com.vml.es.aem.acm.core.code.Execution
import dev.vml.es.acm.core.code.ExecutionContext
import dev.vml.es.acm.core.code.Execution

void prepareRun(ExecutionContext executionContext) {
executionContext.variable("acme", new AcmeFacade())
Expand Down
2 changes: 1 addition & 1 deletion aem/default/etc/aem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ instance:
component_stable:
skip: false
pids:
include: ['com.vml.es.aem.acm.core.*', 'com.day.crx.packaging.*', 'org.apache.sling.installer.*']
include: ['dev.vml.es.acm.core.*', 'com.day.crx.packaging.*', 'org.apache.sling.installer.*']
exclude: ['org.apache.sling.installer.hc.*', 'org.apache.sling.installer.core.impl.console.*']
match:
"disabled": []
Expand Down
20 changes: 10 additions & 10 deletions all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- P A R E N T P R O J E C T D E S C R I P T I O N -->
<!-- ====================================================================== -->
<parent>
<groupId>com.vml.es.aem</groupId>
<groupId>dev.vml.es</groupId>
<artifactId>acm.root</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
Expand Down Expand Up @@ -37,39 +37,39 @@
<artifactId>filevault-package-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<group>com.vml.es.aem.acm</group>
<group>dev.vml.es.acm</group>
<packageType>container</packageType>
<!-- skip sub package validation for now as some vendor packages like CIF apps will not pass -->
<skipSubPackageValidation>true</skipSubPackageValidation>
<embeddeds>
<embedded>
<groupId>com.vml.es.aem</groupId>
<groupId>dev.vml.es</groupId>
<artifactId>acm.ui.apps</artifactId>
<type>zip</type>
<target>/apps/acm-packages/application/install</target>
</embedded>
<embedded>
<groupId>com.vml.es.aem</groupId>
<groupId>dev.vml.es</groupId>
<artifactId>acm.ui.content</artifactId>
<type>zip</type>
<target>/apps/acm-packages/content/install</target>
</embedded>
<!-- TODO make it deployable on AEMaaCS as well
<embedded>
<groupId>com.vml.es.aem</groupId>
<groupId>dev.vml.es</groupId>
<artifactId>acm.ui.content.index</artifactId>
<type>zip</type>
<target>/apps/acm-packages/content/install</target>
</embedded>
-->
<embedded>
<groupId>com.vml.es.aem</groupId>
<groupId>dev.vml.es</groupId>
<artifactId>acm.ui.config</artifactId>
<type>zip</type>
<target>/apps/acm-packages/application/install</target>
</embedded>
<embedded>
<groupId>com.vml.es.aem</groupId>
<groupId>dev.vml.es</groupId>
<artifactId>acm.core</artifactId>
<target>/apps/acm-packages/application/install</target>
</embedded>
Expand Down Expand Up @@ -173,19 +173,19 @@
<!-- ====================================================================== -->
<dependencies>
<dependency>
<groupId>com.vml.es.aem</groupId>
<groupId>dev.vml.es</groupId>
<artifactId>acm.ui.apps</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>com.vml.es.aem</groupId>
<groupId>dev.vml.es</groupId>
<artifactId>acm.ui.content</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>com.vml.es.aem</groupId>
<groupId>dev.vml.es</groupId>
<artifactId>acm.ui.config</artifactId>
<version>${project.version}</version>
<type>zip</type>
Expand Down
4 changes: 2 additions & 2 deletions archetype.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Parameters used to generate this project with aem-project-archetype

groupId=com.vml.es.aem
groupId=dev.vml.es
artifactId=acm
version=1.0.0-SNAPSHOT
package=com.vml.es.aem.acm
package=dev.vml.es.acm
appId=acm
appTitle=AEM Content Manager
aemVersion=6.5.20
Expand Down
4 changes: 2 additions & 2 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.vml.es.aem</groupId>
<groupId>dev.vml.es</groupId>
<artifactId>acm.root</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
Expand Down Expand Up @@ -47,7 +47,7 @@
</goals>
<configuration>
<bnd><![CDATA[
Export-Package com.vml.es.aem.acm.core.*
Export-Package dev.vml.es.acm.core.*
Import-Package: javax.annotation;version=0.0.0,*
Private-Package: com.fasterxml.jackson.core.*,com.fasterxml.jackson.annotation.*,com.fasterxml.jackson.dataformat.*,com.fasterxml.jackson.databind.*,com.fasterxml.jackson.datatype.*,org.yaml.snakeyaml.*
DynamicImport-Package: *
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vml.es.aem.acm.core;
package dev.vml.es.acm.core;

public class AcmException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
import com.vml.es.aem.acm.core.acl.authorizable.AclGroup;
import com.vml.es.aem.acm.core.acl.authorizable.AclUser;
import com.vml.es.aem.acm.core.util.GroovyUtils;
import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;
import dev.vml.es.acm.core.acl.authorizable.AclGroup;
import dev.vml.es.acm.core.acl.authorizable.AclUser;
import dev.vml.es.acm.core.util.GroovyUtils;
import groovy.lang.Closure;
import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.vml.es.aem.acm.core.acl;

import com.vml.es.aem.acm.core.acl.check.AuthorizableOptions;
import com.vml.es.aem.acm.core.acl.check.ExistsOptions;
import com.vml.es.aem.acm.core.acl.check.MemberOptions;
import com.vml.es.aem.acm.core.acl.check.PasswordOptions;
import com.vml.es.aem.acm.core.acl.check.PermissionsOptions;
import com.vml.es.aem.acm.core.acl.check.PropertyOptions;
import com.vml.es.aem.acm.core.util.GroovyUtils;
package dev.vml.es.acm.core.acl;

import dev.vml.es.acm.core.acl.check.AuthorizableOptions;
import dev.vml.es.acm.core.acl.check.ExistsOptions;
import dev.vml.es.acm.core.acl.check.MemberOptions;
import dev.vml.es.acm.core.acl.check.PasswordOptions;
import dev.vml.es.acm.core.acl.check.PermissionsOptions;
import dev.vml.es.acm.core.acl.check.PropertyOptions;
import dev.vml.es.acm.core.util.GroovyUtils;
import groovy.lang.Closure;
import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.vml.es.aem.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
import com.vml.es.aem.acm.core.acl.authorizable.AclGroup;
import com.vml.es.aem.acm.core.acl.authorizable.AclUser;
import com.vml.es.aem.acm.core.acl.utils.AuthorizableManager;
import com.vml.es.aem.acm.core.acl.utils.PermissionsManager;
import com.vml.es.aem.acm.core.repo.Repo;
package dev.vml.es.acm.core.acl;

import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;
import dev.vml.es.acm.core.acl.authorizable.AclGroup;
import dev.vml.es.acm.core.acl.authorizable.AclUser;
import dev.vml.es.acm.core.acl.utils.AuthorizableManager;
import dev.vml.es.acm.core.acl.utils.PermissionsManager;
import dev.vml.es.acm.core.repo.Repo;
import java.util.Optional;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.AcmException;
import dev.vml.es.acm.core.AcmException;

public class AclException extends AcmException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import java.util.Arrays;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;

public class AuthorizableOptions {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;

public class ClearOptions extends com.vml.es.aem.acm.core.acl.authorizable.ClearOptions {
public class ClearOptions extends dev.vml.es.acm.core.acl.authorizable.ClearOptions {

private AclAuthorizable authorizable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

public class CreateGroupOptions extends CreateAuthorizableOptions {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclGroup;
import dev.vml.es.acm.core.acl.authorizable.AclGroup;

public class DeleteGroupOptions {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclUser;
import dev.vml.es.acm.core.acl.authorizable.AclUser;

public class DeleteUserOptions {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

public class GetAuthorizableOptions {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;

public class GroupOptions extends com.vml.es.aem.acm.core.acl.authorizable.GroupOptions {
public class GroupOptions extends dev.vml.es.acm.core.acl.authorizable.GroupOptions {

private AclAuthorizable authorizable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclGroup;
import dev.vml.es.acm.core.acl.authorizable.AclGroup;

public class MemberOptions extends com.vml.es.aem.acm.core.acl.authorizable.MemberOptions {
public class MemberOptions extends dev.vml.es.acm.core.acl.authorizable.MemberOptions {

private AclGroup group;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclUser;
import dev.vml.es.acm.core.acl.authorizable.AclUser;

public class PasswordOptions extends com.vml.es.aem.acm.core.acl.authorizable.PasswordOptions {
public class PasswordOptions extends dev.vml.es.acm.core.acl.authorizable.PasswordOptions {

private AclUser user;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;

public class PermissionsOptions extends com.vml.es.aem.acm.core.acl.authorizable.PermissionsOptions {
public class PermissionsOptions extends dev.vml.es.acm.core.acl.authorizable.PermissionsOptions {

private AclAuthorizable authorizable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclGroup;
import dev.vml.es.acm.core.acl.authorizable.AclGroup;

public class RemoveAllMembersOptions {

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package dev.vml.es.acm.core.acl;

import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;

public class RemovePropertyOptions extends dev.vml.es.acm.core.acl.authorizable.RemovePropertyOptions {

private AclAuthorizable authorizable;

private String authorizableId;

public AclAuthorizable getAuthorizable() {
return authorizable;
}

public void setAuthorizable(AclAuthorizable authorizable) {
this.authorizable = authorizable;
}

public String getAuthorizableId() {
return authorizableId;
}

public void setAuthorizableId(String authorizableId) {
this.authorizableId = authorizableId;
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.vml.es.aem.acm.core.acl;
package dev.vml.es.acm.core.acl;

import com.vml.es.aem.acm.core.acl.authorizable.AclAuthorizable;
import dev.vml.es.acm.core.acl.authorizable.AclAuthorizable;

public class SetPropertyOptions extends com.vml.es.aem.acm.core.acl.authorizable.SetPropertyOptions {
public class SetPropertyOptions extends dev.vml.es.acm.core.acl.authorizable.SetPropertyOptions {

private AclAuthorizable authorizable;

Expand Down
Loading