12 Commits

68 changed files with 107 additions and 72 deletions

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -21,7 +21,7 @@
<executions>
<execution>
<id>run-alts</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>start</goal></goals>
<configuration>
<images>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -139,7 +139,7 @@
<!-- This plugin execution consolidates the compiled resources into one directory for packaging -->
<execution>
<id>consolidate-classes</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>copy-resources</goal></goals>
<configuration>
<outputDirectory>${project.build.packageDirectory}</outputDirectory>
@@ -203,7 +203,7 @@
<plugin>
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>amp-plugin</artifactId>
<version>1.0.6</version>
<version>1.0.7</version>
<executions>
<execution>
<id>build-amp-file</id>
@@ -212,6 +212,7 @@
<goal>amp</goal>
</goals>
<configuration>
<classifier>${alfresco.module.classifier}</classifier>
<skip>${beedk.jar.notest.empty}</skip>
</configuration>
</execution>
@@ -236,6 +237,19 @@
<newProperty>beedk.noAmp</newProperty>
</configuration>
</execution>
<execution>
<id>check-amp-classifier-file</id>
<phase>package</phase>
<goals>
<goal>file-existence</goal>
</goals>
<configuration>
<file>${project.build.directory}/${project.artifactId}-${project.version}-${alfresco.module.classifier}.amp</file>
<trueValue>false</trueValue>
<falseValue>true</falseValue>
<newProperty>beedk.noAmpClassifier</newProperty>
</configuration>
</execution>
</executions>
</plugin>
<!-- This plugin enables/disables the AMP file during the install/deploy phases -->
@@ -260,6 +274,23 @@
<skipAttach>${beedk.noAmp}</skipAttach>
</configuration>
</execution>
<execution>
<id>attach-amp-classifier</id>
<phase>verify</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<type>amp</type>
<classifier>${alfresco.module.classifier}</classifier>
<file>${project.build.directory}/${project.artifactId}-${project.version}-${alfresco.module.classifier}.amp</file>
</artifact>
</artifacts>
<skipAttach>${beedk.noAmpClassifier}</skipAttach>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
@@ -308,6 +339,7 @@
<!-- configurable -->
<project.build.packageDirectory>${project.build.directory}/package</project.build.packageDirectory>
<alfresco.module.pathname>${project.groupId}.${project.artifactId}</alfresco.module.pathname>
<alfresco.module.classifier></alfresco.module.classifier>
<!-- output -->
<alfresco.module.path>alfresco/module/${alfresco.module.pathname}</alfresco.module.path>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -62,7 +62,7 @@
<executions>
<execution>
<id>run-acs-platform</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>start</goal></goals>
<configuration>
<images>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -21,7 +21,7 @@
<executions>
<execution>
<id>run-acs-search</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>start</goal></goals>
<configuration>
<images>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -66,7 +66,7 @@
<executions>
<execution>
<id>run-acs-share</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>start</goal></goals>
<configuration>
<images>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -21,7 +21,7 @@
<!-- This execution downloads the parameterized WAR -->
<execution>
<id>download-webapp</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>copy</goal></goals>
<configuration>
<artifactItems>
@@ -45,7 +45,7 @@
<executions>
<execution>
<id>run-aps</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>start</goal></goals>
<configuration>
<images>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -21,7 +21,7 @@
<executions>
<execution>
<id>run-aps</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>start</goal></goals>
<configuration>
<images>

View File

@@ -6,13 +6,13 @@
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-ate-archetype</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
</parent>
<name>Order of the Bee Development Kit: Project Scaffolding for an ACS Platform Module</name>

View File

@@ -18,6 +18,7 @@
<ats.version>2.3.6</ats.version>
<spring-boot.version>2.3.5.RELEASE</spring-boot.version>
<ate.app.className>${package}.Applicatoin</ate.app.className>
<docker.image.registry>${dockerRegistryHost}</docker.image.registry>
<docker.image.name>${dockerImagePrefix}/${project.artifactId}</docker.image.name>
<docker.image.tag>${project.version}</docker.image.tag>

View File

@@ -24,7 +24,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package ${groupId};
package ${package};
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@@ -26,7 +26,7 @@
*
* Copyright (C) 2020 - 2021 Inteligr8
*/
package ${groupId};
package ${package};
import java.io.File;
import java.util.Map;

View File

@@ -1,4 +1,4 @@
package ${groupId};
package ${package};
import java.io.File;
import java.util.Map;

View File

@@ -11,4 +11,4 @@ transform:
logging:
level:
${groupId}: ${dollar}{LOG_LEVEL:info}
${package}: ${dollar}{LOG_LEVEL:info}

View File

@@ -24,7 +24,7 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package ${groupId};
package ${package};
import java.util.HashSet;
import java.util.Set;

View File

@@ -1,4 +1,4 @@
package ${groupId};
package ${package};
import org.alfresco.transformer.AbstractTransformerController;
import org.junit.Ignore;

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -21,7 +21,7 @@
<!-- This execution downloads the dependency JARs -->
<execution>
<id>download-ate-jars</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>copy-dependencies</goal></goals>
<configuration>
<excludeScope>provided</excludeScope>
@@ -39,7 +39,7 @@
<executions>
<execution>
<id>run-ate</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>start</goal></goals>
<configuration>
<images>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -21,7 +21,7 @@
<executions>
<execution>
<id>run-ate</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>start</goal></goals>
<configuration>
<images>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -21,7 +21,7 @@
<executions>
<execution>
<id>run-ats</id>
<phase>process-classes</phase>
<phase>process-test-classes</phase>
<goals><goal>start</goal></goals>
<configuration>
<images>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -38,7 +38,8 @@
<executions>
<execution>
<id>copy-jar</id>
<phase>package</phase>
<!-- want to use 'package', but needs to be after sprintboot repackage -->
<phase>pre-integration-test</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -81,7 +82,8 @@
<executions>
<execution>
<id>docker-build</id>
<phase>package</phase>
<!-- want to use 'package', but needs to be after sprintboot repackage -->
<phase>pre-integration-test</phase>
<goals><goal>build</goal></goals>
<configuration>
<skipPush>true</skipPush>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -7,7 +7,7 @@
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.0.12</version>
<version>1.0.14</version>
<packaging>pom</packaging>
<name>Order of the Bee Development Kit</name>